From 65c6258a511456ca9dba3f6e11c9675f3ec5e662 Mon Sep 17 00:00:00 2001 From: Fabian Keil 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 @@

Privoxy is free software; you can redistribute and/or modify its source code under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the license, or (at your option) any later version.

-

The same is true for Privoxy binaries unless they are linked with mbed TLS in which case you can redistribute them and/or modify them - under the terms of the GNU General Public License as published by the Free Software - Foundation, either version 3 of the license, or (at your option) any later version.

+

The same is true for Privoxy binaries unless they are linked with a mbed TLS version that is licensed under the Apache 2.0 license in which + case you can redistribute and/or modify the Privoxy binaries under the terms of + the GNU General Public License as published by the Free Software Foundation, either + version 3 of the license, or (at your option) any later version.

Privoxy 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 license for details.

-

7.2. History

+

7.2. History

A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user tracking.

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 @@
7.1. License
-
7.2. History
+
7.2. History
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.