X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config;h=9fc236651dcf300dfdf990436886315cdc0e0458;hb=5278ae2df1958d47a7e5cdc666601c02d081e0a8;hp=76d4a8d8befc75e36f1aabca48b1cb23a399914a;hpb=166f00de9b25240a5c0f12fcd3327977d7611687;p=privoxy.git

diff --git a/config b/config
index 76d4a8d8..9fc23665 100644
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
-#        Sample Configuration File for Privoxy v3.1.1
+#        Sample Configuration File for Privoxy v3.0.x
 #  
-#  Copyright (C) 2001, 2002 Privoxy Developers http://privoxy.org
+#  Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org
 #  
-#  $Id: config,v 1.39.2.6 2002/08/25 23:50:21 hal9 Exp $
+#  $Id: config,v 1.48 2006/08/03 02:46:41 david__schmidt Exp $
 #  
 ####################################################################
 #                                                                  #
@@ -182,7 +182,7 @@ actionsfile user      # User customizations
 #  
 #  Specifies:
 #  
-#      The filter file to use
+#      The filter file(s) to use
 #  
 #  Type of value:
 #  
@@ -199,21 +199,23 @@ actionsfile user      # User customizations
 #  
 #  Notes:
 #  
-#      The filter file contains content modification rules that use
+#      The filter files contain content modification rules that use
 #      regular expressions. These rules permit powerful changes on the
 #      content of Web pages, e.g., you could disable your favorite
 #      JavaScript annoyances, re-write the actual displayed text,
-#      or just have some fun replacing "Microsoft" with "MicroSuck"
-#      wherever it appears on a Web page.
+#      or just have some fun playing buzzword bingo with a web page.
 #  
 #      The +filter{name} actions rely on the relevant filter (name)
-#      to be defined in the filter file!
+#      to be defined in a filter file!
 #  
 #      A pre-defined filter file called default.filter that contains
 #      a bunch of handy filters for common problems is included in the
 #      distribution. See the section on the filter action for a list.
-#  
+#      When adding your own, it is recommended you add them to the
+#      user.filter file.
+#
 filterfile default.filter
+#filterfile user.filter
 
 #  
 #  1.5. logfile
@@ -306,7 +308,7 @@ jarfile jarfile
 #  
 #  Effect if unset:
 #  
-#      The whole trust mechanism is turned off.
+#      The entire trust mechanism is turned off.
 #  
 #  Notes:
 #  
@@ -315,15 +317,29 @@ jarfile jarfile
 #      for the casual user.
 #  
 #      If you specify a trust file, Privoxy will only allow access to
-#      sites that are named in the trustfile. You can also mark sites
-#      as trusted referrers (with +), with the effect that access
-#      to untrusted sites will be granted, if a link from a trusted
-#      referrer was used. The link target will then be added to the
-#      "trustfile". Possible applications include limiting Internet
-#      access for children.
+#      sites that are specified in the trustfile. Sites can be listed
+#      in one of two ways:
+#  
+#      Prepending a ~ character limits access to this site only (and
+#      any sub-paths within this site), e.g. ~www.example.com.
+#  
+#      Or, you can designate sites as trusted referrers, by prepending
+#      the name with a + 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 "trustfile" 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 ~ designation).
+#  
+#      If you use the + operator in the trust file, it may grow
+#      considerably over time.
+#  
+#      It is recommended that Privoxy be compiled with the
+#      --disable-force, --disable-toggle and --disable-editor options,
+#      if this feature is to be used.
 #  
-#      If you use + operator in the trust file, it may grow considerably
-#      over time.
+#      Possible applications include limiting Internet access for
+#      children.
 #  
 #trustfile trust
 
@@ -370,11 +386,20 @@ jarfile jarfile
 #  
 #      Unix, in local filesystem:
 #  
-#      user-manual  file:///usr/share/doc/privoxy-2.9.18/user-manual/
+#       user-manual file:///usr/share/doc/privoxy-3.0.1/user-manual/index.html
+#  
+#      Windows, in local filesystem, must use forward slash notation,
+#      and %20 to denote spaces in path names:
+#  
+#       user-manual file:///c:/some%20dir/privoxy/user-manual/index.html
+#  
+#      Windows, UNC notation (forward slashes required again):
+#  
+#       user-manual file://///some-server/some-path/privoxy/user-manual/index.html
 #  
 #      Any platform, on local webserver (called "local-webserver"):
 #  
-#      user-manual  http://local-webserver/privoxy-user-manual/
+#       user-manual  http://local-webserver/privoxy-user-manual/
 #  
 #      WARNING!!!
 #  
@@ -635,7 +660,7 @@ debug   8192 # Errors - *we highly recommended enabling this*
 #  
 #        listen-address  192.168.0.1:8118
 #  
-listen-address  127.0.0.1:8118
+listen-address  :8118
 
 #  
 #  4.2. toggle