Rebuild docs for 3.0.29 stable

[privoxy.git] / doc / webserver / faq / copyright.html

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index d5343d6..9b27c3d 100644 (file)
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -25,7 +25,7 @@
   </div>
   <div class="SECT1">
     <h1 class="SECT1"><a name="COPYRIGHT" id="COPYRIGHT">7. Privoxy Copyright, License and History</a></h1>
-    <p>Copyright &copy; 2001-2017 by Privoxy Developers <code class="EMAIL">&#60;<a href=
+    <p>Copyright &copy; 2001-2020 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>
@@ -33,17 +33,22 @@
     "APPLICATION">Junkbuster</span> (tm) FAQ, and modified as appropriate for <span class=
     "APPLICATION">Privoxy</span>.</p>
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1499" id="AEN1499">7.1. License</a></h2>
-      <p><span class="APPLICATION">Privoxy</span> is free software; you can redistribute it and/or modify it under the
-      terms of the <i class="CITETITLE">GNU General Public License</i>, version 2, as published by the Free Software
-      Foundation.</p>
+      <h2 class="SECT2"><a name="AEN1500" id="AEN1500">7.1. License</a></h2>
+      <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>
       <p><span class="APPLICATION">Privoxy</span> is distributed in the hope that it will be useful, but WITHOUT ANY
       WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
       <a href="https://www.privoxy.org/user-manual/copyright.html#LICENSE" target="_top"><i class=
       "CITETITLE">license</i></a> for details.</p>
     </div>
     <div class="SECT2">
-      <h2 class="SECT2"><a name="AEN1508" id="AEN1508">7.2. History</a></h2>
+      <h2 class="SECT2"><a name="AEN1514" id="AEN1514">7.2. History</a></h2>
       <p>A long time ago, there was the <span class="APPLICATION">Internet Junkbuster</span>, by Anonymous Coders and
       Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user
       tracking.</p>