X-Git-Url: http://www.privoxy.org/gitweb/contact.html?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Fcopyright.html;h=ebe3a2253d2536e328b7302a9c98da0fdc870866;hb=1d666f12f135dac7bb3540def782b94a31c93e97;hp=abe696675f3da3f9d7eb1791873b7b9b5d8666a6;hpb=52460473669cd31edd8cb8ae66c6b94c489e7e1d;p=privoxy.git

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index abe69667..ebe3a225 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -4,7 +4,7 @@
 <head>
   <title>Privoxy Copyright, License and History</title>
   <meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
-  <link rel="HOME" title="Privoxy 3.0.29 User Manual" href="index.html">
+  <link rel="HOME" title="Privoxy 3.0.34 User Manual" href="index.html">
   <link rel="PREVIOUS" title="Contacting the Developers, Bug Reporting and Feature Requests" href="contact.html">
   <link rel="NEXT" title="See Also" href="seealso.html">
   <link rel="STYLESHEET" type="text/css" href="../p_doc.css">
@@ -15,7 +15,7 @@
   <div class="NAVHEADER">
     <table summary="Header navigation table" width="100%" border="0" cellpadding="0" cellspacing="0">
       <tr>
-        <th colspan="3" align="center">Privoxy 3.0.29 User Manual</th>
+        <th colspan="3" align="center">Privoxy 3.0.34 User Manual</th>
       </tr>
       <tr>
         <td width="10%" align="left" valign="bottom"><a href="contact.html" accesskey="P">Prev</a></td>
@@ -27,18 +27,17 @@
   </div>
   <div class="SECT1">
     <h1 class="SECT1"><a name="COPYRIGHT">12. Privoxy Copyright, License and History</a></h1>
-    <p>Copyright &copy; 2001-2020 by Privoxy Developers <code class="EMAIL">&#60;<a href=
+    <p>Copyright &copy; 2001-2023 by Privoxy Developers <code class="EMAIL">&#60;<a href=
     "mailto:privoxy-devel@lists.privoxy.org">privoxy-devel@lists.privoxy.org</a>&#62;</code></p>
-    <p>Some source code is based on code Copyright &copy; 1997 by Anonymous Coders and Junkbusters, Inc. and licensed
-    under the <i class="CITETITLE">GNU General Public License</i>.</p>
+    <p>Some source code is based on code Copyright &copy; 1997 by Anonymous Coders and Junkbusters, Inc.</p>
     <p><span class="APPLICATION">Privoxy</span> is free software; you can redistribute and/or modify its source code
     under the terms of the <i class="CITETITLE">GNU General Public License</i> as published by the Free Software
     Foundation, either version 2 of the license, or (at your option) any later version.</p>
     <p>The same is true for <span class="APPLICATION">Privoxy</span> binaries unless they are linked with a <a href=
-    "https://tls.mbed.org/" target="_top">mbed TLS</a> version that is licensed under the Apache 2.0 license in which
-    case you can redistribute and/or modify the <span class="APPLICATION">Privoxy</span> binaries under the terms of
-    the <i class="CITETITLE">GNU General Public License</i> as published by the Free Software Foundation, either
-    version 3 of the license, or (at your option) any later version.</p>
+    "https://www.trustedfirmware.org/projects/mbed-tls/" target="_top">mbed TLS</a> version that is licensed under the
+    Apache 2.0 license in which case you can redistribute and/or modify the <span class="APPLICATION">Privoxy</span>
+    binaries under the terms of the <i class="CITETITLE">GNU General Public License</i> as published by the Free
+    Software Foundation, either version 3 of the license, or (at your option) any later version.</p>
     <p>Both licenses are included in the next section.</p>
     <div class="SECT2">
       <h2 class="SECT2"><a name="LICENSE">12.1. License</a></h2>
@@ -47,7 +46,7 @@
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
-              <pre class="SCREEN">                     GNU GENERAL PUBLIC LICENSE
+              <pre class="LITERALLAYOUT">                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
@@ -396,7 +395,7 @@ Public License instead of this License.
         <table border="0" bgcolor="#E0E0E0" width="100%">
           <tr>
             <td>
-              <pre class="SCREEN">                     GNU GENERAL PUBLIC LICENSE
+              <pre class="LITERALLAYOUT">                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. &#60;https://fsf.org/&#62;
@@ -1075,6 +1074,20 @@ Public License instead of this License.  But first, please read
           </tr>
         </table>
       </div>
+      <div class="SECT3">
+        <h3 class="SECT3"><a name="THIRD-PARTY-LICENSES">12.1.3. Third-party licenses and copyrights</a></h3>
+        <p>Privoxy depends on a couple of third-party libraries which have seperate licenses. Please refer to the
+        third-party websites for up-to-date license and copyright information.</p>
+        <p>Privoxy depends on <a href="https://pcre.org/" target="_top">pcre</a>.</p>
+        <p>When compiled with FEATURE_BROTLI (optional), Privoxy depends on <a href="https://www.brotli.org/" target=
+        "_top">brotli</a>.</p>
+        <p>When compiled with FEATURE_HTTPS_INSPECTION (optional), Privoxy depends on a TLS library. The supported
+        libraries are <a href="https://www.openssl.org/" target="_top">LibreSSL</a>, <a href=
+        "https://github.com/Mbed-TLS/mbedtls/tags" target="_top">mbed TLS 2.28.x</a> and <a href=
+        "https://www.openssl.org/" target="_top">OpenSSL</a>.</p>
+        <p>When compiled with FEATURE_ZLIB (optional), Privoxy depends on <a href="https://zlib.net/" target=
+        "_top">zlib</a>.</p>
+      </div>
     </div>
     <div class="SECT2">
       <h2 class="SECT2"><a name="HISTORY">12.2. History</a></h2>
@@ -1146,6 +1159,7 @@ Public License instead of this License.  But first, please read
       &nbsp;Anatoly&nbsp;Arzhnikov<br>
       &nbsp;Ken&nbsp;Arromdee<br>
       &nbsp;Natxo&nbsp;Asenjo<br>
+      &nbsp;avoidr<br>
       &nbsp;Devin&nbsp;Bayer<br>
       &nbsp;Havard&nbsp;Berland<br>
       &nbsp;David&nbsp;Binderman<br>
@@ -1158,10 +1172,13 @@ Public License instead of this License.  But first, please read
       &nbsp;Andrew&nbsp;J.&nbsp;Caines<br>
       &nbsp;Clifford&nbsp;Caoile<br>
       &nbsp;Edward&nbsp;Carrel<br>
+      &nbsp;Celejar<br>
+      &nbsp;Chakib&nbsp;Benziane<br>
       &nbsp;Pak&nbsp;Chan<br>
       &nbsp;Wan-Teh&nbsp;Chang<br>
       &nbsp;Sam&nbsp;Chen<br>
       &nbsp;Ramkumar&nbsp;Chinchani<br>
+      &nbsp;Gwyn&nbsp;Ciesla<br>
       &nbsp;Billy&nbsp;Crook<br>
       &nbsp;Fr&eacute;d&eacute;ric&nbsp;Crozat<br>
       &nbsp;Matthew&nbsp;Daley<br>
@@ -1200,6 +1217,7 @@ Public License instead of this License.  But first, please read
       &nbsp;Stefan&nbsp;Huehner<br>
       &nbsp;Basil&nbsp;Hussain<br>
       &nbsp;Peter&nbsp;Hyman<br>
+      &nbsp;Artem&nbsp;Ivanov<br>
       &nbsp;Derek&nbsp;Jennings<br>
       &nbsp;Andrew&nbsp;Jones<br>
       &nbsp;Julien&nbsp;Joubert<br>
@@ -1219,6 +1237,7 @@ Public License instead of this License.  But first, please read
       &nbsp;Don&nbsp;Libes<br>
       &nbsp;Paul&nbsp;Lieverse<br>
       &nbsp;Adele&nbsp;Lime<br>
+      &nbsp;Aaron&nbsp;Linville<br>
       &nbsp;Han&nbsp;Liu<br>
       &nbsp;Toby&nbsp;Lyward<br>
       &nbsp;Wil&nbsp;Mahan<br>
@@ -1254,11 +1273,14 @@ Public License instead of this License.  But first, please read
       &nbsp;Black&nbsp;Rider<br>
       &nbsp;Chris&nbsp;John&nbsp;Riley<br>
       &nbsp;Maynard&nbsp;Riley<br>
+      &nbsp;Joshua&nbsp;Rogers<br>
       &nbsp;Ivan&nbsp;Romanov<br>
       &nbsp;Andreas&nbsp;Rutkauskas<br>
       &nbsp;Sam<br>
       &nbsp;Saperski<br>
+      &nbsp;Andrew&nbsp;Savchenko<br>
       &nbsp;Bart&nbsp;Schelstraete<br>
+      &nbsp;Richard&nbsp;Schneidt<br>
       &nbsp;Gregory&nbsp;Seidman<br>
       &nbsp;Atman&nbsp;Sense<br>
       &nbsp;Mark&nbsp;Seward<br>
@@ -1302,6 +1324,7 @@ Public License instead of this License.  But first, please read
       &nbsp;Yang&nbsp;Xia<br>
       &nbsp;Jarry&nbsp;Xu<br>
       &nbsp;Oliver&nbsp;Yeoh<br>
+      &nbsp;Wen&nbsp;Yue<br>
       &nbsp;Yossi&nbsp;Zahn<br>
       &nbsp;Jamie&nbsp;Zawinski<br>
       &nbsp;Zepard<br>
