X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Fconfig.html;h=7967f84c9bb68cee1e119ef58306ce2781fc28d3;hb=b8b189fe71adc144bc77ea0126cd7bf4bbe07d69;hp=f0f54e42164fbd20b8518905d21b062cab2ff630;hpb=bb351be8595d489bc90f06f300aeef011aa2f8f4;p=privoxy.git

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index f0f54e42..7967f84c 100644
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3659,6 +3659,32 @@ CLASS="APPLICATION"
    </P
 ></DD
 ><DT
+>Notes:</DT
+><DD
+><P
+>    Note that reusing connections doesn't necessary cause speedups.
+    There are also a few privacy implications you should be aware of.
+   </P
+><P
+>    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 <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> 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 <SPAN
+CLASS="APPLICATION"
+>Privoxy's</SPAN
+>
+    or the server's timeout is reached. While it's open, the server knows
+    that the system running <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> is still there.
+   </P
+></DD
+><DT
 >Examples:</DT
 ><DD
 ><P
@@ -3711,14 +3737,23 @@ CLASS="REPLACEABLE"
 >Effect if unset:</DT
 ><DD
 ><P
->    A default value of 180 seconds is used.
+>    A default value of 300 seconds is used.
+   </P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>    For SOCKS requests the timeout currently doesn't start until
+    the SOCKS server accepted the request. This will be fixed in
+    the next release.
    </P
 ></DD
 ><DT
 >Examples:</DT
 ><DD
 ><P
->    socket-timeout 180
+>    socket-timeout 300
    </P
 ></DD
 ></DL