X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Ffaq.sgml;h=f99c085bd7f02f5d37202bdecc63fe1eaa5195be;hp=3eb0b3f0d264052481f5d1f0142942e2da906763;hb=dc75357981147f069761a2dc781bf7bbc3934805;hpb=88af7e9290fee6f6af06cece5319e1c59c6a94bf

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 3eb0b3f0..f99c085b 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 2.73 2010/11/06 12:55:48 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.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.73 2010/11/06 12:55:48 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.
@@ -948,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
@@ -1185,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>
@@ -1202,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>
@@ -1762,7 +1763,7 @@ 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>
+ 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
@@ -2968,6 +2969,21 @@ 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