X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fcopyright.sgml;h=80ad54a76f85d7b2b8808f164b8adb6d9f959ceb;hp=05a715c2b60414188b2ef79e7024a33315b8bdb2;hb=a976545bde39bbb1cb0a8fe78d175bb8db383d0b;hpb=5a73e418fa170b0362734c9da5f4921cd413e5f5

diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 05a715c2..80ad54a7 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.3 2002/04/07 08:10:12 swa Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ $Id: copyright.sgml,v 2.17 2016/01/16 12:33:45 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-2016 Privoxy Developers https://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:
@@ -25,48 +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 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.
-</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
-<!--
-<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.
+ Copyright &my-copy; 2001-2016 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>