Changed version string only to 3.0.12

[privoxy.git] / config

diff --git a/config b/config
index a4c168c..a2d564e 100644 (file)
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-#        Sample Configuration File for Privoxy v3.0.11
+#        Sample Configuration File for Privoxy v3.0.12
 #
-#  $Id: config,v 1.71 2009/02/08 18:35:48 fabiankeil Exp $
+#  $Id: config,v 1.74 2009/02/19 17:26:26 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
@@ -130,7 +130,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
@@ -267,7 +267,7 @@
 #
 #      No trailing "/", please.
 #
-confdir .
+confdir /home/halb/privoxy/etc
 #
 #
 #  2.2. templdir
@@ -324,7 +324,7 @@ confdir .
 #
 #      No trailing "/", please.
 #
-logdir .
+logdir /home/halb/privoxy/var/log/privoxy
 #
 #
 #  2.4. actionsfile
@@ -1411,6 +1411,21 @@ split-large-forms 0
 #      This option has no effect if Privoxy has been compiled without
 #      keep-alive support.
 #
+#  Notes:
+#
+#      Note that reusing connections doesn't necessary cause
+#      speedups. There are also a few privacy implications you should
+#      be aware of.
+#
+#      Outgoing connections are shared between clients (if there are
+#      more than one) and closing the client that initiated the outgoing
+#      connection does not affect the connection between Privoxy and
+#      the server unless the client's request hasn't been completed
+#      yet. If the outgoing connection is idle, it will not be closed
+#      until either Privoxy's or the server's timeout is reached. While
+#      it's open, the server knows that the system running Privoxy is
+#      still there.
+#
 #  Examples:
 #
 #      keep-alive-timeout 300
@@ -1436,13 +1451,19 @@ keep-alive-timeout 300
 #
 #  Effect if unset:
 #
-#      A default value of 180 seconds is used.
+#      A default value of 300 seconds is used.
+#
+#  Notes:
+#
+#      For SOCKS requests the timeout currently doesn't start until
+#      the SOCKS server accepted the request. This will be fixed in
+#      the next release.
 #
 #  Examples:
 #
-#      socket-timeout 180
+#      socket-timeout 300
 #
-socket-timeout 180
+socket-timeout 300
 #
 #
 #  6. WINDOWS GUI OPTIONS