Text docs for 3.0.5.

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

diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 270e2ba..69efcb6 100644 (file)
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,9 +3,9 @@
 
  Purpose     :  Used with other docs and files only.
 
- $Id: p-config.sgml,v 2.9 2006/09/06 11:38:33 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.11 2006/09/08 02:36:37 hal9 Exp $
 
- Copyright (C) 2001-2006 Privoxy Developers <developers@privoxy.org>
+ Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
  See LICENSE.
 
  ========================================================================
@@ -95,7 +95,7 @@
  Sample Configuration File for Privoxy v&p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.9 2006/09/06 11:38:33 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.11 2006/09/08 02:36:37 hal9 Exp $
 </para>
 <para>
 Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
@@ -232,8 +232,7 @@ II. FORMAT OF THE CONFIGURATION FILE
     <application>Privoxy</application>, and is used for help links from some
     of the internal CGI pages. The manual itself is normally packaged with the
     binary distributions, so you probably want to set this to a locally
-    installed copy. For multi-user setups, you could provide a copy on a local
-    webserver for all your users and use the corresponding URL here.
+    installed copy. 
    </para>
    <para>
     Examples:
@@ -524,6 +523,8 @@ II. FORMAT OF THE CONFIGURATION FILE
    <para>
     No trailing <quote><literal>/</literal></quote>, please
    </para>
+  <!-- 
+   This is really outdated and not likely to happen. HB 09/20/06
    <para>
     When development goes modular and multi-user, the blocker, filter, and
     per-user config will be stored in subdirectories of <quote>confdir</quote>.
@@ -531,6 +532,7 @@ II. FORMAT OF THE CONFIGURATION FILE
     <filename>confdir/templates</filename>, where the HTML templates for CGI 
     output reside (e.g. <application>Privoxy's</application> 404 error page). 
    </para>
+  --> 
   </listitem>
  </varlistentry>
 </variablelist>
@@ -863,7 +865,7 @@ actionsfile
   <term>Specifies:</term>
   <listitem>
    <para>
-    The trust file to use
+    The name of the trust file to use
    </para>
   </listitem>
  </varlistentry>
@@ -883,7 +885,7 @@ actionsfile
   <term>Effect if unset:</term>
   <listitem>
    <para>
-    The entire trust mechanism is turned off.
+    The entire trust mechanism is disabled.
    </para>
   </listitem>
  </varlistentry>
@@ -902,16 +904,19 @@ actionsfile
    <para>
     Prepending a <literal>~</literal> character limits access to this site 
     only (and any sub-paths within this site), e.g. 
-    <literal>~www.example.com</literal>. 
+    <literal>~www.example.com</literal> allows access to
+    <literal>~www.example.com/features/news.html</literal>, etc. 
    </para>
    <para>
     Or, you can designate sites as <emphasis>trusted referrers</emphasis>, by
     prepending the name with a <literal>+</literal> character. The effect is that
     access to untrusted sites will be granted -- but only if a link from this
-    trusted referrer was used. The link target will then be added to the
-    <quote>trustfile</quote> so that future, direct accesses will be granted.
-    Sites added via this mechanism do not become trusted referrers themselves
-    (i.e. they are added with a <literal>~</literal> designation).
+    trusted referrer was used to get there. The link target will then be added
+    to the <quote>trustfile</quote> so that future, direct accesses will be
+    granted. Sites added via this mechanism do not become trusted referrers
+    themselves (i.e. they are added with a <literal>~</literal> designation).
+    There is a limit of 512 such entries, after which new entries will not be
+    made.
    </para>
    <para>
     If you use the <literal>+</literal> operator in the trust file, it may grow 
@@ -1607,9 +1612,7 @@ ACLs: permit-access and deny-access</title>
  multiple proxies.
  It can be used to better protect privacy and confidentiality when
  accessing specific domains by routing requests to those domains
- through an anonymous public proxy (see e.g. <ulink
- url="http://www.multiproxy.org/anon_list.htm">http://www.multiproxy.org/anon_list.htm</ulink>)
- Or to use a caching proxy to speed up browsing. Or chaining to a parent
+ through an anonymous public proxy. Or to use a caching proxy to speed up browsing. Or chaining to a parent
  proxy may be necessary because the machine that <application>Privoxy</application>
  runs on has no direct Internet access.
 </para>