[Privoxy-commits] [privoxy] 01/05: Factor out license explanation into separate SGML document
User Git
git at git.privoxy.org
Thu Jan 8 15:49:00 CET 2026
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository privoxy.
commit b779b5ebb20d7b34211a9023dfff221cf77b2527
Author: Fabian Keil <fk at fabiankeil.de>
AuthorDate: Tue Jan 6 10:23:09 2026 +0100
Factor out license explanation into separate SGML document
... to deduplicate the content.
No HTML output change intended.
---
doc/source/faq.sgml | 1 +
.../{license.sgml => license-explanation.sgml} | 13 ++---------
doc/source/license.sgml | 23 ++------------------
doc/source/user-manual.sgml | 25 +++-------------------
doc/source/webserver/index.sgml | 1 +
5 files changed, 9 insertions(+), 54 deletions(-)
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index e81adc47..916335c0 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,6 +8,7 @@
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
<!entity license SYSTEM "license.sgml">
+<!entity license-explanation SYSTEM "license-explanation.sgml">
<!entity p-version "4.1.0">
<!entity p-status "stable">
<!entity % p-not-stable "IGNORE">
diff --git a/doc/source/license.sgml b/doc/source/license-explanation.sgml
similarity index 76%
copy from doc/source/license.sgml
copy to doc/source/license-explanation.sgml
index 21a24ea1..81c4b5eb 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license-explanation.sgml
@@ -1,9 +1,9 @@
<!--
- File : doc/source/license.sgml
+ File : doc/source/license-explanation.sgml
Purpose : Entity included in other project documents.
- Copyright (C) 2001-2022 the Privoxy Developers https://www.privoxy.org/
+ Copyright (C) 2001-2026 the Privoxy Developers https://www.privoxy.org/
See LICENSE.
======================================================================
@@ -44,12 +44,3 @@
as published by the Free Software Foundation, either version 3
of the license, or (at your option) any later version.
</para>
-
-<para>
- <application>Privoxy</application> 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 <ulink
- url="https://www.privoxy.org/user-manual/copyright.html#LICENSE">
- <citetitle>license</citetitle></ulink> for details.
-</para>
diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 21a24ea1..c63fa6dc 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -23,27 +23,8 @@
-->
-<para>
- <application>Privoxy</application> is free software; you can
- redistribute and/or modify its source code under the terms
- of the <citetitle>GNU General Public License</citetitle>
- as published by the Free Software Foundation, either version 2
- of the license, or (at your option) any later version.
-</para>
-
-<para>
- The same is true for <application>Privoxy</application> binaries
- unless they are linked with a
- <ulink url="https://www.trustedfirmware.org/projects/mbed-tls/">mbed TLS</ulink> or
- <ulink url="https://www.openssl.org/">OpenSSL</ulink> version
- that is licensed under the Apache 2.0 license or against a
- <ulink url="https://github.com/wolfSSL/wolfssl/">wolfSSL</ulink> version
- that is licensed under the GPL 3 in which
- case you can redistribute and/or modify the <application>Privoxy</application>
- binaries under the terms of the <citetitle>GNU General Public License</citetitle>
- as published by the Free Software Foundation, either version 3
- of the license, or (at your option) any later version.
-</para>
+<!-- Include license-explanation.sgml: -->
+ &license-explanation;
<para>
<application>Privoxy</application> is distributed in the hope that
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index ddafcd96..be4b0ed9 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -8,7 +8,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
-<!entity license SYSTEM "license.sgml">
+<!entity license-explanation SYSTEM "license-explanation.sgml">
<!entity GPLv2 SYSTEM "../../LICENSE">
<!entity GPLv3 SYSTEM "../../LICENSE.GPLv3">
<!entity p-authors SYSTEM "p-authors.sgml">
@@ -8509,27 +8509,8 @@ Requests</title>
©right;
<!-- end copyright -->
-<para>
- <application>Privoxy</application> is free software; you can
- redistribute and/or modify its source code under the terms
- of the <citetitle>GNU General Public License</citetitle>
- as published by the Free Software Foundation, either version 2
- of the license, or (at your option) any later version.
-</para>
-
-<para>
- The same is true for <application>Privoxy</application> binaries
- unless they are linked with a
- <ulink url="https://www.trustedfirmware.org/projects/mbed-tls/">mbed TLS</ulink> or
- <ulink url="https://www.openssl.org/">OpenSSL</ulink> version
- that is licensed under the Apache 2.0 license or against a
- <ulink url="https://github.com/wolfSSL/wolfssl/">wolfSSL</ulink> version
- that is licensed under the GPL 3 in which
- case you can redistribute and/or modify the <application>Privoxy</application>
- binaries under the terms of the <citetitle>GNU General Public License</citetitle>
- as published by the Free Software Foundation, either version 3
- of the license, or (at your option) any later version.
-</para>
+<!-- Include license-explanation.sgml: -->
+ &license-explanation;
<para>
Both licenses are included in the next section.
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 6e4b2826..a2be0fad 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -5,6 +5,7 @@
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
<!entity license SYSTEM "license.sgml">
+<!entity license-explanation SYSTEM "license-explanation.sgml">
<!entity p-version "4.1.0">
<!entity p-status "stable">
<!entity % p-not-stable "IGNORE">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Privoxy-commits
mailing list