X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fcopyright.sgml;h=36063bc8fb3fb7fa90ac80ab3a22c9edc1de365f;hb=ae931e26de71fe1d1bd124ed66e98dbd3f11deaf;hp=05a715c2b60414188b2ef79e7024a33315b8bdb2;hpb=5a73e418fa170b0362734c9da5f4921cd413e5f5;p=privoxy.git
diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 05a715c2..36063bc8 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.3 2002/04/07 08:10:12 swa Exp $
+ $Id: copyright.sgml,v 2.11 2010/02/13 16:36:54 fabiankeil 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-2010 Privoxy Developers http://www.privoxy.org/
+ See LICENSE.
======================================================================
This file used for inclusion with other documents only.
@@ -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 © entity in the man page processing.)
+ **************************************************************
-
- Privoxy is free software; you can
- redistribute it and/or modify it under the terms of the GNU General Public
-
+-->
- License as published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
+
- 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-2011 by Privoxy Developers ijbswa-developers@lists.sourceforge.net
- You should have received a copy of the GNU General Public License
- 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 GNU General Public
+ License.