X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=68dfd9579d52c9bdd9ecb833cc24eb0cb79e0afa;hp=6ce0a5135c90f29da3c22b16875e9130272c2d02;hb=1e5dbf87271fb9afca4ccd18a19c42e6d4d80dea;hpb=89c571890a7f2ba82241d297abb5bdc462f21799

diff --git a/config b/config
index 6ce0a513..68dfd957 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #        Sample Configuration File for Privoxy v3.0.11
 #
-#  $Id: p-config.sgml,v 2.36 2009/01/23 14:06:07 fabiankeil Exp $
+#  $Id: config,v 1.72 2009/02/09 16:49:47 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
@@ -147,7 +147,7 @@
 #
 #  Default value:
 #
-#      Two example URLs are provided
+#      Unset
 #
 #  Effect if unset:
 #
@@ -166,8 +166,8 @@
 #      don't end up locked out from the information on why they were
 #      locked out in the first place!
 #
-trust-info-url  http://www.example.com/why_we_block.html
-trust-info-url  http://www.example.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
 #
 #
 #  1.3. admin-address
@@ -1436,13 +1436,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