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

diff --git a/config b/config
index f8e41ca6..6ce0a513 100644
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
 #        Sample Configuration File for Privoxy v3.0.11
 #
-#  $Id: config,v 1.69 2008/12/14 15:46:22 fabiankeil Exp $
+#  $Id: p-config.sgml,v 2.36 2009/01/23 14:06:07 fabiankeil Exp $
 #
-#  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+#  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
 ####################################################################
 #                                                                  #
@@ -340,9 +340,11 @@ logdir .
 #
 #  Default values:
 #
-#        default.action      # Main actions file
+#        match-all.action # Actions that are applied to all sites and maybe overruled later on.
 #
-#        user.action         # User customizations
+#        default.action   # Main actions file
+#
+#        user.action      # User customizations
 #
 #  Effect if unset:
 #
@@ -367,6 +369,7 @@ logdir .
 #      was necessary to be consistent with the other file options and
 #      to allow previously forbidden characters.
 #
+actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
 actionsfile default.action   # Main actions file
 actionsfile user.action      # User customizations
 #
@@ -1415,6 +1418,33 @@ split-large-forms 0
 keep-alive-timeout 300
 #
 #
+#  5.8. socket-timeout
+#  ====================
+#
+#  Specifies:
+#
+#      Number of seconds after which a socket times out if no data
+#      is received.
+#
+#  Type of value:
+#
+#      Time in seconds.
+#
+#  Default value:
+#
+#      None
+#
+#  Effect if unset:
+#
+#      A default value of 180 seconds is used.
+#
+#  Examples:
+#
+#      socket-timeout 180
+#
+socket-timeout 180
+#
+#
 #  6. WINDOWS GUI OPTIONS
 #  =======================
 #