projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated for recent changes to the main man page.
[privoxy.git]
/
config
diff --git
a/config
b/config
index
6ce0a51
..
68dfd95
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.11
#
-# $Id:
p-config.sgml,v 2.36 2009/01/23 14:06:0
7 fabiankeil Exp $
+# $Id:
config,v 1.72 2009/02/09 16:49:4
7 fabiankeil Exp $
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
@@
-147,7
+147,7
@@
#
# Default value:
#
#
# Default value:
#
-#
Two example URLs are provided
+#
Unset
#
# Effect if 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!
#
# 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
#
#
# 1.3. admin-address
@@
-1436,13
+1436,19
@@
keep-alive-timeout 300
#
# Effect if unset:
#
#
# 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:
#
#
# Examples:
#
-# socket-timeout
18
0
+# socket-timeout
30
0
#
#
-socket-timeout
18
0
+socket-timeout
30
0
#
#
# 6. WINDOWS GUI OPTIONS
#
#
# 6. WINDOWS GUI OPTIONS