Renerate for 3.0.21 UNRELEASED

[privoxy.git] / doc / webserver / user-manual / config.html

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index 8918b32..bff2330 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -6,7 +6,7 @@
   <title>The Main Configuration File</title>
   <meta name="GENERATOR" content=
   "Modular DocBook HTML Stylesheet Version 1.79">
-  <link rel="HOME" title="Privoxy 3.0.20 User Manual" href="index.html">
+  <link rel="HOME" title="Privoxy 3.0.21 User Manual" href="index.html">
   <link rel="PREVIOUS" title="Privoxy Configuration" href=
   "configuration.html">
   <link rel="NEXT" title="Actions Files" href="actions-file.html">
@@ -21,7 +21,7 @@
     <table summary="Header navigation table" width="100%" border="0"
     cellpadding="0" cellspacing="0">
       <tr>
-        <th colspan="3" align="center">Privoxy 3.0.20 User Manual</th>
+        <th colspan="3" align="center">Privoxy 3.0.21 User Manual</th>
       </tr>
 
       <tr>
@@ -1173,9 +1173,6 @@
               mostly behave like a normal, content-neutral proxy with both ad
               blocking and content filtering disabled. See <tt class=
               "LITERAL">enable-remote-toggle</tt> below.</p>
-
-              <p>The windows version will only display the toggle icon in the
-              system tray if this option is present.</p>
             </dd>
           </dl>
         </div>
@@ -1846,9 +1843,9 @@
 
       <div class="SECT3">
         <h4 class="SECT3"><a name="SOCKS" id="SOCKS">7.5.2. forward-socks4,
-        forward-socks4a and forward-socks5</a></h4><a name="FORWARD-SOCKS4"
-        id="FORWARD-SOCKS4"></a><a name="FORWARD-SOCKS4A" id=
-        "FORWARD-SOCKS4A"></a>
+        forward-socks4a, forward-socks5 and forward-socks5t</a></h4><a name=
+        "FORWARD-SOCKS4" id="FORWARD-SOCKS4"></a><a name="FORWARD-SOCKS4A"
+        id="FORWARD-SOCKS4A"></a>
 
         <div class="VARIABLELIST">
           <dl>
@@ -1911,6 +1908,13 @@
               <p>With <tt class="LITERAL">forward-socks5</tt> the DNS
               resolution will happen on the remote server as well.</p>
 
+              <p><tt class="LITERAL">forward-socks5t</tt> works like vanilla
+              <tt class="LITERAL">forward-socks5</tt> but lets <span class=
+              "APPLICATION">Privoxy</span> additionally use Tor-specific
+              SOCKS extensions. Currently the only supported SOCKS extension
+              is optimistic data which can reduce the latency for the first
+              request made on a newly created connection.</p>
+
               <p><tt class="REPLACEABLE"><i>socks_proxy</i></tt> and
               <tt class="REPLACEABLE"><i>http_parent</i></tt> can be a
               numerical IPv6 address (if <a href=
@@ -2484,8 +2488,8 @@
               tolerate pipelining. Whether or not that improves performance
               mainly depends on the client configuration.</p>
 
-              <p>This options is new and should be considered
-              experimental.</p>
+              <p>If you are seeing problems with pages not properly loading,
+              disabling this option could work around the problem.</p>
             </dd>
 
             <dt>Examples:</dt>
@@ -2734,7 +2738,7 @@
             <dt>Default value:</dt>
 
             <dd>
-              <p>None</p>
+              <p>128</p>
             </dd>
 
             <dt>Effect if unset:</dt>
@@ -2780,6 +2784,14 @@
 
               <p>Obviously using this option only makes sense if you choose a
               limit below the one enforced by the operating system.</p>
+
+              <p>One most POSIX-compliant systems <span class=
+              "APPLICATION">Privoxy</span> can't properly deal with more than
+              FD_SETSIZE file descriptors at the same time and has to reject
+              connections if the limit is reached. This will likely change in
+              a future version, but currently this limit can't be increased
+              without recompiling <span class="APPLICATION">Privoxy</span>
+              with a different FD_SETSIZE limit.</p>
             </dd>
 
             <dt>Examples:</dt>
@@ -3046,7 +3058,7 @@
       "LOG-MESSAGES"></a>
 
       <p>If <span class="QUOTE">"log-messages"</span> is set to 1,
-      <span class="APPLICATION">Privoxy</span> copy log messages to the
+      <span class="APPLICATION">Privoxy</span> copies log messages to the
       console window. The log detail depends on the <a href=
       "config.html#DEBUG">debug</a> directive.</p>