Include recent changes.

diff --git a/config b/config
index a790499..c5ae4d3 100644 (file)
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #        Sample Configuration File for Privoxy v3.0.7
 #
-#  $Id: p-config.sgml,v 2.22 2007/11/09 20:26:58 fabiankeil Exp $
+#  $Id: config,v 1.59 2007/11/15 02:46:31 hal9 Exp $
 #
 #  Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
 #
@@ -128,7 +128,7 @@
 #          If set, this option should be the first option in the config
 #          file, because it is used while the config file is being read.
 #
-#user-manual http://www.privoxy.org/user-manual/
+user-manual /home/halb/privoxy/share/doc/privoxy/user-manual/
 #
 #
 #  1.2. trust-info-url
@@ -260,7 +260,7 @@ trust-info-url  http://www.example.com/what_we_allow.html
 #
 #      No trailing "/", please.
 #
-confdir .
+confdir /home/halb/privoxy/etc
 #
 #
 #  2.2. templdir
@@ -315,7 +315,7 @@ confdir .
 #
 #      No trailing "/", please.
 #
-logdir .
+logdir /home/halb/privoxy/var/log/privoxy
 #
 #
 #  2.4. actionsfile
@@ -437,15 +437,12 @@ filterfile default.filter
 #      an ad you think it should block) and it can help you to monitor
 #      what your browser is doing.
 #
-#      Many users will never look at it, however, and it's a privacy
-#      risk if third parties can get access to it. It is therefore
-#      disabled by default in Privoxy 3.0.7 and later.
+#      Depending on the debug options below, the logfile may be a privacy
+#      risk if third parties can get access to it. As most users will never
+#      look at it, Privoxy 3.0.7 and later only log fatal errors by default.
 #
-#      For troubleshooting purposes, you will have to explicitly enable
-#      it. Please don't file any support requests without trying to
-#      reproduce the problem with logging enabled first. Once you read
-#      the log messages, you may even be able to solve the problem on
-#      your own.
+#      For most troubleshooting purposes, you will have to change that, please
+#      refer to the debugging section for details.
 #
 #      Your logfile will grow indefinitely, and you will probably
 #      want to periodically remove it. On Unix systems, you can do
@@ -597,21 +594,32 @@ filterfile default.filter
 #      use multiple debug lines.
 #
 #      A debug level of 1 is informative because it will show you each
-#      request as it happens. 1, 4096 and 8192 are highly recommended
-#      so that you will notice when things go wrong. The other levels
-#      are probably only of interest if you are hunting down a specific
-#      problem. They can produce a hell of an output (especially 16).
+#      request as it happens. 1, 4096 and 8192 are recommended so that you
+#      will notice when things go wrong. The other levels are probably only
+#      of interest if you are hunting down a specific problem. They can
+#      produce a hell of an output (especially 16).
 #
-#      If you want to use CLF (Common Log Format), you should set
-#      "debug 512" ONLY and not enable anything else.
+#      Privoxy used to ship with the debug levels recommended above enabled
+#      by default, but due to privacy concerns 3.0.7 and later are
+#      configured to only log fatal errors.
+# 
+#      If you are used to the more verbose settings, simply enable the debug
+#      lines below again.
+#
+#      If you want to use pure CLF (Common Log Format), you should set
+#      debug 512 ONLY and not enable anything else.
 #
 #      Privoxy has a hard-coded limit for the length of log messages. If
 #      it's reached, messages are logged truncated and marked with
 #      "... [too long, truncated]".
 #
-debug   1    # show each GET/POST/CONNECT request
-debug   4096 # Startup banner and warnings
-debug   8192 # Errors - *we highly recommended enabling this*
+#      Please don't file any support requests without trying to reproduce
+#      the problem with increased debug level first. Once you read the log
+#      messages, you may even be able to solve the problem on your own.
+#
+#debug   1    # show each GET/POST/CONNECT request
+#debug   4096 # Startup banner and warnings
+#debug   8192 # Errors - *we highly recommended enabling this*
 #
 #
 #  3.2. single-threaded