X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=be1b0c256e95a29e6d31524743603c61f58a9912;hb=ae931e26de71fe1d1bd124ed66e98dbd3f11deaf;hp=358995880d10c9e3f16787c9894f33de9ccc5dd0;hpb=2d07f84175fe3b83bf3d5ba79058768e0d0ec0a4;p=privoxy.git

diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 35899588..be1b0c25 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -3,9 +3,9 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: license.sgml,v 1.2 2002/05/10 01:48:20 hal9 Exp $
+ $Id: license.sgml,v 2.5 2006/09/22 01:27:55 hal9 Exp $
 
-  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
   See LICENSE.
  
  ======================================================================
@@ -28,44 +28,23 @@
 <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.
+ <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 
- <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, 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">
- <citetitle>GNU General Public License</citetitle></ulink>
+ 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>59 Temple Place</street> - Suite 330
- <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
+ Foundation, Inc. <street>51 Franklin Street, Fifth Floor</street>
+ <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>
  <country>USA</country> </address>
 </para>