X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=601574810c34e65610c2d7dfbb052e92c3b5122a;hp=a7f237988bc98fe0557a8de52f6af6be1a29420c;hb=34a6a841e529579e2be4457ea0d4cb1befbc840a;hpb=0d74ae880d25aa73021e8a71487a240e2b3f7550

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index a7f23798..60157481 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -1,18 +1,16 @@
 <!--
- 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.3 2006/07/18 14:48:50 david__schmidt Exp $
 
-  Copyright (C) 2001-2006 Privoxy Developers <developers@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.
  ======================================================================
 
- If you make changes to this file, please verify the finished 
+ If you make changes to this file, please verify the finished
  docs all display as intended.
 
  This file is included into:
@@ -27,45 +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
-<!--
- <informalfigure pgwide="1" float="1">
-    <mediaobject>
-       <imageobject>
-          <imagedata scale="300" width="300" scalefit="1" fileref="../gnu.jpg" format="jpg">
-       </imageobject>
-       <textobject>
-          <phrase>GNU's Pet GNU</phrase>
-       </textobject>
-    </mediaobject>
- </informalfigure>
- or better:
- <inlinegraphic depth="1" scale="300" align="left" fileref="../gnu.jpg"></inlinegraphic> 
--->
- 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 
- <citetitle>GNU General Public License</citetitle> for
-<!--
-<figure pgwide="0"><title>The Pythagorean Theorum Illustrated</title>
-</figure>
---> 
- more details, which is available from the Free Software Foundation, Inc, 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ 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 <ulink
- url="http://www.gnu.org/copyleft/gpl.html">
- <citetitle>GNU General Public License</citetitle></ulink>
- 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>
-