X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=c62c675a9bbf14a981b955dabe5f19d39a62a863;hb=22a7b114a8f05d586fd5e0961ba8bc2f22b96f47;hp=19aca5040a517bfdba25d0e872ed96b1bc7f96b9;hpb=24ae0ef3681f9880e9ec8f248a36a64d172f402d;p=privoxy.git

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 19aca504..c62c675a 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -2,21 +2,17 @@
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/license.sgml,v $
 
  Purpose     :  Entity included in other project documents.
-                
- $Id: license.sgml,v 1.0 2002/04/26 05:25:23 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: license.sgml,v 2.6 2008/05/23 15:09:48 fabiankeil Exp $
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
+  Copyright (C) 2001-2008 Privoxy Developers http://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:
@@ -31,42 +27,24 @@
 
 <para>
  <application>Privoxy</application> is free software; you can
- redistribute it and/or modify it under the terms of the GNU General Public
-<!-- 
- <informalfigure pgwide="1" float="1">
-    <mediaobject>
-       <imageobject>
-          <imagedata align="left" fileref="../gnu.jpg" format="jpg">
-       </imageobject>
-       <textobject>
-          <phrase>GNU's Pet GNU</phrase>
-       </textobject>
-    </mediaobject>
- </informalfigure>
- or better:
- <inlinegraphic depth="1" align="left" fileref="../gnu.png"></inlinegraphic> 
---> 
-
- License as published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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.
 </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 GNU General Public License for
-<!--
-<figure pgwide="0"><title>The Pythagorean Theorum Illustrated</title>
-</figure>
---> 
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 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.
 </para>
 
 <para>
- You should have received a copy of the <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</ulink>
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ 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>
 </para>