X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=f99c085bd7f02f5d37202bdecc63fe1eaa5195be;hp=7079c50923f3abfe4543891ebf61468e2b01b9a2;hb=7ae12b2afe7124cc23216f76aec2acdd5c085595;hpb=b93f35c60fa190ec3ae30879632be6269c4de2b3

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 7079c509..f99c085b 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.13">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
-<!entity % p-stable "IGNORE">
+<!entity p-version "3.0.17">
+<!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.61 2009/06/12 11:52:33 fabiankeil Exp $
+ $Id: faq.sgml,v 2.77 2011/03/03 14:22:12 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -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-2009 by 
+ <link linkend="copyright">Copyright</link> &my-copy; 2001-2010 by
  <ulink url="http://www.privoxy.org/">Privoxy Developers</ulink>
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.61 2009/06/12 11:52:33 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.77 2011/03/03 14:22:12 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -518,7 +518,7 @@ warranty? Registration?</title>
 </para>
 
 <para>
- We intend to use the donations to pay for our domain after transfering
+ 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.
@@ -537,7 +537,7 @@ warranty? Registration?</title>
  please have a look at
  <ulink url="http://www.spi-inc.org/donations">SPI's donation page</ulink>
  to see what the options are.
-<para>
+</para>
 </sect3>
 
 </sect2>
@@ -808,23 +808,8 @@ way to do this?</title>
 <title>There are several different <quote>actions</quote> files. What are
 the differences?</title>
 <para>
- Three actions files 
- are being included by the developers, to be used for 
- different purposes: These are 
- <filename>default.action</filename>, the <quote>main</quote> actions file
- which is actively maintained by the <application>Privoxy</application>
- developers and typically sets the default policies, <filename>user.action</filename>,
- where users are encouraged to make their private customizations.
- Please see <ulink url="../user-manual/actions-file.html">the actions chapter</ulink>
- in the <ulink url="../user-manual/index.html">User Manual</ulink> for a more
- detailed explanation.
-</para>
-
-<para>
- Earlier versions included three different versions of the 
- <filename>default.action</filename> file. The new scheme allows for 
- greater flexibility of local configuration, and for browser based 
- selection of pre-defined <quote>aggressiveness</quote> levels.
+ Please have a look at the <ulink url="../user-manual/actions-file.html">the actions chapter</ulink>
+ in the <ulink url="../user-manual/index.html">User Manual</ulink> for a detailed explanation.
 </para>
 
 </sect2>
@@ -963,7 +948,7 @@ with a browser? Does that not raise security issues?</title>
  <para>
   If you run <application>Privoxy</application> for multiple untrusted users (e.g. in
   a LAN) or aren't entirely in control of your own browser, you will probably want
-  to make sure that the the web-based editor and remote toggle features are
+  to make sure that the web-based editor and remote toggle features are
   <quote>off</quote> by setting <quote><literal><ulink
   url="../user-manual/config.html#ENABLE-EDIT-ACTIONS">enable-edit-actions</ulink>
   0</literal></quote> and <quote><literal><ulink
@@ -993,7 +978,7 @@ with a browser? Does that not raise security issues?</title>
  <ulink
  url="../user-manual/actions-file.html#FILTER"><literal>filter</literal>
  action</ulink> in one of the actions files. Content filtering is automatically
- disabled for inappropriate MIME types, but if you now better than Privoxy
+ disabled for inappropriate MIME types, but if you know better than Privoxy
  what should or should not be filtered you can filter any content you like.
 </para>
 <para>
@@ -1180,17 +1165,17 @@ on Win2K/NT/XP?</title>
 
 
 <sect2 renderas="sect3" id="otherproxy">
-<title>How can I make Privoxy work with other 
-proxies like Squid or Tor?</title>
+<title>How can I make Privoxy work with other proxies?</title>
 <para>
  This can be done and is often useful to combine the benefits of
- <application>Privoxy</application> with those of a another proxy.
+ <application>Privoxy</application> with those of a another proxy,
+ for example to cache content.
  See the <ulink
  url="../user-manual/config.html#FORWARDING">forwarding chapter</ulink>
  in the <ulink url="../user-manual/index.html">User Manual</ulink> which
- describes how to do this, and the <link linkend="TOR">
- How do I use Privoxy together with 
- Tor</link> section below.
+ describes how to do this. If you intend to use Privoxy with Tor,
+ please also have a look at
+ <link linkend="TOR">How do I use Privoxy together with Tor</link>.
 </para>
 </sect2>
 
@@ -1200,7 +1185,8 @@ and thus avoid individual browser configuration?</title>
 
 <para>
  No, its more complicated than that. This only works with special kinds 
- of proxies known as <quote>intercepting</quote> proxies (see below).
+ of proxies known as <quote>intercepting</quote> proxies
+ (<link linkend="INTERCEPTING">see below</link>).
 </para>
 
 </sect2>
@@ -1217,7 +1203,7 @@ and thus avoid individual browser configuration?</title>
 <para>
  However, some people say <quote>transparent proxy</quote> when they
  mean <quote>intercepting proxy</quote>. If you are one of them,
- please read the <ulink url="#intercepting">next entry</ulink>.
+ please read the <link linkend="INTERCEPTING">next entry</link>.
 </para>
 
 </sect2>
@@ -1777,9 +1763,11 @@ us help you. Your efforts are not wasted, and we do appreciate them.
  If you verified that <application>Privoxy</application> and <application>Tor</application>
  are working, it is time to connect them. As far as <application>Privoxy</application>
  is concerned, <application>Tor</application> is just another proxy that can be reached
- by socks4 or socks4a. Most likely you are interested in <application>Tor</application>
- to increase your anonymity level, therefore you should use socks4a, to make sure DNS requests are
- done through <application>Tor</application> and thus invisible to your local network.
+ by socks4, socks4a and socks5. Most likely you are interested in <application>Tor</application>
+ to increase your anonymity level, therefore you should use socks5, to make sure DNS
+ requests are done through <application>Tor</application> and thus invisible to your
+ local network. Using socks4a would work too, but with socks5 you get more precise error
+ messages.
 </para>
 
 <![%p-newstuff;[
@@ -2209,6 +2197,42 @@ and related issues?</title>
 </para>
 </sect2>
 
+<sect2 renderas="sect3" id="surprise-privoxy">
+<title>How did you manage to get Privoxy on my computer without my consent?</title>
+
+<para>
+ We didn't. We make Privoxy available for download, but we don't go
+ around installing it on other people's systems behind their back.
+ If you discover Privoxy running on your system and are sure you didn't
+ install it yourself, somebody else did. You may not even be running
+ the real Privoxy, but maybe something else that only pretends to be
+ Privoxy, or maybe something that is based on the real Privoxy,
+ but has been modified.
+</para>
+<para>
+ Lately there have been reports of problems with some kind of
+ Privoxy versions that come preinstalled on some Netbooks.
+ Some of the problems described are inconsistent with the behaviour
+ of official Privoxy versions, which suggests that the preinstalled
+ software may contain vendor modifications that we don't know about
+ and thus can't debug.
+</para>
+<para>
+ Privoxy's <link linkend="copyright">license</link> allows vendor
+ modifications, but the vendor has to comply with the license,
+ which involves informing the user about the changes and to make
+ the changes available under the same license as Privoxy itself.
+</para>
+<para>
+ If you are having trouble with a modified Privoxy version,
+ please try to talk to whoever made the modifications before
+ reporting the problem to us. Please also try to convince
+ whoever made the modifications to talk to us.  If you think
+ somebody gave you a modified Privoxy version without complying
+ to the license, please let us know.
+</para>
+</sect2>
+
 
 </sect1>
 
@@ -2945,6 +2969,60 @@ 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.77  2011/03/03 14:22:12  fabiankeil
+Remove duplicated 'the'
+
+Revision 2.76  2010/11/22 10:35:02  fabiankeil
+Mention socks5 in another part of the Tor section.
+
+Revision 2.75  2010/11/13 10:08:00  fabiankeil
+Fix a link to the 'intercepting' entry and add another one
+
+Revision 2.74  2010/11/13 10:07:46  fabiankeil
+Remove the product names in the 'otherproxy' entry's title.
+
+I'm tired of getting the 'otherproxy' entry as first hit
+when searching the index for the Tor FAQ.
+
+Revision 2.73  2010/11/06 12:55:48  fabiankeil
+Set p-version to 3.0.17
+
+Revision 2.72  2010/02/27 12:13:17  fabiankeil
+Fix spelling.
+
+Revision 2.71  2010/02/27 12:12:13  fabiankeil
+Consistently recommending socks5 in the Tor entry and mention its advantage compared to socks4a.
+Reported by David in #2960129.
+
+Revision 2.70  2010/02/20 18:08:31  ler762
+fix typo
+
+Revision 2.69  2010/02/13 17:38:27  fabiankeil
+Update entities for 3.0.16 stable.
+
+Revision 2.68  2010/01/30 19:51:28  fabiankeil
+New FAQ entry: How did you manage to get Privoxy on my computer without my consent?
+
+Also bump copyright.
+
+Revision 2.67  2009/11/15 14:24:12  fabiankeil
+Prepare to generate docs for 3.0.16 UNRELEASED.
+
+Revision 2.66  2009/10/10 05:48:55  fabiankeil
+Prepare for 3.0.15 beta.
+
+Revision 2.65  2009/07/18 16:24:39  fabiankeil
+Bump entities for 3.0.14 beta.
+
+Revision 2.64  2009/07/18 12:18:52  fabiankeil
+Don't describe the action files in the FAQ when we can simply link to the description in the User Manual.
+
+Revision 2.63  2009/06/15 15:08:03  fabiankeil
+Patch #2806626 from Frédéric Crozat to fix a closing tag.
+
+Revision 2.62  2009/06/12 14:30:58  fabiankeil
+Update entities for 3.0.13 beta.
+
 Revision 2.61  2009/06/12 11:52:33  fabiankeil
 Mention the TODO list in the participate entry.