Complicate the license explanation even further

The GPLv3 only has to be used if the MbedTLS version
is licensed under the Apache 2.0 license which will
be the case for future releases.

At the moment the 2.16 releases are still dual licensed.

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 57f9f1f..6015748 100644 (file)
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -33,10 +33,11 @@
 
 <para>
  The same is true for <application>Privoxy</application> binaries
 
 <para>
  The same is true for <application>Privoxy</application> binaries

- unless they are linked with
- <ulink url="https://tls.mbed.org/">mbed TLS</ulink> in which
- case you can redistribute them and/or modify them under the terms
- of the <citetitle>GNU General Public License</citetitle>
+ unless they are linked with a
+ <ulink url="https://tls.mbed.org/">mbed TLS</ulink> version
+ that is licensed under the Apache 2.0 license 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>
  as published by the Free Software Foundation, either version 3
  of the license, or (at your option) any later version.
 </para>

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 886a200..344fbd6 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -7851,10 +7851,11 @@ Requests</title>
 
 <para>
  The same is true for <application>Privoxy</application> binaries
 
 <para>
  The same is true for <application>Privoxy</application> binaries

- unless they are linked with
- <ulink url="https://tls.mbed.org/">mbed TLS</ulink> in which
- case you can redistribute them and/or modify them under the terms
- of the <citetitle>GNU General Public License</citetitle>
+ unless they are linked with a
+ <ulink url="https://tls.mbed.org/">mbed TLS</ulink> version
+ that is licensed under the Apache 2.0 license 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>
  as published by the Free Software Foundation, either version 3
  of the license, or (at your option) any later version.
 </para>