X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=601574810c34e65610c2d7dfbb052e92c3b5122a;hb=4a39c88bb798b039e2db687ec49b85af1c67f233;hp=19aca5040a517bfdba25d0e872ed96b1bc7f96b9;hpb=24ae0ef3681f9880e9ec8f248a36a64d172f402d;p=privoxy.git
diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 19aca504..60157481 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -1,22 +1,16 @@
-
- License as published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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 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.
-