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 e4390b3..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>