X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fcopyright.sgml;h=71038e574f84938364b2f916623791b7106881db;hb=d9fc94f4078558c957d05f29f74af5b3e051ccaf;hp=dbed178fde5f0f8dfd50bf5ca901a55b8432b18c;hpb=58bf18c4c8d7f01d11f4d46ebcc89a037598331e;p=privoxy.git

diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index dbed178f..71038e57 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.5 2002/05/05 20:26:02 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: copyright.sgml,v 2.14 2011/09/04 11:10:12 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-2013 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,19 +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
- url="http://www.gnu.org/licenses/gpl.html"><citetitle>GNU General Public
- License</citetitle></ulink>, Version 2, as published by the Free Software
- Foundation. A copy of the license can be found <ulink
- url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>.
+ Copyright &my-copy; 2001-2013 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>