X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=601574810c34e65610c2d7dfbb052e92c3b5122a;hb=64677ea8590e0ebad837f356fc7abc34cdb603ce;hp=2b386d206707f600d260f12e3ef47ab3f7e7d55a;hpb=7b1f84fee97d312b41994e3540d34a53484d7204;p=privoxy.git

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 2b386d20..60157481 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -1,12 +1,10 @@
 <!--
- File        :  $Source: /cvsroot/ijbswa/current/doc/source/license.sgml,v $
+ File        :  doc/source/license.sgml
 
  Purpose     :  Entity included in other project documents.
 
- $Id: license.sgml,v 2.7 2011/09/04 11:10:12 fabiankeil Exp $
-
-  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
-  See LICENSE.
+ Copyright (C) 2001-2020 the Privoxy Developers https://www.privoxy.org/
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
@@ -27,9 +25,21 @@
 
 <para>
  <application>Privoxy</application> is free software; you can
- redistribute it and/or modify it under the terms of the
- <citetitle>GNU General Public License</citetitle>, version 2,
- as published by the Free Software Foundation.
+ 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://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>
 
 <para>
@@ -37,7 +47,6 @@
  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="http://www.privoxy.org/user-manual/copyright.html#LICENSE">
+ url="https://www.privoxy.org/user-manual/copyright.html#LICENSE">
  <citetitle>license</citetitle></ulink> for details.
 </para>
-