Regenerate docs

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

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 2bab032..6d89901 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -24,7 +24,7 @@
           web page data and HTTP headers, controlling access, and removing ads and other obnoxious Internet junk.
           Privoxy has a flexible configuration and can be customized to suit individual needs and tastes. It has
           application for both stand-alone systems and multi-user networks.</p>
-          <p>Privoxy is Free Software and licensed under the GNU GPLv2.</p>
+          <p>Privoxy is Free Software and licensed under the GNU GPLv2 or later.</p>
           <p>Privoxy is an associated project of Software in the Public Interest (SPI).</p>
           <p>Helping hands and donations are welcome:</p>
           <ul>
@@ -61,12 +61,11 @@
               <dl>
                 <dt>2.1.1. <a href="installation.html#INSTALLATION-DEB">Debian and Ubuntu</a></dt>
                 <dt>2.1.2. <a href="installation.html#INSTALLATION-PACK-WIN">Windows</a></dt>
-                <dt>2.1.3. <a href="installation.html#INSTALLATION-OS2">OS/2</a></dt>
-                <dt>2.1.4. <a href="installation.html#INSTALLATION-MAC">Mac OS X</a></dt>
-                <dt>2.1.5. <a href="installation.html#OS-X-INSTALL-FROM-PACKAGE">Installation from ready-built
+                <dt>2.1.3. <a href="installation.html#INSTALLATION-MAC">Mac OS X</a></dt>
+                <dt>2.1.4. <a href="installation.html#OS-X-INSTALL-FROM-PACKAGE">Installation from ready-built
                 package</a></dt>
-                <dt>2.1.6. <a href="installation.html#OS-X-INSTALL-FROM-SOURCE">Installation from source</a></dt>
-                <dt>2.1.7. <a href="installation.html#INSTALLATION-FREEBSD">FreeBSD</a></dt>
+                <dt>2.1.5. <a href="installation.html#OS-X-INSTALL-FROM-SOURCE">Installation from source</a></dt>
+                <dt>2.1.6. <a href="installation.html#INSTALLATION-FREEBSD">FreeBSD</a></dt>
               </dl>
             </dd>
             <dt>2.2. <a href="installation.html#INSTALLATION-SOURCE">Building from Source</a></dt>
@@ -98,9 +97,8 @@
             <dt>5.3. <a href="startup.html#START-WINDOWS">Windows</a></dt>
             <dt>5.4. <a href="startup.html#START-UNICES">Generic instructions for Unix derivates (Solaris, NetBSD,
             HP-UX etc.)</a></dt>
-            <dt>5.5. <a href="startup.html#START-OS2">OS/2</a></dt>
-            <dt>5.6. <a href="startup.html#START-MACOSX">Mac OS X</a></dt>
-            <dt>5.7. <a href="startup.html#CMDOPTIONS">Command Line Options</a></dt>
+            <dt>5.5. <a href="startup.html#START-MACOSX">Mac OS X</a></dt>
+            <dt>5.6. <a href="startup.html#CMDOPTIONS">Command Line Options</a></dt>
           </dl>
         </dd>
         <dt>6. <a href="configuration.html">Privoxy Configuration</a></dt>
@@ -196,7 +194,7 @@
                 <dt>7.6.19. <a href="config.html#RECEIVE-BUFFER-SIZE">receive-buffer-size</a></dt>
               </dl>
             </dd>
-            <dt>7.7. <a href="config.html#TLS">TLS/SSL Inspection</a></dt>
+            <dt>7.7. <a href="config.html#TLS">TLS/SSL Inspection (Experimental)</a></dt>
             <dd>
               <dl>
                 <dt>7.7.1. <a href="config.html#CA-DIRECTORY">ca-directory</a></dt>
@@ -311,6 +309,12 @@
         <dd>
           <dl>
             <dt>12.1. <a href="copyright.html#LICENSE">License</a></dt>
+            <dd>
+              <dl>
+                <dt>12.1.1. <a href="copyright.html#GPLV2">GNU General Public License version 2</a></dt>
+                <dt>12.1.2. <a href="copyright.html#GPLV3">GNU General Public License version 3</a></dt>
+              </dl>
+            </dd>
             <dt>12.2. <a href="copyright.html#HISTORY">History</a></dt>
             <dt>12.3. <a href="copyright.html#AUTHORS">Authors</a></dt>
           </dl>