Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy

[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 65961c0..4ad1504 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>
@@ -196,7 +196,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</a></dt>
+            <dt>7.7. <a href="config.html#TLS">TLS/SSL Inspection</a></dt>
             <dd>
               <dl>
                 <dt>7.7.1. <a href="config.html#CA-DIRECTORY">ca-directory</a></dt>
@@ -311,6 +311,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>