Rebuild HTML docs

[privoxy.git] / doc / webserver / faq / general.html

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index ad2f7ad..5b79f04 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -151,10 +151,11 @@
       2000.</p>
 
       <p>Then, some <a href=
-      "http://www.privoxy.org/user-manual/copyright.html#AUTHORS" target=
+      "https://www.privoxy.org/user-manual/copyright.html#AUTHORS" target=
       "_top">developers</a> picked up the thread, and started turning the
       software inside out, upside down, and then reassembled it, adding many
-      <a href="http://www.privoxy.org/user-manual/introduction.html#FEATURES"
+      <a href=
+      "https://www.privoxy.org/user-manual/introduction.html#FEATURES"
       target="_top">new features</a> along the way.</p>
 
       <p>The result of this is <span class="APPLICATION">Privoxy</span>,
@@ -166,9 +167,9 @@
     </div>
 
     <div class="SECT2">
-      <h3 class="SECT2"><a name="AEN82" id="AEN82">1.6. Why <span class=
-      "QUOTE">"Privoxy"</span>? Why change the name from Junkbuster at
-      all?</a></h3>
+      <h3 class="SECT2"><a name="WHYPRIVOXY" id="WHYPRIVOXY">1.6. Why
+      <span class="QUOTE">"Privoxy"</span>? Why change the name from
+      Junkbuster at all?</a></h3>
 
       <p>Though outdated, Junkbusters Corporation continued to offer their
       original version of the <span class="APPLICATION">Internet
@@ -329,8 +330,8 @@
     </div>
 
     <div class="SECT2">
-      <h3 class="SECT2"><a name="AEN158" id="AEN158">1.9. Can Privoxy make
-      mistakes? This does not sound very scientific.</a></h3>
+      <h3 class="SECT2"><a name="MISTAKES" id="MISTAKES">1.9. Can Privoxy
+      make mistakes? This does not sound very scientific.</a></h3>
 
       <p>Actually, it's a black art ;-) And yes, it is always possible to
       have a broad rule accidentally block or change something by mistake.
@@ -347,8 +348,8 @@
     </div>
 
     <div class="SECT2">
-      <h3 class="SECT2"><a name="AEN164" id="AEN164">1.10. Will I have to
-      configure Privoxy before I can use it?</a></h3>
+      <h3 class="SECT2"><a name="CONFIGORNOT" id="CONFIGORNOT">1.10. Will I
+      have to configure Privoxy before I can use it?</a></h3>
 
       <p>That depends on your expectations. The default installation should
       give you a good starting point, and block <span class=
@@ -524,7 +525,7 @@
         to donate?</a></h4>
 
         <p>Donations are welcome. Our <a href=
-        "http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO"
+        "http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO?view=markup"
         target="_top">TODO list</a> is rather long and being able to pay one
         (or more) developers to work on Privoxy would make a huge difference,
         even if it was only for a couple of weeks. Donations may also be used
@@ -539,26 +540,35 @@
         please use <a href="http://www.spi-inc.org/donations" target=
         "_top">SPI's donation page</a> to see what the options are.</p>
 
-        <p>You can also donate to Privoxy using a bank account managed by
-        <a href="https://www.zwiebelfreunde.de/" target="_top">Zwiebelfreunde
-        e.V.</a>:</p>
+        <p>You can also donate to Privoxy using a bank account or a "Paypal"
+        address:</p>
 
         <p class="LITERALLAYOUT">
-        &nbsp;Name&nbsp;on&nbsp;Account:&nbsp;Zwiebelfreunde&nbsp;e.V.<br>
+        &nbsp;Name&nbsp;on&nbsp;account:&nbsp;<a href=
+        "https://www.zwiebelfreunde.de/" target="_top">Zwiebelfreunde
+        e.V.</a><br>
         &nbsp;IBAN:&nbsp;DE95430609671126825604<br>
         &nbsp;BIC:&nbsp;GENODEM1GLS<br>
         &nbsp;Bank:&nbsp;GLS&nbsp;Bank</p>
 
+        <p class="LITERALLAYOUT">
+        &nbsp;"Paypal"&nbsp;address:&nbsp;privoxy@zwiebelfreunde.de</p>
+
         <p>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.</p>
 
+        <p>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.</p>
+
         <p>If you have any questions regarding donations please mail to
         either the public user mailing list or, if it's a private matter, to
         <a href="mailto:fk@fabiankeil.de" target="_top">Fabian Keil</a>
-        (Privoxy's SPI liason) directly.</p>
+        (Privoxy's SPI liaison) directly.</p>
       </div>
     </div>
   </div>