From 7629bc44c1537497c2b33bef1332b9fedb7a83d7 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 28 Mar 2009 15:33:41 +0000
Subject: [PATCH] Recommend the use of forward-socks5 when forwarding to Tor.
 The error messages are more detailed than with forward-socks4a.

---
 config                   |  4 ++--
 doc/source/faq.sgml      | 10 +++++++---
 doc/source/p-config.sgml |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config b/config
index 70ccd34a..c182f42a 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #        Sample Configuration File for Privoxy v3.0.12
 #
-#  $Id: config,v 1.75 2009/03/21 11:35:37 hal9 Exp $
+#  $Id: config,v 1.76 2009/03/21 11:51:51 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
@@ -1193,7 +1193,7 @@ buffer-limit 4096
 #      To chain Privoxy and Tor, both running on the same system,
 #      you would use something like:
 #
-#        forward-socks4a   /               127.0.0.1:9050 .
+#        forward-socks5   /               127.0.0.1:9050 .
 #
 #
 #      The public Tor network can't be used to reach your local network,
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 7381e70d..e64c3159 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.57 2009/03/19 19:07:49 fabiankeil Exp $
+ $Id: faq.sgml,v 2.58 2009/03/21 12:27:44 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.57 2009/03/19 19:07:49 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.58 2009/03/21 12:27:44 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -1784,7 +1784,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 <para>
  <screen>
-#        forward-socks4a             /     127.0.0.1:9050 .
+#        forward-socks5             /     127.0.0.1:9050 .
  </screen>
 </para>
 <para>
@@ -2935,6 +2935,10 @@ 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.58  2009/03/21 12:27:44  fabiankeil
+Turn the donation entry title into a question,
+also rephrase the content a bit.
+
 Revision 2.57  2009/03/19 19:07:49  fabiankeil
 First draft of a "Donating" entry. To be polished tomorrow.
 
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 145b9bc8..2d8c1817 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Used with other docs and files only.
 
- $Id: p-config.sgml,v 2.41 2009/02/19 16:59:41 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.42 2009/03/23 04:17:47 ler762 Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -95,7 +95,7 @@
  Sample Configuration File for Privoxy v&p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.41 2009/02/19 16:59:41 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.42 2009/03/23 04:17:47 ler762 Exp $
 </para>
 <para>
 Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@ -1999,7 +1999,7 @@ forward-socks4, forward-socks4a and forward-socks5</title>
    </para>
    <para>
     <screen>
-  forward-socks4a   /               127.0.0.1:9050 .
+  forward-socks5   /               127.0.0.1:9050 .
 </screen>
    </para>
 
-- 
2.39.2