X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fcopyright.sgml;h=e4888e967e6e93e1df2c418d686d3d076ba2e6f2;hp=4c5c46d9583559d3b4157f899725010856ccbd18;hb=232c50db35997a523563c704350f4f189910dbb6;hpb=238e5e4fe8e41685ad8fbcdd91f2f834dd3a9a3a

diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 4c5c46d9..e4888e96 100644
--- a/doc/source/copyright.sgml
+++ b/doc/source/copyright.sgml
@@ -3,14 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: copyright.sgml,v 1.2 2002/04/06 05:07:28 hal9 Exp $
+ $Id: copyright.sgml,v 2.5 2006/09/22 01:27:55 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
-
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
+ Copyright (C) 2001-2007 Privoxy Developers http://www.privoxy.org/
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
@@ -25,41 +21,27 @@
   user-manual
   developer-manual
   faq
-  webserver/index.sgml
+
+ **************************************************************
+ NOTE: the &my-copy entity must be defined in any file that will 
+ include this file. (This is a workaround for docbook2man not 
+ handling the standard &copy entity in the man page processing.)
+ **************************************************************
 
 -->
 
-<para>
- <application>Privoxy</application> is free software; you can
- redistribute it and/or modify it under the terms of the GNU General Public
-<!-- 
- <informalfigure float="0">
-    <mediaobject>
-       <imageobject>
-          <imagedata fileref="gnu.jpg" format="jpg">
-       </imageobject>
-       <textobject>
-          <phrase>GNU's Pet GNU</phrase>
-       </textobject>
-    </mediaobject>
- </informalfigure>
---> 
- License as published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-</para>
+<!--
+ GFDL:
+ http://www.gnu.org/licenses/fdl.html
+-->
 
 <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
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ Copyright &my-copy; 2001 - 2007 by Privoxy Developers <email>ijbswa-developers@lists.sourceforge.net</email>
 </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.
+ Some source code is based on code Copyright &my-copy; 1997 by Anonymous Coders
+ and Junkbusters, Inc. and licensed under the <citetitle>GNU General Public
+ License</citetitle>.
 </para>