From 4fd7d8795b9f049065db3d4f236b27560d273738 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 18 Nov 2020 11:56:04 +0100 Subject: [PATCH] Rebuild FAQ without Zwiebelfreunde e.V. information --- doc/webserver/faq/configuration.html | 2 +- doc/webserver/faq/copyright.html | 4 ++-- doc/webserver/faq/general.html | 12 ------------ doc/webserver/faq/index.html | 6 +++--- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html index 9c30195b..f9c4c4db 100644 --- a/doc/webserver/faq/configuration.html +++ b/doc/webserver/faq/configuration.html @@ -66,7 +66,7 @@ "../user-manual/config.html#ENABLE-EDIT-ACTIONS" target="_top">enable-edit-actions).

-

3.4. There are several different 3.4. There are several different "actions" files. What are the differences?

Please have a look at the the actions chapter in the User Manual for a detailed explanation.

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index ac2468ab..09f69649 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -33,7 +33,7 @@ "APPLICATION">Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.

-

7.1. License

+

7.1. License

Privoxy is free software; you can redistribute and/or modify its source code under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the license, or (at your option) any later version.

@@ -48,7 +48,7 @@ "CITETITLE">license for details.

-

7.2. History

+

7.2. History

A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user tracking.

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html index 93ce92f1..e4cf8d43 100644 --- a/doc/webserver/faq/general.html +++ b/doc/webserver/faq/general.html @@ -324,18 +324,6 @@ Paypal and Click & Pledge. For details, please have a look at SPI's general donation page.

-

You can also donate to Privoxy using a bank account or a "Paypal" address:

-

 Name on account: Zwiebelfreunde e.V.
-  IBAN: DE95430609671126825604
-  BIC: GENODEM1GLS
-  Bank: GLS Bank

-

 "Paypal" address: privoxy@zwiebelfreunde.de

-

Donations made through Zwiebelfreunde e.V. are tax-deductible in Germany and other countries that recognize - German charitable clubs. Feel free to use the Subject field to provide a name to be credited and a list of TODO - list items you are interested in the most. For example: Max Mustermann: #16, #1, #14.

-

Note that donations made through Zwiebelfreunde e.V. currently can't be checked automatically so you may not - get credited right away. The credits currently reflect donations received before 2016-01-14.

If you have any questions regarding donations please mail to either the public user mailing list or, if it's a private matter, to Fabian Keil (Privoxy's SPI liaison) directly.

diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index b9a3eaa4..c576a21e 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -110,7 +110,7 @@ me. Please list some of these "actions".
3.3. How are actions files configured? What is the easiest way to do this?
-
3.4. There are several different 3.4. There are several different "actions" files. What are the differences?
3.5. Where can I get updated Actions Files?
3.6. Can I use my old config files?
@@ -285,8 +285,8 @@
7. Privoxy Copyright, License and History
-
7.1. License
-
7.2. History
+
7.1. License
+
7.2. History
-- 2.39.2