X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=07997052503a67f79c4ddf2ef4d093624b69347d;hb=3fb5b49e4b9b2e99b1a12205f54ab0e22e77eade;hp=920c848264fadf8b8e7efaf21d1916a3b018ed9b;hpb=0428133610c525457cb16f7ac6a54203a2743d6c;p=privoxy.git

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 920c8482..07997052 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.18">
-<!entity p-status "UNRELEASED">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.21">
+<!entity p-status "stable">
+<!entity % p-not-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!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,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.80 2011/08/18 11:42:50 fabiankeil Exp $
+ $Id: faq.sgml,v 2.91 2013/02/26 15:09:35 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.80 2011/08/18 11:42:50 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.91 2013/02/26 15:09:35 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -240,24 +240,23 @@ Privoxy work? </title>
 <title id="whyprivoxy">Why <quote>Privoxy</quote>? Why change the name from
 Junkbuster at all?</title>
 <para>
- Though outdated, <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>
- continues to offer their original version of the <application>Internet
- Junkbuster</application>, so publishing our
- <application> Junkbuster</application>-derived software under the same name
- led to confusion.
+ Though outdated, Junkbusters Corporation continued to offer their original
+ version of the <application>Internet Junkbuster</application> for a while,
+ so publishing our <application> Junkbuster</application>-derived software
+ under the same name would have led to confusion.
 </para>
 <para>
- There are also potential legal complications from our use of the
- <application>Junkbuster</application> name, which is a registered trademark of
- <ulink url="http://junkbusters.com/">Junkbusters Corporation</ulink>.
- There are, however, no objections from Junkbusters Corporation to the
- <application>Privoxy</application> project itself, and they, in fact, still
- share our ideals and goals.
+ There were also potential legal reasons not to use the
+ <application>Junkbuster</application> name, as it was (and maybe still is)
+ a registered trademark of Junkbusters Corporation.
+ There were, however, no objections from Junkbusters Corporation to the
+ <application>Privoxy</application> project itself, and they, in fact,
+ shared our ideals and goals.
 </para>
 <para>
- The developers also believed that there are so many improvements over the original
- code, that it was time to make a clean break from the past and make
- a name in their own right.
+ The Privoxy developers also believed that there were so many improvements
+ over the original code, that it was time to make a clean break from the past
+ and make a name in their own right.
 </para>
 <para>
  <application>Privoxy</application> is the
@@ -273,7 +272,7 @@ from the old Junkbuster?</title>
 <para>
  <application>Privoxy</application> picks up where
  <application>Junkbuster</application> left off.
- The new <application>Privoxy</application> still blocks ads and banners,
+ <application>Privoxy</application> still blocks ads and banners,
  still manages <ulink
  url="http://en.wikipedia.org/wiki/Browser_cookie">cookies</ulink>, and still
  helps protect your privacy. But, most of these features have been enhanced,
@@ -506,37 +505,60 @@ warranty? Registration?</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. We would like to get
- this money through donations made by our users.
+ have plans that will cost money in the future. They include,
+ but aren't limited to spending money on:
+
 </para>
 
 <para>
- <application>Privoxy</application> has therefore become an associated
- project of <ulink url="http://www.spi-inc.org/about-spi/about-spi">Software
- in the Public Interest (SPI)</ulink>, which allows us to receive tax-deductible
- donations in most western countries.
+<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 intend to use the donations to pay for our domain after transferring
- it to SPI. Our goal is to make sure there's no single point of failure
- and the bill gets paid and the site keeps running even if a some of
- the currently active developers were to suddenly disappear for a while.
+ We would like to get this money through donations made by our users.
 </para>
 
 <para>
- We would also like to spend some money on more reliable hosting,
- on hardware to help make sure <application>Privoxy</application>
- keeps running on platforms the developers currently can't test on,
- and on technical books to educate our developers about said platforms
- or to improve their knowledge in general.
+ <application>Privoxy</application> has therefore become an associated
+ project of <ulink url="http://www.spi-inc.org/about-spi/about-spi">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.
+</para>
+
+<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.
 </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.
+ 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>
 </sect3>
 
@@ -1770,7 +1792,6 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  messages.
 </para>
 
-<![%p-newstuff;[
 <para>
  Since <application>Privoxy</application> 3.0.5, its
  <ulink url="../user-manual/config.html">main configuration file</ulink>
@@ -1817,7 +1838,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 <para>
  Save the modified configuration file and open
- <ulink url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status/</ulink>
+ <ulink url="http://config.privoxy.org/show-status">http://config.privoxy.org/show-status</ulink>
  in your browser, confirm that <application>Privoxy</application> has reloaded its configuration
  and that there are no other forward lines, unless you know that you need them. If everything looks good,
  refer to
@@ -1830,7 +1851,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  what <application>Tor</application> does, why it is no replacement for
  application level security, and why you probably don't want to
  use it for unencrypted logins.
-</para> ]]>
+</para>
 </sect2>
 
 <sect2 renderas="sect3">
@@ -2969,6 +2990,50 @@ 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.91  2013/02/26 15:09:35  fabiankeil
+Bump entities for 3.0.21 UNRELEASED
+
+Revision 2.90  2013/01/06 11:25:52  fabiankeil
+Set entities to 3.0.20 beta
+
+Revision 2.89  2012/06/19 12:49:48  fabiankeil
+Update Junkbuster-related FAQ sections
+
+Remove the dead links and use the past tense as
+the fork happened years ago.
+
+Revision 2.88  2012/04/22 12:16:24  fabiankeil
+Remove an obsolete newstuff marker
+
+Revision 2.87  2012/04/22 12:16:09  fabiankeil
+Fix an URL in the "Privoxy with Tor" FAQ
+
+Revision 2.86  2012/03/18 15:41:49  fabiankeil
+Bump entities to 3.0.20 UNRELEASED
+
+Revision 2.85  2011/12/26 17:05:40  fabiankeil
+Bump entities for 3.0.19
+
+Revision 2.84  2011/11/13 17:03:54  fabiankeil
+Bump entities for 3.0.18 stable
+
+Revision 2.83  2011/11/13 16:53:24  fabiankeil
+Rephrase the donations section some more
+
+Mention that the domain is now sponsored by Mythic Beasts Ltd
+and make it clear that asking questions about donations is
+possible, too.
+
+Revision 2.82  2011/11/13 16:50:34  fabiankeil
+Note that donations for Privoxy are currently only tax-deductible in the US
+
+As it turns out tax-deductible donations in a few other western
+countries are theoretically possible through partner organizations
+but aren't available out of the box.
+
+Revision 2.81  2011/09/04 11:10:12  fabiankeil
+Ditch trailing whitespace
+
 Revision 2.80  2011/08/18 11:42:50  fabiankeil
 Bump some more documentation copyright ranges.