X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fcopyright.sgml;h=de128d2a76efd842d3c542f823a22939ccc65fc2;hb=028385ac043e6278a5a070b534e40334819e6d79;hp=db8a4f1197569cc24798331946cfdf0d76353b9b;hpb=97c15a26185bd3c99025010fd123849545f48cc1;p=privoxy.git

diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index db8a4f11..de128d2a 100644
--- a/doc/source/copyright.sgml
+++ b/doc/source/copyright.sgml
@@ -2,21 +2,17 @@
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/copyright.sgml,v $
 
  Purpose     :  Entity included in other project documents.
-                
- $Id: copyright.sgml,v 1.4 2002/04/26 05:25:23 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: copyright.sgml,v 2.13 2011/08/18 11:42:50 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-2011 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:
@@ -26,15 +22,26 @@
   developer-manual
   faq
 
+ **************************************************************
+ 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.)
+ **************************************************************
+
+-->
+
+<!--
+ GFDL:
+ http://www.gnu.org/licenses/fdl.html
 -->
 
 <para>
- Permission is granted to copy, distribute and/or modify this document under
- the terms of the <ulink type="help" url="http://www.gnu.org/licenses/fdl.html"><citetitle>GNU Free
- Documentation License</citetitle></ulink>, Version 1.1 or any later version
- published by the Free Software Foundation with no Invariant Sections, no
- Front-Cover Texts, and no Back-Cover Texts.  A copy of the license can be
- found <ulink type="help" url="http://www.gnu.org/licenses/fdl.html">http://www.gnu.org/licenses/fdl.html</ulink>.
+ Copyright &my-copy; 2001-2011 by Privoxy Developers <email>ijbswa-developers@lists.sourceforge.net</email>
 </para>
 
+<para>
+ 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>