Regenerated docs with CVEs for 3.0.23 and bumped copyright

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

diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index d7c448d..a72f501 100644 (file)
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -401,7 +401,7 @@
       and <span class="APPLICATION">Privoxy's</span> privacy enhancing
       features at the same time. While your browser probably lacks some
       features <span class="APPLICATION">Privoxy</span> offers, it should
-      also be able to do some things more reliable, for example restricting
+      also be able to do some things more reliably, for example restricting
       and suppressing JavaScript.</p>
     </div>
 
@@ -523,51 +523,46 @@
         <h4 class="SECT3"><a name="DONATE" id="DONATE">1.17.2. Would you like
         to donate?</a></h4>
 
-        <p><span class="APPLICATION">Privoxy</span> is developed by unpaid
-        volunteers and thus our current running costs are pretty low.
-        Nevertheless, we have plans that will cost money in the future. They
-        include, but aren't limited to spending money on:</p>
-
-        <ul>
-          <li>
-            <p>Hardware to help make sure <span class=
-            "APPLICATION">Privoxy</span> keeps running on platforms the
-            developers currently can't test on and can be ported to
-            others.</p>
-          </li>
-
-          <li>
-            <p>Technical books to educate our developers about said platforms
-            or to improve their knowledge in general.</p>
-          </li>
-
-          <li>
-            <p>More reliable hosting,</p>
-          </li>
-        </ul>
-
-        <p>We would like to get this money through donations made by our
-        users.</p>
-
-        <p><span class="APPLICATION">Privoxy</span> has therefore become an
-        associated project of <a href="http://www.spi-inc.org/" target=
-        "_top">Software in the Public Interest (SPI)</a>, which allows us to
-        receive donations. In the United States they are tax-deductible, in a
-        few other western countries they might be tax-deductible in the
-        future.</p>
-
-        <p>If you read this section before you may notice that paying for the
-        project domain privoxy.org is no longer on the list. It has been
-        transferred to SPI is sponsored by Mythic Beasts Ltd.</p>
-
-        <p>If you enjoy our software and feel like helping out with a
-        donation, please have a look at <a href=
-        "http://www.spi-inc.org/donations" target="_top">SPI's donation
-        page</a> to see what the options are. 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>
+        <p>Donations are welcome. Our <a href=
+        "http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO"
+        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
+        for Privoxy-related travel expenses (for example to attend
+        conferences), for hardware used for Privoxy development and for
+        hosting expenses etc.</p>
+
+        <p><span class="APPLICATION">Privoxy</span> is an associated project
+        of <a href="http://www.spi-inc.org/" target="_top">Software in the
+        Public Interest (SPI)</a>, which allows us to receive tax-deductible
+        donations in the United States. If you want to donate through SPI,
+        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 or a "Paypal"
+        address:</p>
+
+        <p class="LITERALLAYOUT">
+        &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>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>
       </div>
     </div>
   </div>