Fixes to #include in templates:

[privoxy.git] / config

diff --git a/config b/config
index e183e6f..abac7e7 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for Privoxy
 
 #
-# $Id: config,v 1.29 2002/03/05 21:14:13 david__schmidt Exp $
+# $Id: config,v 1.31 2002/03/24 12:58:57 swa Exp $
 #
 
 #  Table of Contents
@@ -40,9 +40,13 @@
 #  you can make it a comment and it will be treated as if it weren't there. 
 #  This is called "commenting out" an option and can be useful to turn
 #  off features: If you comment out the "logfile" line, Privoxy will
-#  not log to a file at all. Watch for the "default:" section in each 
-#  explanation to see what happens if the option is left unset (or 
-#  commented out). 
+#  not log to a file at all. 
+#
+#  Watch for the "default:" section in each  explanation to see what
+#  happens if the option is left unset (or commented out).
+#
+#  NOTE: THAT DEFAULT IS NOT NECESSARILY EQUAL TO THE OPTION 
+#        VALUE SET IN THIS SAMPLE CONFIG FILE.
 #
 #  Long lines can be continued on the next line by using a `\' as
 #  the last character.
@@ -84,12 +88,12 @@ logdir .
 #
 #  Default: Cookies to and from all destinations are filtered.
 #           Popups are disabled for all sites.
-#           All sites are filtered if re_filterfile specified.
+#           All sites are filtered if filterfile specified.
 #           No sites are blocked.  Nothing is an image.
 #
 actionsfile default.action
 
-#  The re_filterfile contains content modification rules.  These rules
+#  The filterfile contains content modification rules.  These rules
 #  permit powerful changes on the content of Web pages, e.g., you
 #  could disable your favourite JavaScript annoyances, rewrite the
 #  actual content, or just have some fun replacing "Microsoft"
@@ -97,7 +101,7 @@ actionsfile default.action
 #
 #  Default: content modification. (see '+-filter' in actionsfile)
 #
-re_filterfile default.filter
+filterfile default.filter
 
 #
 #  The logfile is where all logging and error messages are written.
@@ -150,8 +154,8 @@ jarfile jarfile
 #
 #  Default: Don't display links on the "untrusted" info page.
 #
-trust-info-url http://www.your-site.com/why_we_block.html
-trust-info-url http://www.your-site.com/what_we_allow.html
+trust-info-url http://www.example.com/why_we_block.html
+trust-info-url http://www.example.com/what_we_allow.html
 
 #  4. OPTIONS
 #
@@ -164,7 +168,7 @@ trust-info-url http://www.your-site.com/what_we_allow.html
 #
 #  Default: Do not display an e-mail address
 #
-admin-address fill@me.in.please
+#admin-address privoxy-admin@example.com
 
 #
 #  Proxy-info-url can be set to a URL that contains more info about
@@ -175,7 +179,8 @@ admin-address fill@me.in.please
 #
 #  Default: Don't show a link to online documentation
 #
-proxy-info-url http://www.your-site.com/proxy.html
+#proxy-info-url http://www.example.com/proxy-service.html
+
 
 #
 #  Listen-address specifies the address and port where Privoxy will