Put some headers in error messages in single quotes.

[privoxy.git] / config

diff --git a/config b/config
index a4c168c..c182f42 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.76 2009/03/21 11:51:51 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
@@ -1193,7 +1193,7 @@ buffer-limit 4096
 #      To chain Privoxy and Tor, both running on the same system,
 #      you would use something like:
 #
-#        forward-socks4a   /               127.0.0.1:9050 .
+#        forward-socks5   /               127.0.0.1:9050 .
 #
 #
 #      The public Tor network can't be used to reach your local network,
@@ -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