Adpating Fabian's config changes to p-config.sgml and regenerating a new

[privoxy.git] / doc / source / p-config.sgml

diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 02669a0..c00abd5 100644 (file)
--- 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.5 2006/07/18 14:48:51 david__schmidt Exp $
+ $Id: p-config.sgml,v 2.6 2006/09/02 12:49:37 hal9 Exp $
 
  Copyright (C) 2001-2006 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -95,7 +95,7 @@
  Sample Configuration File for Privoxy v&p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.5 2006/07/18 14:48:51 david__schmidt Exp $
+ $Id: p-config.sgml,v 2.6 2006/09/02 12:49:37 hal9 Exp $
 </para>
 <para>
 Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
@@ -406,16 +406,15 @@ actionsfile
   <term>Notes:</term>
   <listitem>
    <para>
-    Multiple <literal>filterfiles</literal> lines are permitted.
+    Multiple <literal>filterfile</literal> lines are permitted.
    </para>
    <para>
     The <link linkend="filter-file">filter files</link> contain content modification
     rules that use <link linkend="regex">regular expressions</link>. These rules permit
     powerful changes on the content of Web pages, and optionally the headers
     as well, e.g., you could disable your favorite JavaScript annoyances,
-    re-write the actual displayed text, or just have some fun replacing
-    <quote>Microsoft</quote> with <quote>MicroSuck</quote> wherever it appears
-    on a Web page.
+    re-write the actual displayed text, or just have some fun 
+    playing buzzword bingo with web pages.
    </para>
    <para>
     The
@@ -438,6 +437,7 @@ actionsfile
 </variablelist>
 
 <![%config-file;[<literallayout>@@filterfile default.filter</literallayout>]]>
+<![%config-file;[<literallayout>@@filterfile user.filter      # User customizations</literallayout>]]>
 </sect3>
 
 
@@ -535,14 +535,14 @@ actionsfile
  <varlistentry>
   <term>Default value:</term>
   <listitem>
-   <para>jarfile (Unix) <emphasis>or</emphasis> privoxy.jar (Windows)</para>
+   <para>Unset (commented out). When activated: jarfile (Unix) <emphasis>or</emphasis> privoxy.jar (Windows)</para>
   </listitem>
  </varlistentry>
  <varlistentry>
   <term>Effect if unset:</term>
   <listitem>
    <para>
-    Intercepted cookies are not stored at all.
+    Intercepted cookies are not stored in a dedicated log file.
    </para>
   </listitem>
  </varlistentry>
@@ -552,11 +552,15 @@ actionsfile
    <para>
     The jarfile may grow to ridiculous sizes over time.
    </para>
+   <para>
+    If debug 8 (show header parsing) is enabled, cookies are
+    written to the logfile with the rest of the headers.
+   </para>
   </listitem>
  </varlistentry>
 </variablelist>
 
-<![%config-file;[<literallayout>@@jarfile jarfile</literallayout>]]>
+<![%config-file;[<literallayout>@@#jarfile jarfile</literallayout>]]>
 </sect3>
 
 
@@ -1710,6 +1714,44 @@ forward-socks4 and forward-socks4a</title>
   forward-socks4   /               socks-gw.example.com:1080  .
 </screen>
    </para>
+  
+    <para>
+    To chain Privoxy and Tor, both running on the same system, you should use 
+    the rule:
+   </para>
+   <para>
+    <screen>
+  forward-socks4   /               127.0.0.1:9050 .
+</screen>
+   </para>
+
+    <para>
+    The public <application>Tor</application> network can't be used to reach your local network,
+    therefore it's a good idea to make some exceptions:
+   </para>
+   <para>
+    <screen>
+  forward         192.168.*.*/     .
+  forward            10.*.*.*/     .
+  forward           127.*.*.*/     .
+</screen>
+   </para>
+   <para>
+    Unencrypted connections to systems in these address ranges will
+    be as (un)secure as the local network is, but the alternative is that you
+    can't reach the network at all.
+   </para>
+   <para>
+    If you also want to be able to reach servers in your local network by
+    using their names, you will need additional exceptions that look like
+    this:
+   </para>
+   <para>
+    <screen>
+ forward           localhost/     .
+</screen>
+   </para>
+
   </listitem>
  </varlistentry>
 </variablelist>