X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=601574810c34e65610c2d7dfbb052e92c3b5122a;hb=babd5dc0098b2c1703e1c1395c5262ec293c283e;hp=c62c675a9bbf14a981b955dabe5f19d39a62a863;hpb=0428133610c525457cb16f7ac6a54203a2743d6c;p=privoxy.git

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index c62c675a..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.6 2008/05/23 15:09:48 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,24 +25,28 @@
 
 <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>
- This program 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="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">
- <citetitle>GNU General Public License</citetitle></ulink> for details.
+ 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>
- You should have received a copy of the <citetitle>GNU GPL</citetitle>
- along with this program; if not, write to the <address> Free Software
- Foundation, Inc. <street>51 Franklin Street, Fifth Floor</street>
- <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>
- <country>USA</country> </address>
+ <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>
-