X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=21d8122ab2c32f3864dc287bf9537be4ec30280b;hb=9a72bfaa83548bcfe1d08469a8123237cb3881a9;hp=95181b36a3afbcee134a50de59378890534ed560;hpb=38f508b13df3d3d1f9156f2cc68553e98893fb1f;p=privoxy.git

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 95181b36..21d8122a 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,10 +8,10 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.21">
-<!entity p-status "stable">
-<!entity % p-not-stable "IGNORE">
-<!entity % p-stable "INCLUDE">
+<!entity p-version "3.0.22">
+<!entity p-status "UNRELEASED">
+<!entity % p-not-stable "INCLUDE">
+<!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
@@ -27,9 +27,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.96 2013/11/06 19:24:18 diem Exp $
+ $Id: faq.sgml,v 2.103 2014/10/21 12:02:16 fabiankeil Exp $
 
- Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
+ Copyright (C) 2001-2014 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
 
  Based partially on the Internet Junkbuster FAQ originally written by and
@@ -73,12 +73,12 @@
  <subscript>
 <!-- Completely the wrong markup, but very little is allowed  -->
 <!-- in this part of an article. FIXME -->
- <link linkend="copyright">Copyright</link> &my-copy; 2001-2011 by
+ <link linkend="copyright">Copyright</link> &my-copy; 2001-2014 by
  <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.96 2013/11/06 19:24:18 diem Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.103 2014/10/21 12:02:16 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -394,7 +394,7 @@ Privoxy. Why should I use Privoxy at all?</title>
   and <application>Privoxy's</application> privacy enhancing features
   at the same time. While your browser probably lacks some features
   &my-app; offers, it should also be able to do some things more
-  reliable, for example restricting and suppressing JavaScript.
+  reliably, for example restricting and suppressing JavaScript.
  </para>
 </sect2>
 
@@ -503,63 +503,45 @@ warranty? Registration?</title>
 
 <sect3 renderas="sect4" id="donate"><title>Would you like to donate?</title>
 <para>
- <application>Privoxy</application> 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:
-
+ Donations are welcome. Our
+ <ulink url="http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/TODO">TODO list</ulink>
+ 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.
 </para>
 
 <para>
-<itemizedlist>
- <listitem>
-   <para>
-     Hardware to help make sure <application>Privoxy</application>
-     keeps running on platforms the developers currently can't test
-     on and can be ported to others.
-   </para>
- </listitem>
- <listitem>
-   <para>
-     Technical books to educate our developers about said platforms
-     or to improve their knowledge in general.
-   </para>
- </listitem>
- <listitem>
-   <para>
-     More reliable hosting,
-   </para>
- </listitem>
-</itemizedlist>
-</para>
-
-<para>
- We would like to get this money through donations made by our users.
+ <application>Privoxy</application> is an associated
+ project of <ulink url="http://www.spi-inc.org/">Software
+ in the Public Interest (SPI)</ulink>, which allows us to receive
+ tax-deductible donations in the United States. If you want to donate through
+ SPI, please use <ulink url="http://www.spi-inc.org/donations">SPI's donation page</ulink>
+ to see what the options are.
 </para>
 
 <para>
- <application>Privoxy</application> has therefore become an associated
- project of <ulink url="http://www.spi-inc.org/">Software
- in the Public Interest (SPI)</ulink>, 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.
+ You can also donate to Privoxy using a bank account managed by
+ <ulink url="https://www.zwiebelfreunde.de/">Zwiebelfreunde e.V.</ulink>:
 </para>
-
+<literallayout>
+ Name on Account: Zwiebelfreunde e.V.
+ IBAN: DE95430609671126825604
+ BIC: GENODEM1GLS
+ Bank: GLS Bank
+</literallayout>
 <para>
- 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.
+ 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.
 </para>
 
 <para>
- If you enjoy our software and feel like helping out with a donation,
- please have a look at
- <ulink url="http://www.spi-inc.org/donations">SPI's donation page</ulink>
- 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 <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink>
- (Privoxy's SPI liason) directly.
-</para>
+ If you have any questions regarding donations please mail to either the
+ public user mailing list or, if it's a private matter, to
+ <ulink url="mailto:fk@fabiankeil.de">Fabian Keil</ulink> (Privoxy's SPI liason)
+ directly.
 </sect3>
 
 </sect2>
@@ -1803,7 +1785,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 
 <para>
- Since <application>Privoxy</application> 3.0.5, its
+ <application>Privoxy's</application>
  <ulink url="../user-manual/config.html">main configuration file</ulink>
  is already prepared for <application>Tor</application>, if you are using a
  default <application>Tor</application> configuration and run it on the same
@@ -1813,7 +1795,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 <para>
  <screen>
-#        forward-socks5             /     127.0.0.1:9050 .
+#        forward-socks5t             /     127.0.0.1:9050 .
  </screen>
 </para>
 <para>
@@ -2695,11 +2677,24 @@ Why?</title>
  Pages with UTF-8 fonts are garbled.
 </title>
 <para>
- This is caused by the <quote>demoronizer</quote> filter. You should either
- upgrade <application>Privoxy</application>, or at least upgrade to the most
- recent <filename>default.action</filename> file available from <ulink
- url="http://sourceforge.net/project/showfiles.php?group_id=11118">SourceForge</ulink>.
- Or you can simply disable the demoronizer filter.
+ This may be the result of an overly aggressive filter. The filters that
+ are enabled in the default configuration aren't expected to cause problems
+ like this. If you enabled the <quote>demoronizer</quote> filter, please
+ try temporarily disabling it.
+</para>
+<para>
+ If that doesn't help, temporarily disable all filters to see if another
+ filter could be the culprit. If the problem disappears, enable the filters
+ one by one, until the problem reappears and the offending filter is found.
+</para>
+<para>
+ Once the problem-causing filter is known, it can be fixed or disabled.
+</para>
+<para>
+ Upgrading <application>Privoxy</application>, or going to the most recent
+ <filename>default.action</filename> file available from <ulink
+ url="http://sourceforge.net/project/showfiles.php?group_id=11118">SourceForge</ulink>
+ might be worth a try, too.
 </para>
 </sect2>
 
@@ -2709,13 +2704,11 @@ Why?</title>
  is used?
 </title>
 <para>
- This may also be caused by the <quote>demoronizer</quote> filter,
- in conjunction with a web server that is misreporting the content type. Binary
- files are exempted from <application>Privoxy's</application> filtering
- (unless the web server by mistake says the file is something else). Either
- upgrade <application>Privoxy</application>, or go to the most recent
- <filename>default.action</filename> file available from <ulink
- url="http://sourceforge.net/project/showfiles.php?group_id=11118">SourceForge</ulink>.
+ This may also be caused by an (<link linkend="DEMORONIZER">overly aggressive
+ filter</link> in conjunction with a web server that is misreporting the content
+ type. By default binary files are exempted from
+ <application>Privoxy's</application> filtering
+ (unless the web server by mistake says the file is something else).
 </para>
 </sect2>
 
@@ -3017,6 +3010,36 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.103  2014/10/21 12:02:16  fabiankeil
+Bump FAQ copyright
+
+Revision 2.102  2014/10/06 10:20:09  fabiankeil
+Update the 'Would you like to donate?' section
+
+Mention that donations will be used to get TODO list
+items done and add the Zwiebelfreunde e.V. bank
+account.
+
+Revision 2.101  2014/05/26 10:48:39  fabiankeil
+Bump entities for 3.0.22 UNRELEASED
+
+Revision 2.100  2014/05/05 09:59:30  fabiankeil
+Recommend forward-socks5t when using Tor
+
+It seems to work fine and modifying the Tor configuration
+to profit from it hasn't been necessary for a while now.
+
+Revision 2.99  2014/02/10 14:43:46  fabiankeil
+Make 'demoronizer' FAQ entries more generic
+
+Revision 2.98  2013/12/16 11:20:14  fabiankeil
+Spell 'more reliably' more correctly
+
+Reported by Reuben Thomas in #3615276.
+
+Revision 2.97  2013/11/07 14:42:02  fabiankeil
+White-space adjustments for the previous commit
+
 Revision 2.96  2013/11/06 19:24:18  diem
 Added an entry for the _privoxy user account deletion issue when upgrading to OS X 10.9