X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=48aff0b81f75b824b3b95086b0296a22c534931d;hb=ddc558bf84c0cc141f18cf8d002bf2c2dd57638d;hp=04f48f4a66fdb9e641e912359518eaba7e8dd5b4;hpb=1ebaf56647ca9a7fdcc9c55a78cb740f31a6cd1d;p=privoxy.git
diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 04f48f4a..48aff0b8 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -1,18 +1,16 @@
Privoxy is free software; you can
- redistribute it and/or modify it under the terms of the
- GNU General Public
-
- License, version 2, as published by the Free Software Foundation.
+ redistribute and/or modify its source code under the terms
+ of the GNU General Public License
+ as published by the Free Software Foundation, either version 2
+ of the license, or (at your option) any later version.
- 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
- GNU General Public License for
-
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ The same is true for Privoxy binaries
+ unless they are linked with a
+ mbed TLS or
+ OpenSSL version
+ that is licensed under the Apache 2.0 license in which
+ case you can redistribute and/or modify the Privoxy
+ binaries under the terms of the GNU General Public License
+ as published by the Free Software Foundation, either version 3
+ of the license, or (at your option) any later version.
- You should have received a copy of the
- GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc. 59 Temple Place - Suite 330
- Boston, MA 02111-1307
- USA
+ Privoxy 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
+ license for details.
-