Regenerate docs

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index 48968c4..55de6de 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -73,7 +73,7 @@
         <p>The default profiles, and their associated actions, as pre-defined in <tt class=
         "FILENAME">default.action</tt> are:</p>
         <div class="TABLE">
-          <a name="AEN2907" id="AEN2907"></a>
+          <a name="AEN2913" id="AEN2913"></a>
           <p><b>Table 1. Default Configurations</b></p>
           <table border="1" frame="border" rules="all" class="CALSTABLE">
             <col width="1*" title="C1">

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index e82e5cf..bcdb32f 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -202,7 +202,7 @@
       these. If not, you will get a friendly error message. Internet access is not necessary either.</p>
       <ul>
         <li>
-          <p>Privoxy main page:</p><a name="AEN6026" id="AEN6026"></a>
+          <p>Privoxy main page:</p><a name="AEN6032" id="AEN6032"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a></p>
           </blockquote>
@@ -211,7 +211,7 @@
           "APPLICATION">Privoxy</span>)</p>
         </li>
         <li>
-          <p>View and toggle client tags:</p><a name="AEN6034" id="AEN6034"></a>
+          <p>View and toggle client tags:</p><a name="AEN6040" id="AEN6040"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/client-tags" target=
             "_top">http://config.privoxy.org/client-tags</a></p>
@@ -219,21 +219,21 @@
         </li>
         <li>
           <p>Show information about the current configuration, including viewing and editing of actions
-          files:</p><a name="AEN6039" id="AEN6039"></a>
+          files:</p><a name="AEN6045" id="AEN6045"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-status" target=
             "_top">http://config.privoxy.org/show-status</a></p>
           </blockquote>
         </li>
         <li>
-          <p>Show the browser's request headers:</p><a name="AEN6044" id="AEN6044"></a>
+          <p>Show the browser's request headers:</p><a name="AEN6050" id="AEN6050"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-request" target=
             "_top">http://config.privoxy.org/show-request</a></p>
           </blockquote>
         </li>
         <li>
-          <p>Show which actions apply to a URL and why:</p><a name="AEN6049" id="AEN6049"></a>
+          <p>Show which actions apply to a URL and why:</p><a name="AEN6055" id="AEN6055"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/show-url-info" target=
             "_top">http://config.privoxy.org/show-url-info</a></p>
@@ -242,15 +242,15 @@
         <li>
           <p>Toggle Privoxy on or off. This feature can be turned off/on in the main <tt class="FILENAME">config</tt>
           file. When toggled <span class="QUOTE">"off"</span>, <span class="QUOTE">"Privoxy"</span> continues to run,
-          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6057" id="AEN6057"></a>
+          but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6063" id="AEN6063"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle" target="_top">http://config.privoxy.org/toggle</a></p>
           </blockquote>
-          <p>Short cuts. Turn off, then on:</p><a name="AEN6061" id="AEN6061"></a>
+          <p>Short cuts. Turn off, then on:</p><a name="AEN6067" id="AEN6067"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=disable" target=
             "_top">http://config.privoxy.org/toggle?set=disable</a></p>
-          </blockquote><a name="AEN6064" id="AEN6064"></a>
+          </blockquote><a name="AEN6070" id="AEN6070"></a>
           <blockquote class="BLOCKQUOTE">
             <p><a href="http://config.privoxy.org/toggle?set=enable" target=
             "_top">http://config.privoxy.org/toggle?set=enable</a></p>

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index f672f6c..fbca936 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -1330,7 +1330,8 @@
             </dd>
             <dt>Type of value:</dt>
             <dd>
-              <p><tt class="REPLACEABLE"><i>target_pattern</i></tt> <tt class=
+              <p><tt class="REPLACEABLE"><i>target_pattern</i></tt> [<tt class=
+              "REPLACEABLE"><i>user</i></tt>:<tt class="REPLACEABLE"><i>pass</i></tt>@]<tt class=
               "REPLACEABLE"><i>socks_proxy</i></tt>[:<tt class="REPLACEABLE"><i>port</i></tt>] <tt class=
               "REPLACEABLE"><i>http_parent</i></tt>[:<tt class="REPLACEABLE"><i>port</i></tt>]</p>
               <p>where <tt class="REPLACEABLE"><i>target_pattern</i></tt> is a <a href=
@@ -1340,7 +1341,8 @@
               IP addresses in dotted decimal notation or valid DNS names (<tt class=
               "REPLACEABLE"><i>http_parent</i></tt> may be <span class="QUOTE">"."</span> to denote <span class=
               "QUOTE">"no HTTP forwarding"</span>), and the optional <tt class="REPLACEABLE"><i>port</i></tt>
-              parameters are TCP ports, i.e. integer values from 1 to 65535</p>
+              parameters are TCP ports, i.e. integer values from 1 to 65535. <tt class="REPLACEABLE"><i>user</i></tt>
+              and <tt class="REPLACEABLE"><i>pass</i></tt> can be used for SOCKS5 authentication if required.</p>
             </dd>
             <dt>Default value:</dt>
             <dd>
@@ -1394,6 +1396,14 @@
                   </td>
                 </tr>
               </table>
+              <p>To connect SOCKS5 proxy which requires username/password authentication:</p>
+              <table border="0" bgcolor="#E0E0E0" width="90%">
+                <tr>
+                  <td>
+                    <pre class="SCREEN">  forward-socks5   /               user:pass@socks-gw.example.com:1080  .</pre>
+                  </td>
+                </tr>
+              </table>
               <p>To chain Privoxy and Tor, both running on the same system, you would use something like:</p>
               <table border="0" bgcolor="#E0E0E0" width="90%">
                 <tr>

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 6119c4c..63b670c 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -532,7 +532,9 @@ Public License instead of this License.
       &nbsp;Marvin&nbsp;Renich<br>
       &nbsp;Chris&nbsp;John&nbsp;Riley<br>
       &nbsp;Maynard&nbsp;Riley<br>
+      &nbsp;Ivan&nbsp;Romanov<br>
       &nbsp;Andreas&nbsp;Rutkauskas<br>
+      &nbsp;Sam<br>
       &nbsp;Bart&nbsp;Schelstraete<br>
       &nbsp;Gregory&nbsp;Seidman<br>
       &nbsp;Atman&nbsp;Sense<br>