From 1c65b403497a33768a05385f5575437fd63370cb Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 3 Feb 2008 19:10:14 +0000
Subject: [PATCH] Mention forward-socks5.

---
 default.action.master       |  4 +++-
 doc/source/user-manual.sgml | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/default.action.master b/default.action.master
index 2e175366..3f5d0a03 100644
--- a/default.action.master
+++ b/default.action.master
@@ -9,7 +9,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.107 2008/01/20 13:19:58 fabiankeil Exp $
+#  $Id: default.action.master,v 1.108 2008/01/25 19:29:20 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.7 or later due to 
 #                 syntax changes.
@@ -317,6 +317,8 @@
 # +forward-override{forward 127.0.0.1:8123}
 # +forward-override{forward-socks4a 127.0.0.1:9050 .}
 # +forward-override{forward-socks4a 127.0.0.1:9050 proxy.example.org:8000}
+# +forward-override{forward-socks5 127.0.0.1:9050 .}
+# +forward-override{forward-socks5 127.0.0.1:9050 proxy.example.org:8000}
 #   This action overrules the forward directives in the configuration file. 
 #
 # +handle-as-empty-document
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index fd3d99fa..96e9dd6b 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -33,7 +33,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 2.55 2008/01/19 21:26:37 hal9 Exp $
+ $Id: user-manual.sgml,v 2.56 2008/01/31 19:11:35 fabiankeil Exp $
 
  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -59,7 +59,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 2.55 2008/01/19 21:26:37 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 2.56 2008/01/31 19:11:35 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -4152,7 +4152,8 @@ new action
      <para>
       <quote>forward-socks4a 127.0.0.1:9050 .</quote> to use the socks4a proxy listening at
       127.0.0.1 port 9050. Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote>
-      to use a socks4 connection  (with local DNS resolution) instead.
+      to use a socks4 connection  (with local DNS resolution) instead, use <quote>forward-socks5</quote>
+      for socks5 connections (with remote DNS resolution).
      </para>
     </listitem>
     <listitem>
@@ -4160,7 +4161,8 @@ new action
       <quote>forward-socks4a 127.0.0.1:9050 proxy.example.org:8000</quote> to use the socks4a proxy
       listening at 127.0.0.1 port 9050 to reach the HTTP proxy listening at proxy.example.org port 8000.
       Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote> to use a socks4 connection
-      (with local DNS resolution) instead.
+      (with local DNS resolution) instead, use <quote>forward-socks5</quote>
+      for socks5 connections (with remote DNS resolution).
      </para>
     </listitem>
    </itemizedlist>
@@ -4171,7 +4173,7 @@ new action
   <term>Notes:</term>
   <listitem>
    <para>
-    This action takes parameters similar to the <!-- I hope this link actual works -->
+    This action takes parameters similar to the
     <link linkend="forwarding">forward</link> directives in the configuration
     file, but without the URL pattern. It can be used as replacement, but normally it's only
     used in cases where matching based on the request URL isn't sufficient.
@@ -8921,6 +8923,10 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  USA
 
  $Log: user-manual.sgml,v $
+ Revision 2.56  2008/01/31 19:11:35  fabiankeil
+ Let the +client-header-filter{hide-tor-exit-notation} example apply
+ to all requests as "tainted" Referers aren't limited to exit TLDs.
+
  Revision 2.55  2008/01/19 21:26:37  hal9
  Add IE7 to configuration section per Gerry.
 
-- 
2.39.2