From 65c6258a511456ca9dba3f6e11c9675f3ec5e662 Mon Sep 17 00:00:00 2001 From: Fabian Keil <fk@fabiankeil.de> Date: Thu, 5 Nov 2020 12:25:03 +0100 Subject: [PATCH] Regenerate docs with updated license explanation --- doc/webserver/faq/copyright.html | 11 ++++++----- doc/webserver/faq/index.html | 2 +- doc/webserver/user-manual/appendix.html | 16 ++++++++-------- doc/webserver/user-manual/copyright.html | 9 +++++---- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index a5e39561..ac2468ab 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -37,17 +37,18 @@ <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><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="AEN1517" id="AEN1517">7.2. History</a></h2> + <h2 class="SECT2"><a name="AEN1518" id="AEN1518">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> diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html index 5c429dd1..b9a3eaa4 100644 --- a/doc/webserver/faq/index.html +++ b/doc/webserver/faq/index.html @@ -286,7 +286,7 @@ <dd> <dl> <dt>7.1. <a href="copyright.html#AEN1504">License</a></dt> - <dt>7.2. <a href="copyright.html#AEN1517">History</a></dt> + <dt>7.2. <a href="copyright.html#AEN1518">History</a></dt> </dl> </dd> </dl> diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html index 0f598070..d809b3ed 100644 --- a/doc/webserver/user-manual/appendix.html +++ b/doc/webserver/user-manual/appendix.html @@ -202,7 +202,7 @@ these. If not, you will get a friendly error message. Internet access is not necessary either.</p> <ul> <li> - <p>Privoxy main page:</p><a name="AEN6324" id="AEN6324"></a> + <p>Privoxy main page:</p><a name="AEN6325" id="AEN6325"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/" target="_top">http://config.privoxy.org/</a></p> </blockquote> @@ -211,7 +211,7 @@ "APPLICATION">Privoxy</span>)</p> </li> <li> - <p>View and toggle client tags:</p><a name="AEN6332" id="AEN6332"></a> + <p>View and toggle client tags:</p><a name="AEN6333" id="AEN6333"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/client-tags" target= "_top">http://config.privoxy.org/client-tags</a></p> @@ -219,21 +219,21 @@ </li> <li> <p>Show information about the current configuration, including viewing and editing of actions - files:</p><a name="AEN6337" id="AEN6337"></a> + files:</p><a name="AEN6338" id="AEN6338"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/show-status" target= "_top">http://config.privoxy.org/show-status</a></p> </blockquote> </li> <li> - <p>Show the browser's request headers:</p><a name="AEN6342" id="AEN6342"></a> + <p>Show the browser's request headers:</p><a name="AEN6343" id="AEN6343"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/show-request" target= "_top">http://config.privoxy.org/show-request</a></p> </blockquote> </li> <li> - <p>Show which actions apply to a URL and why:</p><a name="AEN6347" id="AEN6347"></a> + <p>Show which actions apply to a URL and why:</p><a name="AEN6348" id="AEN6348"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/show-url-info" target= "_top">http://config.privoxy.org/show-url-info</a></p> @@ -242,15 +242,15 @@ <li> <p>Toggle Privoxy on or off. This feature can be turned off/on in the main <tt class="FILENAME">config</tt> file. When toggled <span class="QUOTE">"off"</span>, <span class="QUOTE">"Privoxy"</span> continues to run, - but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6355" id="AEN6355"></a> + but only as a pass-through proxy, with no actions taking place:</p><a name="AEN6356" id="AEN6356"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/toggle" target="_top">http://config.privoxy.org/toggle</a></p> </blockquote> - <p>Short cuts. Turn off, then on:</p><a name="AEN6359" id="AEN6359"></a> + <p>Short cuts. Turn off, then on:</p><a name="AEN6360" id="AEN6360"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/toggle?set=disable" target= "_top">http://config.privoxy.org/toggle?set=disable</a></p> - </blockquote><a name="AEN6362" id="AEN6362"></a> + </blockquote><a name="AEN6363" id="AEN6363"></a> <blockquote class="BLOCKQUOTE"> <p><a href="http://config.privoxy.org/toggle?set=enable" target= "_top">http://config.privoxy.org/toggle?set=enable</a></p> diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index e4390b39..647a0fda 100644 --- 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> -- 2.49.0