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

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

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index a455bb4..647a0fd 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -34,10 +34,11 @@
     <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 href=
-    "https://tls.mbed.org/" target="_top">mbed TLS</a> in which case you can redistribute them and/or modify them 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>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>
     <p>Both licenses are included in the next section.</p>
     <div class="SECT2">
       <h2 class="SECT2"><a name="LICENSE">12.1. License</a></h2>
@@ -1183,6 +1184,7 @@ Public License instead of this License.  But first, please read
       &nbsp;Magnus&nbsp;Holmgren<br>
       &nbsp;Eric&nbsp;M.&nbsp;Hopper<br>
       &nbsp;Ralf&nbsp;Horstmann<br>
+      &nbsp;Ho+&nbsp;Ho+&nbsp;Ho+<br>
       &nbsp;Ned&zcaron;ad&nbsp;Hrnjica<br>
       &nbsp;Stefan&nbsp;Huehner<br>
       &nbsp;Basil&nbsp;Hussain<br>
@@ -1256,6 +1258,7 @@ Public License instead of this License.  But first, please read
       &nbsp;J&ouml;rg&nbsp;Weinmann<br>
       &nbsp;Darren&nbsp;Wiebe<br>
       &nbsp;Anduin&nbsp;Withers<br>
+      &nbsp;withoutname<br>
       &nbsp;Eduard&nbsp;Wulff<br>
       &nbsp;Yang&nbsp;Xia<br>
       &nbsp;Jarry&nbsp;Xu<br>
@@ -1266,8 +1269,8 @@ Public License instead of this License.  But first, please read
       <p>Privoxy heavily relies on Philip Hazel's PCRE.</p>
       <p>The code to filter compressed content makes use of zlib which is written by Jean-loup Gailly and Mark
       Adler.</p>
-      <p>On systems that lack snprintf(), Privoxy is using a version written by Mark Martinec. On systems that lack
-      strptime(), Privoxy is using the one from the GNU C Library written by Ulrich Drepper.</p>
+      <p>On systems that lack strptime(), Privoxy is using the one from the GNU C Library written by Ulrich
+      Drepper.</p>
     </div>
   </div>
   <div class="NAVFOOTER">