From 47ebc96cd29a0e2de4c752e7b42006c27d365064 Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Fri, 10 May 2002 01:48:21 +0000
Subject: [PATCH] This is mostly proposed copyright/licensing additions and
 changes. Docs are still GPL, but licensing and copyright are more visible.
 Also, copyright changed in doc header comments (eliminate references to JB
 except FAQ).

---
 doc/source/authors.sgml                       |  16 +-
 doc/source/buildsource.sgml                   |  11 +-
 doc/source/contacting.sgml                    |  12 +-
 doc/source/copyright.sgml                     |  29 +-
 doc/source/developer-manual.sgml              |  48 ++--
 doc/source/faq.sgml                           |  40 +--
 doc/source/history.sgml                       |  10 +-
 doc/source/license.sgml                       |  39 ++-
 doc/source/newfeatures.sgml                   |  10 +-
 doc/source/p-authors.sgml                     |  12 +-
 doc/source/privoxy-man-page.sgml              |  16 +-
 doc/source/privoxy.sgml                       |  11 +-
 doc/source/readme.sgml                        |  13 +-
 doc/source/seealso.sgml                       |  14 +-
 doc/source/supported.sgml                     |  10 +-
 doc/source/user-manual.sgml                   |  72 ++---
 doc/source/webserver/index.sgml               |  20 +-
 doc/text/developer-manual.txt                 | 253 +++++++++---------
 doc/text/faq.txt                              |  39 ++-
 doc/text/user-manual.txt                      |  37 ++-
 doc/webserver/developer-manual/coding.html    |   4 +-
 doc/webserver/developer-manual/contact.html   |   4 +-
 doc/webserver/developer-manual/copyright.html |  71 ++++-
 doc/webserver/developer-manual/index.html     |  45 ++--
 doc/webserver/developer-manual/seealso.html   |   4 +-
 doc/webserver/faq/configuration.html          |  16 +-
 doc/webserver/faq/contact.html                |   4 +-
 doc/webserver/faq/copyright.html              |  85 +++++-
 doc/webserver/faq/general.html                |  13 +-
 doc/webserver/faq/index.html                  |  86 +++---
 doc/webserver/faq/installation.html           |   4 +-
 doc/webserver/faq/misc.html                   |  18 +-
 doc/webserver/faq/trouble.html                |   6 +-
 doc/webserver/index.html                      | 100 +++++--
 doc/webserver/man-page/privoxy-man-page.html  |  42 ++-
 doc/webserver/user-manual/appendix.html       |  18 +-
 doc/webserver/user-manual/contact.html        |   7 +-
 doc/webserver/user-manual/copyright.html      |  72 ++++-
 doc/webserver/user-manual/index.html          |  49 ++--
 doc/webserver/user-manual/seealso.html        |   7 +-
 40 files changed, 772 insertions(+), 595 deletions(-)

diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 1e5f2876..64b6728a 100644
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,15 +3,11 @@
 
  Purpose     :  AUTHORS file for Privoxy
                 
- $Id: authors.sgml,v 1.6 2002/04/26 05:25:23 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
+ $Id: authors.sgml,v 1.7 2002/05/04 08:44:44 swa Exp $
 
+ 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -34,8 +30,8 @@
 <!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
-<!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
-<!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc -->
+<!entity % p-text "INCLUDE">           <!-- define we are a text only doc -->
+<!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
 ]>
 
 <article id="index">
diff --git a/doc/source/buildsource.sgml b/doc/source/buildsource.sgml
index fa9e87f4..8e4ee791 100644
--- a/doc/source/buildsource.sgml
+++ b/doc/source/buildsource.sgml
@@ -3,15 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: buildsource.sgml,v 1.7 2002/04/26 17:22:28 swa 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
+ $Id: buildsource.sgml,v 1.8 2002/05/03 17:41:41 oes Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/contacting.sgml b/doc/source/contacting.sgml
index a18be043..28b53eee 100644
--- a/doc/source/contacting.sgml
+++ b/doc/source/contacting.sgml
@@ -3,14 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: contacting.sgml,v 1.11 2002/04/26 17:23:29 swa Exp $
+ $Id: contacting.sgml,v 1.12 2002/04/27 15:34:27 swa 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, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
@@ -27,7 +23,7 @@
 -->
 
 <!-- READ: -->
-<!-- Careful of the literllayout tags and finished formatting -->
+<!-- Careful of the literallayout tags and finished formatting -->
 
 <para>
  We value your feedback. However, to provide you with the best support, please
diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index dbed178f..854d0191 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.5 2002/05/05 20:26:02 hal9 Exp $
+ $Id: copyright.sgml,v 1.6 2002/05/07 00:37:31 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, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
@@ -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, 2002 by Privoxy Developers <email>developers@privoxy.org</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>
 
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 6fd323e2..44c3d93b 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -14,6 +14,7 @@
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
+<!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/developer-manual.sgml,v $
@@ -22,15 +23,10 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa 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
+ $Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -44,14 +40,17 @@
 <article id="index">
   <artheader>
     <title>Privoxy Developer Manual</title>
+    <pubdate>
+     <subscript>
+    <!-- Completely the wrong markup, but very little is allowed  -->
+    <!-- in this part of an article. FIXME -->
+      <link linkend="copyright">Copyright</link> &my-copy; 2001, 2002 by 
+      <ulink url="http://www.privoxy.org">Privoxy Developers</ulink>
+     </subscript>
+    </pubdate>
 
-    <pubdate>$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $</pubdate>
 
-   <copyright>
-    <year>2001</year>
-    <year>2002</year>
-    <holder>Privoxy Developers</holder>
-   </copyright>
+    <pubdate>$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $</pubdate>
 
 <!--
 
@@ -70,16 +69,8 @@ Hal.
 
 -->
 
-<!--
-    <authorgroup>
-      <author>
-        <affiliation>
-          <orgname>By: Privoxy Developers</orgname>
-        </affiliation>
-      </author>
-    </authorgroup>
--->
     <abstract>
+
 <![%dummy;[
  <para>
  <comment>
@@ -1736,7 +1727,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -1796,7 +1787,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -2654,13 +2645,11 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
   
 
 <!--   ~~~~~~~~       New section Header    ~~~~~~~~~     -->
-<sect1 id="copyright"><title>Copyright, License and History</title>
+<sect1 id="copyright"><title>Privoxy Copyright, License and History</title>
 
-<sect2><title>Copyright</title>
 <!-- Include copyright.sgml -->
  &copyright;
 <!-- end -->
-</sect2>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect2><title>License</title>
@@ -2708,6 +2697,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 1.42  2002/05/05 20:26:02  hal9
+  Sorting out license vs copyright in these docs.
+
   Revision 1.41  2002/05/04 08:44:44  swa
   bumped version
 
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 26555c33..0eda1d9d 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -15,6 +15,7 @@
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-supp-userman "INCLUDE"> <!-- Include all from supported.sgml -->
+<!entity  my-copy "&copy;">          <!-- kludge for docbook2man          -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/faq.sgml,v $
@@ -23,14 +24,14 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $
+ $Id: faq.sgml,v 1.57 2002/05/05 20:26:02 hal9 Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
+ Based partially on the Internet Junkbuster FAQ originally written by and
+ Copyright (C) 1997 Anonymous Coders and Junkbusters Corporation.
+ http://www.junkbusters.com
 
  <Qandaset defaultlabel='qanda'>
   <QandAEntry>
@@ -62,14 +63,16 @@
 <artheader>
 <title>Privoxy Frequently Asked Questions</title>
 
-<pubdate>$Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $</pubdate>
+<pubdate>
+ <subscript>
+<!-- Completely the wrong markup, but very little is allowed  -->
+<!-- in this part of an article. FIXME -->
+ <link linkend="copyright">Copyright</link> &my-copy; 2001, 2002 by 
+ <ulink url="http://www.privoxy.org">Privoxy Developers</ulink>
+ </subscript>
+</pubdate>
 
-
-   <copyright>
-    <year>2001</year>
-    <year>2002</year>
-    <holder>Privoxy Developers</holder>
-   </copyright>
+<pubdate>$Id: faq.sgml,v 1.57 2002/05/05 20:26:02 hal9 Exp $</pubdate>
 
 <!--
 
@@ -316,7 +319,8 @@ warranty? Registration?</title>
   License (GPL). It is free to use, copy, modify or distribute as you wish
   under the terms of this license.  Please see the <link
   linkend="copyright">Copyright</link> section for more information on the
-  license and copyright.
+  license and copyright. Or the <filename>LICENSE</filename> file 
+  that should be included.
 
   </para>
  <para>
@@ -1440,18 +1444,17 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
   </sect1>
   
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect1 id="copyright"><title>Copyright, License and History</title>
+<sect1 id="copyright"><title>Privoxy Copyright, License and History</title>
 
- <sect2><title>Copyright</title>
  <!-- Include copyright.sgml -->
   &copyright;
  <!-- end -->
+  
   <para>
    Portions of this document are <quote>borrowed</quote> from the original
    <application>Junkbuster</application> (tm) FAQ, and modified as 
    appropriate for <application>Privoxy</application>.
   </para>
- </sect2>
 
  <!--   ~~~~~       New section      ~~~~~     -->
  <sect2><title>License</title>
@@ -1510,6 +1513,9 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $
+Revision 1.57  2002/05/05 20:26:02  hal9
+Sorting out license vs copyright in these docs.
+
 Revision 1.56  2002/05/04 08:44:44  swa
 bumped version
 
diff --git a/doc/source/history.sgml b/doc/source/history.sgml
index 7b2e1f4e..ec0b852c 100644
--- a/doc/source/history.sgml
+++ b/doc/source/history.sgml
@@ -3,14 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: history.sgml,v 1.3 2002/04/07 08:10:12 swa Exp $
+ $Id: history.sgml,v 1.4 2002/04/09 11:49:32 swa 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, 2002 Privoxy Developers <developers@privoxy.org>
+  See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/license.sgml b/doc/source/license.sgml
index 19aca504..79df71cb 100644
--- a/doc/source/license.sgml
+++ b/doc/source/license.sgml
@@ -3,15 +3,11 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: license.sgml,v 1.0 2002/04/26 05:25:23 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
+ $Id: license.sgml,v 1.1 2002/05/05 20:20:00 hal9 Exp $
 
+  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+  See LICENSE.
+ 
  ======================================================================
   This file used for inclusion with other documents only.
  ======================================================================
@@ -31,12 +27,13 @@
 
 <para>
  <application>Privoxy</application> is free software; you can
- redistribute it and/or modify it under the terms of the GNU General Public
-<!-- 
+ redistribute it and/or modify it under the terms of the 
+ <citetitle>GNU General Public
+<!--
  <informalfigure pgwide="1" float="1">
     <mediaobject>
        <imageobject>
-          <imagedata align="left" fileref="../gnu.jpg" format="jpg">
+          <imagedata scale="300" width="300" scalefit="1" fileref="../gnu.jpg" format="jpg">
        </imageobject>
        <textobject>
           <phrase>GNU's Pet GNU</phrase>
@@ -44,17 +41,16 @@
     </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.
+ <inlinegraphic depth="1" scale="300" align="left" fileref="../gnu.jpg"></inlinegraphic> 
+-->
+ License</citetitle>, version 2, as published by the Free Software Foundation.
 </para>
 
 <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
+ FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ <citetitle>GNU General Public License</citetitle> for
 <!--
 <figure pgwide="0"><title>The Pythagorean Theorum Illustrated</title>
 </figure>
@@ -65,8 +61,11 @@
 
 <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.
+ url="http://www.gnu.org/copyleft/gpl.html">
+ <citetitle>GNU General Public License</citetitle></ulink>
+ along with this program; if not, write to the <address> Free Software
+ Foundation, Inc. <street>59 Temple Place</street> - Suite 330
+ <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>
+ <country>USA</country> </address>
 </para>
 
diff --git a/doc/source/newfeatures.sgml b/doc/source/newfeatures.sgml
index 8290dd71..822661d2 100644
--- a/doc/source/newfeatures.sgml
+++ b/doc/source/newfeatures.sgml
@@ -3,14 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: newfeatures.sgml,v 1.7 2002/04/26 17:24:31 swa Exp $
+ $Id: newfeatures.sgml,v 1.8 2002/05/03 17:43:22 oes 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, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/p-authors.sgml b/doc/source/p-authors.sgml
index 21cfdc22..687278f1 100644
--- a/doc/source/p-authors.sgml
+++ b/doc/source/p-authors.sgml
@@ -3,16 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: p-authors.sgml,v 1.4 2002/04/15 19:08:39 jongfoster 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
-
+ $Id: p-authors.sgml,v 1.5 2002/04/15 23:37:18 oes Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 10b04fb8..dabab051 100644
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,14 +5,10 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: privoxy-man-page.sgml,v 1.10 2002/05/04 08:44:44 swa Exp $
+ $Id: privoxy-man-page.sgml,v 1.11 2002/05/05 20:26:02 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, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -52,17 +48,19 @@
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->
+<!entity my-copy "(C)">               <!-- db2man barfs on copyright symbol  -->
 ]>
 
 <refentry id="privoxy">
 <refentryinfo>
  <date>2002-04-11</date>
 </refentryinfo>
-
 <refmeta>
  <refentrytitle>privoxy</refentrytitle> 
  <manvolnum>1</manvolnum>
- <refmiscinfo>Privoxy &p-version;<![%p-not-stable;[ &p-status;]]></refmiscinfo>
+ <refmiscinfo>
+  Privoxy &p-version;<![%p-not-stable;[ &p-status;]]>
+ </refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff --git a/doc/source/privoxy.sgml b/doc/source/privoxy.sgml
index 4ad8b8f7..8ecbcc39 100644
--- a/doc/source/privoxy.sgml
+++ b/doc/source/privoxy.sgml
@@ -3,15 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: privoxy.sgml,v 1.5 2002/04/08 20:40:26 swa 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
+ $Id: privoxy.sgml,v 1.6 2002/04/15 23:31:42 oes Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index 2aef6159..0970d429 100644
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -17,15 +17,10 @@
 
  Purpose     :  README for Privoxy
                 
- $Id: readme.sgml,v 1.14 2002/05/05 13:46:59 swa 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
+ $Id: readme.sgml,v 1.15 2002/05/05 17:35:32 hal9 Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -243,7 +238,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
-<!--  $Id: readme.sgml,v 1.14 2002/05/05 13:46:59 swa Exp $ -->
+<!--  $Id: readme.sgml,v 1.15 2002/05/05 17:35:32 hal9 Exp $ -->
 <!-- </para> -->
 
 </article>
diff --git a/doc/source/seealso.sgml b/doc/source/seealso.sgml
index 7c2c8563..d65d471f 100644
--- a/doc/source/seealso.sgml
+++ b/doc/source/seealso.sgml
@@ -3,16 +3,14 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: seealso.sgml,v 1.5 2002/04/10 04:06:44 hal9 Exp $
+ $Id: seealso.sgml,v 1.6 2002/04/28 16:22:56 swa Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
- Privoxy team. http://www.privoxy.org/
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
-
-      ===========================================
+ ======================================================================
+  This file used for inclusion with other documents only.
+ ======================================================================
 
  If you make changes to this file, please verify the finished 
  docs all display as intended.
diff --git a/doc/source/supported.sgml b/doc/source/supported.sgml
index 330bd28b..a7a5d12d 100644
--- a/doc/source/supported.sgml
+++ b/doc/source/supported.sgml
@@ -3,14 +3,10 @@
 
  Purpose     :  Entity included in other project documents.
                 
- $Id: supported.sgml,v 1.7 2002/04/18 01:05:56 hal9 Exp $
+ $Id: supported.sgml,v 1.8 2002/04/26 17:24:31 swa 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, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ======================================================================
   This file used for inclusion with other documents only.
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 3ca63862..ffc8623b 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -18,6 +18,7 @@
 <!entity % p-readme "IGNORE">
 <!entity % p-config "IGNORE">
 <!entity % p-supp-userman "IGNORE"> <!-- Omit some from supported.sgml    -->
+<!entity  my-copy "&copy;">         <!-- kludge for docbook2man           -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/user-manual.sgml,v $
@@ -26,15 +27,10 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa 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
+ $Id: user-manual.sgml,v 1.105 2002/05/05 20:26:02 hal9 Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -48,24 +44,32 @@
 
 <title>Privoxy User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa Exp $</pubdate>
-
-<copyright>
-  <year>2001</year>
-  <year>2002</year>
-  <holder>Privoxy Developers</holder>
-</copyright>
+<pubdate>
+ <subscript>
+<!-- Completely the wrong markup, but very little is allowed  -->
+<!-- in this part of an article. FIXME -->
+ <link linkend="copyright">Copyright</link> &my-copy; 2001, 2002 by 
+ <ulink url="http://www.privoxy.org">Privoxy Developers</ulink>
+ </subscript>
+</pubdate>
 
+<pubdate>$Id: user-manual.sgml,v 1.105 2002/05/05 20:26:02 hal9 Exp $</pubdate>
 
 <!--
 
-Note: this should generate a separate page, and a live link to it. 
-But it doesn't for some mysterious reason. Please leave commented
-unless it can be fixed proper. For the time being, the copyright 
-statement will be in copyright.smgl.
+Note: the following should generate a separate page, and a live link to it,
+all nicely done. But it doesn't for some mysterious reason. Please leave
+commented unless it can be fixed proper. For the time being, the
+copyright/license declarations will be in their own sgml.
 
 Hal.
 
+<copyright>
+  <year>2001</year>
+  <year>2002</year>
+  <holder>Privoxy Developers</holder>
+</copyright>
+
 <legalnotice id="legalnotice"> 
  <para>
   text goes here ........
@@ -74,16 +78,9 @@ Hal.
 
 -->
 
-<!--
-<authorgroup>
- <author>
-  <affiliation>
-   <orgname>By: Privoxy Developers</orgname>
-   </affiliation>
- </author>
-</authorgroup>
--->
+
 <abstract>
+
 <![%dummy;[
  <para>
  <comment>
@@ -98,7 +95,7 @@ Hal.
   The user manual gives users information on how to install, configure and use
   <ulink
   url="http://www.privoxy.org/"><application>Privoxy</application></ulink>.
-  </para>
+ </para>
 
 <!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
@@ -109,7 +106,7 @@ Hal.
   url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/user-manual/</ulink>.
   Please see the <ulink url="contact.html">Contact section</ulink> on how to
   contact the developers.
-  </para>
+ </para>
 
 <!--   <para> -->
 <!--    Feel free to send a note to the developers at <email>ijbswa-developers@lists.sourceforge.net</email>. -->
@@ -326,8 +323,6 @@ automatically start Privoxy in the boot process.
 &buildsource;
 <!-- end boilerplate -->
 
-
-
 </sect2>
 
 </sect1>
@@ -5034,16 +5029,15 @@ Requests</title>
 
 </sect1>
 
+<!--  ~  End section  ~  -->
+
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect1 id="copyright"><title>Copyright, License and History</title>
+<sect1 id="copyright"><title><application>Privoxy</application> Copyright, License and History</title>
 
-<sect2><title>Copyright</title>
 <!-- Include copyright.sgml: -->
  &copyright;
 <!-- end copyright -->
-</sect2>
-<!--  ~  End section  ~  -->
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect2><title>License</title>
@@ -5063,6 +5057,9 @@ Requests</title>
 </sect2>
 </sect1>
 
+<!--  ~  End section  ~  -->
+
+
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 id="seealso"><title>See Also</title>
 <!-- Include seealso.sgml: -->
@@ -5956,6 +5953,9 @@ Requests</title>
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.105  2002/05/05 20:26:02  hal9
+ Sorting out license vs copyright in these docs.
+
  Revision 1.104  2002/05/04 08:44:45  swa
  bumped version
 
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 94074acb..eb42413f 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -12,6 +12,7 @@
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-doc "INCLUDE">        <!-- and we are a formal doc           -->
 <!entity % p-readme "IGNORE">
+<!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/webserver/index.sgml,v $
@@ -20,15 +21,10 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.12 2002/05/05 20:26:02 hal9 Exp $
-
- Written by and Copyright (C) 2001, 2002 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
+ $Id: index.sgml,v 1.13 2002/05/05 20:29:59 hal9 Exp $
 
+ Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
@@ -175,6 +171,9 @@ page</ulink> on Sourceforge
 <sect1 label="">
 <title>License</title>
 <!-- Include copyright.sgml -->
+ &copyright;
+<!-- end -->
+<!-- Include license.sgml -->
  &license;
 <!-- end -->
 </sect1>
@@ -220,7 +219,9 @@ page</ulink> on Sourceforge
 
 <!-- Formal copyright markup does not work here. HB. -->
 <para>
+ <subscript>
   Copyright &copy; 2001, 2002 by Privoxy Developers
+ </subscript>
 </para>
 
 </sect1>
@@ -246,6 +247,9 @@ page</ulink> on Sourceforge
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 1.13  2002/05/05 20:29:59  hal9
+ Ooops, fixing an accidental delete of title element.
+
  Revision 1.12  2002/05/05 20:26:02  hal9
  Sorting out license vs copyright in these docs.
 
diff --git a/doc/text/developer-manual.txt b/doc/text/developer-manual.txt
index ca4f08d0..99df01d2 100644
--- a/doc/text/developer-manual.txt
+++ b/doc/text/developer-manual.txt
@@ -2,7 +2,7 @@ Privoxy Developer Manual
 
 Copyright © 2001, 2002 by Privoxy Developers
 
-$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $
+$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $
 
 The developer manual gives the users information on how to help the developer
 team. It provides guidance on coding, testing, documentation and other issues.
@@ -129,11 +129,10 @@ Table of Contents
     8.4. Report ads or other filter problems
     8.5. Other
    
-9. Copyright, License and History
+9. Privoxy Copyright, License and History
    
-    9.1. Copyright
-    9.2. License
-    9.3. History
+    9.1. License
+    9.2. History
    
 10. See also
 
@@ -1371,49 +1370,49 @@ from the project).
 
 Example for file comments:
 
-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $"; 
-/*********************************************************************                         
- *                                                                                             
- * File        :  $Source$                                                                     
- *                                                                                             
- * Purpose     :  (Fill me in with a good description!)                                        
- *                                                                                             
- * Copyright   :  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                         
- *                                                                                             
- *                This program 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.                                                    
- *                                                                                             
- *                The GNU General Public License should be included with                       
- *                this file.  If not, you can view it at                                       
- *                http://www.gnu.org/copyleft/gpl.html                                         
- *                or write to the Free Software Foundation, Inc., 59                           
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                       
- *                                                                                             
- * Revisions   :                                                                               
- *    $Log$                                                                                    
- *                                                                                             
- *********************************************************************/                        
-                                                                                               
-                                                                                               
-#include "config.h"                                                                            
-                                                                                               
-   ...necessary include files for us to do our work...                                         
-                                                                                               
-const char FILENAME_h_rcs[] = FILENAME_H_VERSION;                                              
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $"; 
+/*********************************************************************                          
+ *                                                                                              
+ * File        :  $Source$                                                                      
+ *                                                                                              
+ * Purpose     :  (Fill me in with a good description!)                                         
+ *                                                                                              
+ * Copyright   :  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                          
+ *                                                                                              
+ *                This program 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.                                                     
+ *                                                                                              
+ *                The GNU General Public License should be included with                        
+ *                this file.  If not, you can view it at                                        
+ *                http://www.gnu.org/copyleft/gpl.html                                          
+ *                or write to the Free Software Foundation, Inc., 59                            
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                        
+ *                                                                                              
+ * Revisions   :                                                                                
+ *    $Log$                                                                                     
+ *                                                                                              
+ *********************************************************************/                         
+                                                                                                
+                                                                                                
+#include "config.h"                                                                             
+                                                                                                
+   ...necessary include files for us to do our work...                                          
+                                                                                                
+const char FILENAME_h_rcs[] = FILENAME_H_VERSION;                                               
 
 Note: This declares the rcs variables that should be added to the
 "show-proxy-args" page. If this is a brand new creation by you, you are free to
@@ -1426,71 +1425,71 @@ can.
 
 Example for file header comments:
 
-#ifndef _FILENAME_H                                                                          
-#define _FILENAME_H                                                                          
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $" 
-/*********************************************************************                       
- *                                                                                           
- * File        :  $Source$                                                                   
- *                                                                                           
- * Purpose     :  (Fill me in with a good description!)                                      
- *                                                                                           
- * Copyright   :  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                       
- *                                                                                           
- *                This program 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.                                                  
- *                                                                                           
- *                The GNU General Public License should be included with                     
- *                this file.  If not, you can view it at                                     
- *                http://www.gnu.org/copyleft/gpl.html                                       
- *                or write to the Free Software Foundation, Inc., 59                         
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                     
- *                                                                                           
- * Revisions   :                                                                             
- *    $Log$                                                                                  
- *                                                                                           
- *********************************************************************/                      
-                                                                                             
-                                                                                             
-#include "project.h"                                                                         
-                                                                                             
-#ifdef __cplusplus                                                                           
-extern "C" {                                                                                 
-#endif                                                                                       
-                                                                                             
-   ... function headers here ...                                                             
-                                                                                             
-                                                                                             
-/* Revision control strings from this header and associated .c file */                       
-extern const char FILENAME_rcs[];                                                            
-extern const char FILENAME_h_rcs[];                                                          
-                                                                                             
-                                                                                             
-#ifdef __cplusplus                                                                           
-} /* extern "C" */                                                                           
-#endif                                                                                       
-                                                                                             
-#endif /* ndef _FILENAME_H */                                                                
-                                                                                             
-/*                                                                                           
-  Local Variables:                                                                           
-  tab-width: 3                                                                               
-  end:                                                                                       
-*/                                                                                           
+#ifndef _FILENAME_H                                                                           
+#define _FILENAME_H                                                                           
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $" 
+/*********************************************************************                        
+ *                                                                                            
+ * File        :  $Source$                                                                    
+ *                                                                                            
+ * Purpose     :  (Fill me in with a good description!)                                       
+ *                                                                                            
+ * Copyright   :  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                        
+ *                                                                                            
+ *                This program 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.                                                   
+ *                                                                                            
+ *                The GNU General Public License should be included with                      
+ *                this file.  If not, you can view it at                                      
+ *                http://www.gnu.org/copyleft/gpl.html                                        
+ *                or write to the Free Software Foundation, Inc., 59                          
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.                      
+ *                                                                                            
+ * Revisions   :                                                                              
+ *    $Log$                                                                                   
+ *                                                                                            
+ *********************************************************************/                       
+                                                                                              
+                                                                                              
+#include "project.h"                                                                          
+                                                                                              
+#ifdef __cplusplus                                                                            
+extern "C" {                                                                                  
+#endif                                                                                        
+                                                                                              
+   ... function headers here ...                                                              
+                                                                                              
+                                                                                              
+/* Revision control strings from this header and associated .c file */                        
+extern const char FILENAME_rcs[];                                                             
+extern const char FILENAME_h_rcs[];                                                           
+                                                                                              
+                                                                                              
+#ifdef __cplusplus                                                                            
+} /* extern "C" */                                                                            
+#endif                                                                                        
+                                                                                              
+#endif /* ndef _FILENAME_H */                                                                 
+                                                                                              
+/*                                                                                            
+  Local Variables:                                                                            
+  tab-width: 3                                                                                
+  end:                                                                                        
+*/                                                                                            
 
 Example for function comments:
 
@@ -2072,24 +2071,20 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-9. Copyright, License and History
+9. Privoxy Copyright, License and History
 
-9.1. Copyright
+Copyright © 2001, 2002 by Privoxy Developers <developers@privoxy.org>
 
-Permission is granted to copy, distribute and/or modify this document under the
-terms of the GNU Free Documentation License, 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 
-http://www.gnu.org/licenses/fdl.html.
+Some source code is based on code Copyright © 1997 by Anonymous Coders and
+Junkbusters, Inc. and licensed under the GNU General Public License.
 
 -------------------------------------------------------------------------------
 
-9.2. License
+9.1. License
 
 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.
+terms of the GNU General Public License, version 2, as published by the Free
+Software Foundation.
 
 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
@@ -2098,12 +2093,16 @@ is available from the Free Software Foundation, Inc, 59 Temple Place - Suite
 330, Boston, MA 02111-1307, USA.
 
 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.
+this program; if not, write to the
+
+ Free Software
+ Foundation, Inc. 59 Temple Place - Suite 330
+ Boston, MA 02111-1307
+ USA 
 
 -------------------------------------------------------------------------------
 
-9.3. History
+9.2. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
diff --git a/doc/text/faq.txt b/doc/text/faq.txt
index 96af8366..5c4cbeb8 100644
--- a/doc/text/faq.txt
+++ b/doc/text/faq.txt
@@ -2,7 +2,7 @@ Privoxy Frequently Asked Questions
 
 Copyright © 2001, 2002 by Privoxy Developers
 
-$Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $
+$Id: faq.sgml,v 1.57 2002/05/05 20:26:02 hal9 Exp $
 
 This FAQ gives users and developers alike answers to frequently asked questions
 about Privoxy .
@@ -110,11 +110,10 @@ Table of Contents
     6.4. Report ads or other filter problems
     6.5. Other
    
-7. Copyright, License and History
+7. Privoxy Copyright, License and History
    
-    7.1. Copyright
-    7.2. License
-    7.3. History
+    7.1. License
+    7.2. History
    
 1. General Information
 
@@ -279,7 +278,7 @@ you don't have to maintain a similar configuration for possibly many browsers.
 Privoxy is licensed under the GNU General Public License (GPL). It is free to
 use, copy, modify or distribute as you wish under the terms of this license.
 Please see the Copyright section for more information on the license and
-copyright.
+copyright. Or the LICENSE file that should be included.
 
 There is no warranty of any kind, expressed, implied or otherwise. That is
 something that would cost real money ;-) There is no registration either.
@@ -975,27 +974,23 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-7. Copyright, License and History
+7. Privoxy Copyright, License and History
 
-7.1. Copyright
+Copyright © 2001, 2002 by Privoxy Developers <developers@privoxy.org>
 
-Permission is granted to copy, distribute and/or modify this document under the
-terms of the GNU Free Documentation License, 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 
-http://www.gnu.org/licenses/fdl.html.
+Some source code is based on code Copyright © 1997 by Anonymous Coders and
+Junkbusters, Inc. and licensed under the GNU General Public License.
 
 Portions of this document are "borrowed" from the original Junkbuster (tm) FAQ,
 and modified as appropriate for Privoxy.
 
 -------------------------------------------------------------------------------
 
-7.2. License
+7.1. License
 
 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.
+terms of the GNU General Public License, version 2, as published by the Free
+Software Foundation.
 
 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
@@ -1004,12 +999,16 @@ is available from the Free Software Foundation, Inc, 59 Temple Place - Suite
 330, Boston, MA 02111-1307, USA.
 
 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.
+this program; if not, write to the
+
+ Free Software
+ Foundation, Inc. 59 Temple Place - Suite 330
+ Boston, MA 02111-1307
+ USA 
 
 -------------------------------------------------------------------------------
 
-7.3. History
+7.2. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
diff --git a/doc/text/user-manual.txt b/doc/text/user-manual.txt
index d3b91f38..90b93b99 100644
--- a/doc/text/user-manual.txt
+++ b/doc/text/user-manual.txt
@@ -2,7 +2,7 @@ Privoxy User Manual
 
 Copyright © 2001, 2002 by Privoxy Developers
 
-$Id: user-manual.sgml,v 1.104 2002/05/04 08:44:45 swa Exp $
+$Id: user-manual.sgml,v 1.105 2002/05/05 20:26:02 hal9 Exp $
 
 The user manual gives users information on how to install, configure and use 
 Privoxy.
@@ -149,11 +149,10 @@ Table of Contents
     11.4. Report ads or other filter problems
     11.5. Other
    
-12. Copyright, License and History
+12. Privoxy Copyright, License and History
    
-    12.1. Copyright
-    12.2. License
-    12.3. History
+    12.1. License
+    12.2. History
    
 13. See Also
 14. Appendix
@@ -3077,24 +3076,20 @@ too. See the page on Sourceforge.
 
 -------------------------------------------------------------------------------
 
-12. Copyright, License and History
+12. Privoxy Copyright, License and History
 
-12.1. Copyright
+Copyright © 2001, 2002 by Privoxy Developers <developers@privoxy.org>
 
-Permission is granted to copy, distribute and/or modify this document under the
-terms of the GNU Free Documentation License, 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 
-http://www.gnu.org/licenses/fdl.html.
+Some source code is based on code Copyright © 1997 by Anonymous Coders and
+Junkbusters, Inc. and licensed under the GNU General Public License.
 
 -------------------------------------------------------------------------------
 
-12.2. License
+12.1. License
 
 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.
+terms of the GNU General Public License, version 2, as published by the Free
+Software Foundation.
 
 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
@@ -3103,12 +3098,16 @@ is available from the Free Software Foundation, Inc, 59 Temple Place - Suite
 330, Boston, MA 02111-1307, USA.
 
 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.
+this program; if not, write to the
+
+ Free Software
+ Foundation, Inc. 59 Temple Place - Suite 330
+ Boston, MA 02111-1307
+ USA 
 
 -------------------------------------------------------------------------------
 
-12.3. History
+12.2. History
 
 Privoxy is evolved, and derived from, the Internet Junkbuster, with many
 improvments and enhancements over the original.
diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 28b00173..06b207ca 100644
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2019,7 +2019,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $";
+>const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $Source$
@@ -2097,7 +2097,7 @@ WIDTH="100%"
 CLASS="PROGRAMLISTING"
 >#ifndef _FILENAME_H
 #define _FILENAME_H
-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $Source$
diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index 1e5a773f..3848767a 100644
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -13,7 +13,7 @@ REL="PREVIOUS"
 TITLE="Update the Webserver"
 HREF="webserver-update.html"><LINK
 REL="NEXT"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -265,7 +265,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Copyright and History</TD
+>Privoxy Copyright, License and History</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index e4a3f2eb..783b6f72 100644
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Copyright and History</TITLE
+>Privoxy Copyright, License and History</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.64
@@ -71,30 +71,50 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="COPYRIGHT"
->9. Copyright and History</A
+>9. Privoxy Copyright, License and History</A
 ></H1
+><P
+> Copyright © 2001, 2002 by Privoxy Developers <TT
+CLASS="EMAIL"
+>&#60;<A
+HREF="mailto:developers@privoxy.org"
+>developers@privoxy.org</A
+>&#62;</TT
+></P
+><P
+> Some source code is based on code Copyright © 1997 by Anonymous Coders
+ and Junkbusters, Inc. and licensed under the <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>.</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1057"
->9.1. Copyright</A
+NAME="AEN1061"
+>9.1. License</A
 ></H2
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > 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.</P
+ redistribute it and/or modify it under the terms of the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>, version 2, as published by the Free Software Foundation.</P
 ><P
 > 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
+ FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+> for
  
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
@@ -102,17 +122,40 @@ CLASS="APPLICATION"
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
 TARGET="_top"
->GNU General Public License</A
+> <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+></A
 >
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.</P
+ along with this program; if not, write to the <P
+CLASS="ADDRESS"
+>&nbsp;Free&nbsp;Software<br>
+&nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
+CLASS="STREET"
+>59 Temple Place</SPAN
+>&nbsp;-&nbsp;Suite&nbsp;330<br>
+&nbsp;<SPAN
+CLASS="CITY"
+>Boston</SPAN
+>,&nbsp;<SPAN
+CLASS="STATE"
+>MA</SPAN
+>&nbsp;<SPAN
+CLASS="POSTCODE"
+>02111-1307</SPAN
+><br>
+&nbsp;<SPAN
+CLASS="COUNTRY"
+>USA</SPAN
+>&nbsp;</P
+></P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1064"
+NAME="AEN1077"
 >9.2. History</A
 ></H2
 ><P
diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 63775749..e4a139f8 100644
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -29,27 +29,26 @@ CLASS="TITLE"
 NAME="AEN2"
 >Privoxy Developer Manual</A
 ></H1
-><DIV
-CLASS="AUTHORGROUP"
-><A
-NAME="AEN5"
-></A
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
-></H3
-><DIV
-CLASS="AFFILIATION"
-><SPAN
-CLASS="ORGNAME"
->By: Privoxy Developers<BR></SPAN
-></DIV
-></DIV
 ><P
 CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $<BR></P
+>     <SUB
+>    
+    
+      <A
+HREF="copyright.html"
+>Copyright</A
+> © 2001, 2002 by 
+      <A
+HREF="http://www.privoxy.org"
+TARGET="_top"
+>Privoxy Developers</A
+>
+     </SUB
+>
+    <BR></P
+><P
+CLASS="PUBDATE"
+>$Id: developer-manual.sgml,v 1.42 2002/05/05 20:26:02 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -588,18 +587,18 @@ HREF="contact.html#CONTACT-OTHER"
 ><DT
 >9. <A
 HREF="copyright.html"
->Copyright and History</A
+>Privoxy Copyright, License and History</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.1. <A
-HREF="copyright.html#AEN1057"
->Copyright</A
+HREF="copyright.html#AEN1061"
+>License</A
 ></DT
 ><DT
 >9.2. <A
-HREF="copyright.html#AEN1064"
+HREF="copyright.html#AEN1077"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/developer-manual/seealso.html b/doc/webserver/developer-manual/seealso.html
index 1dc8fce0..8cee57e3 100644
--- a/doc/webserver/developer-manual/seealso.html
+++ b/doc/webserver/developer-manual/seealso.html
@@ -10,7 +10,7 @@ REL="HOME"
 TITLE="Privoxy Developer Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -297,7 +297,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Copyright and History</TD
+>Privoxy Copyright, License and History</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
diff --git a/doc/webserver/faq/configuration.html b/doc/webserver/faq/configuration.html
index d575d161..506e60b2 100644
--- a/doc/webserver/faq/configuration.html
+++ b/doc/webserver/faq/configuration.html
@@ -105,7 +105,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN232"
+NAME="AEN234"
 >3.2. What is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -165,7 +165,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN247"
+NAME="AEN249"
 >3.4. How are actions files configured? What is the easiest
 way to do this?</A
 ></H3
@@ -202,7 +202,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN255"
+NAME="AEN257"
 >3.5. There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -306,7 +306,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN281"
+NAME="AEN283"
 >3.7. What is <SPAN
 CLASS="QUOTE"
 >"default.filter"</SPAN
@@ -356,7 +356,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN294"
+NAME="AEN296"
 >3.8. How can I set up <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -409,7 +409,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN306"
+NAME="AEN308"
 >3.9. Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></H3
 ><P
@@ -484,7 +484,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN325"
+NAME="AEN327"
 >3.10. Why would anybody want to see a checkerboard pattern?</A
 ></H3
 ><P
@@ -505,7 +505,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN330"
+NAME="AEN332"
 >3.11. I see large red banners on some pages that say 
 <SPAN
 CLASS="QUOTE"
diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index bc2f42ce..5be9576e 100644
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -13,7 +13,7 @@ REL="PREVIOUS"
 TITLE="Troubleshooting"
 HREF="trouble.html"><LINK
 REL="NEXT"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -265,7 +265,7 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Copyright and History</TD
+>Privoxy Copyright, License and History</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 10c1fc67..11efe1d6 100644
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Copyright and History</TITLE
+>Privoxy Copyright, License and History</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.64
@@ -65,30 +65,64 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="COPYRIGHT"
->7. Copyright and History</A
+>7. Privoxy Copyright, License and History</A
 ></H1
+><P
+> Copyright © 2001, 2002 by Privoxy Developers <TT
+CLASS="EMAIL"
+>&#60;<A
+HREF="mailto:developers@privoxy.org"
+>developers@privoxy.org</A
+>&#62;</TT
+></P
+><P
+> Some source code is based on code Copyright © 1997 by Anonymous Coders
+ and Junkbusters, Inc. and licensed under the <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>.</P
+><P
+>   Portions of this document are <SPAN
+CLASS="QUOTE"
+>"borrowed"</SPAN
+> from the original
+   <SPAN
+CLASS="APPLICATION"
+>Junkbuster</SPAN
+> (tm) FAQ, and modified as 
+   appropriate for <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>.
+  </P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN637"
->7.1. Copyright</A
+NAME="AEN647"
+>7.1. License</A
 ></H2
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > 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.</P
+ redistribute it and/or modify it under the terms of the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>, version 2, as published by the Free Software Foundation.</P
 ><P
 > 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
+ FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+> for
  
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
@@ -96,17 +130,40 @@ CLASS="APPLICATION"
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
 TARGET="_top"
->GNU General Public License</A
+> <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+></A
 >
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.</P
+ along with this program; if not, write to the <P
+CLASS="ADDRESS"
+>&nbsp;Free&nbsp;Software<br>
+&nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
+CLASS="STREET"
+>59 Temple Place</SPAN
+>&nbsp;-&nbsp;Suite&nbsp;330<br>
+&nbsp;<SPAN
+CLASS="CITY"
+>Boston</SPAN
+>,&nbsp;<SPAN
+CLASS="STATE"
+>MA</SPAN
+>&nbsp;<SPAN
+CLASS="POSTCODE"
+>02111-1307</SPAN
+><br>
+&nbsp;<SPAN
+CLASS="COUNTRY"
+>USA</SPAN
+>&nbsp;</P
+></P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN644"
+NAME="AEN663"
 >7.2. History</A
 ></H2
 ><P
diff --git a/doc/webserver/faq/general.html b/doc/webserver/faq/general.html
index d3e9aade..c157e7cb 100644
--- a/doc/webserver/faq/general.html
+++ b/doc/webserver/faq/general.html
@@ -491,7 +491,7 @@ CLASS="APPLICATION"
  includes tools to help identify these types of situations so they can be
  addressed as needed, allowing you to customize your installation.
  (<A
-HREF="trouble.html#AEN576"
+HREF="trouble.html#AEN578"
 >See the Troubleshooting section below</A
 >.)</P
 ></DIV
@@ -549,8 +549,15 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 > is licensed under the GNU General Public
   License (GPL). It is free to use, copy, modify or distribute as you wish
-  under the terms of this license.  Please see the Copyright section for more
-  information on the license and copyright.
+  under the terms of this license.  Please see the <A
+HREF="copyright.html"
+>Copyright</A
+> section for more information on the
+  license and copyright. Or the <TT
+CLASS="FILENAME"
+>LICENSE</TT
+> file 
+  that should be included.
 
   </P
 ><P
diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index a75ced49..835cf776 100644
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -29,27 +29,23 @@ CLASS="TITLE"
 NAME="AEN2"
 >Privoxy Frequently Asked Questions</A
 ></H1
-><DIV
-CLASS="AUTHORGROUP"
-><A
-NAME="AEN5"
-></A
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
-></H3
-><DIV
-CLASS="AFFILIATION"
-><SPAN
-CLASS="ORGNAME"
->By: Privoxy Developers<BR></SPAN
-></DIV
-></DIV
 ><P
 CLASS="PUBDATE"
->$Id: faq.sgml,v 1.55 2002/05/04 00:41:56 hal9 Exp $<BR></P
+> <SUB
+> <A
+HREF="copyright.html"
+>Copyright</A
+> © 2001, 2002 by 
+ <A
+HREF="http://www.privoxy.org"
+TARGET="_top"
+>Privoxy Developers</A
+>
+ </SUB
+><BR></P
+><P
+CLASS="PUBDATE"
+>$Id: faq.sgml,v 1.57 2002/05/05 20:26:02 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -257,7 +253,7 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >2.4. <A
-HREF="installation.html#AEN189"
+HREF="installation.html#AEN191"
 >I just installed <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -274,7 +270,7 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >2.6. <A
-HREF="installation.html#AEN214"
+HREF="installation.html#AEN216"
 >I just installed <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -297,7 +293,7 @@ HREF="configuration.html#NEWCONFIG"
 ></DT
 ><DT
 >3.2. <A
-HREF="configuration.html#AEN232"
+HREF="configuration.html#AEN234"
 >What is an <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -317,13 +313,13 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >3.4. <A
-HREF="configuration.html#AEN247"
+HREF="configuration.html#AEN249"
 >How are actions files configured? What is the easiest
 way to do this?</A
 ></DT
 ><DT
 >3.5. <A
-HREF="configuration.html#AEN255"
+HREF="configuration.html#AEN257"
 >There are several different <SPAN
 CLASS="QUOTE"
 >"actions"</SPAN
@@ -338,7 +334,7 @@ browser? Does that not raise security issues?</A
 ></DT
 ><DT
 >3.7. <A
-HREF="configuration.html#AEN281"
+HREF="configuration.html#AEN283"
 >What is <SPAN
 CLASS="QUOTE"
 >"default.filter"</SPAN
@@ -346,7 +342,7 @@ CLASS="QUOTE"
 ></DT
 ><DT
 >3.8. <A
-HREF="configuration.html#AEN294"
+HREF="configuration.html#AEN296"
 >How can I set up <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -355,17 +351,17 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >3.9. <A
-HREF="configuration.html#AEN306"
+HREF="configuration.html#AEN308"
 >Instead of ads, now I get a checkerboard pattern. I don't want to see anything.</A
 ></DT
 ><DT
 >3.10. <A
-HREF="configuration.html#AEN325"
+HREF="configuration.html#AEN327"
 >Why would anybody want to see a checkerboard pattern?</A
 ></DT
 ><DT
 >3.11. <A
-HREF="configuration.html#AEN330"
+HREF="configuration.html#AEN332"
 >I see large red banners on some pages that say 
 <SPAN
 CLASS="QUOTE"
@@ -423,7 +419,7 @@ HREF="misc.html"
 ><DL
 ><DT
 >4.1. <A
-HREF="misc.html#AEN394"
+HREF="misc.html#AEN396"
 >How much does <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -458,7 +454,7 @@ HREF="misc.html#IP"
 ></DT
 ><DT
 >4.7. <A
-HREF="misc.html#AEN445"
+HREF="misc.html#AEN447"
 >Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -466,13 +462,13 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >4.8. <A
-HREF="misc.html#AEN456"
+HREF="misc.html#AEN458"
 >Might some things break because header information is
 being altered?</A
 ></DT
 ><DT
 >4.9. <A
-HREF="misc.html#AEN466"
+HREF="misc.html#AEN468"
 >Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -484,7 +480,7 @@ speed up web browsing?</A
 ></DT
 ><DT
 >4.10. <A
-HREF="misc.html#AEN474"
+HREF="misc.html#AEN476"
 >What about as a firewall? Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -492,7 +488,7 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >4.11. <A
-HREF="misc.html#AEN479"
+HREF="misc.html#AEN481"
 >The <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -501,13 +497,13 @@ and ugly looking. Can't a better font be used?</A
 ></DT
 ><DT
 >4.12. <A
-HREF="misc.html#AEN488"
+HREF="misc.html#AEN490"
 >I have large empty spaces now where ads used to be. 
 Why?</A
 ></DT
 ><DT
 >4.13. <A
-HREF="misc.html#AEN491"
+HREF="misc.html#AEN493"
 >How can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -515,7 +511,7 @@ CLASS="APPLICATION"
 ></DT
 ><DT
 >4.14. <A
-HREF="misc.html#AEN498"
+HREF="misc.html#AEN500"
 ><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -553,7 +549,7 @@ HREF="trouble.html"
 ><DL
 ><DT
 >5.1. <A
-HREF="trouble.html#AEN557"
+HREF="trouble.html#AEN559"
 >I just upgraded and am getting <SPAN
 CLASS="QUOTE"
 >"connection refused"</SPAN
@@ -562,13 +558,13 @@ with every web page?</A
 ></DT
 ><DT
 >5.2. <A
-HREF="trouble.html#AEN570"
+HREF="trouble.html#AEN572"
 >I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></DT
 ><DT
 >5.3. <A
-HREF="trouble.html#AEN576"
+HREF="trouble.html#AEN578"
 >One of my favorite sites does not work with <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -614,18 +610,18 @@ HREF="contact.html#CONTACT-OTHER"
 ><DT
 >7. <A
 HREF="copyright.html"
->Copyright and History</A
+>Privoxy Copyright, License and History</A
 ></DT
 ><DD
 ><DL
 ><DT
 >7.1. <A
-HREF="copyright.html#AEN637"
->Copyright</A
+HREF="copyright.html#AEN647"
+>License</A
 ></DT
 ><DT
 >7.2. <A
-HREF="copyright.html#AEN644"
+HREF="copyright.html#AEN663"
 >History</A
 ></DT
 ></DL
diff --git a/doc/webserver/faq/installation.html b/doc/webserver/faq/installation.html
index c311e107..87fa8c7b 100644
--- a/doc/webserver/faq/installation.html
+++ b/doc/webserver/faq/installation.html
@@ -176,7 +176,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN189"
+NAME="AEN191"
 >2.4. I just installed <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -277,7 +277,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN214"
+NAME="AEN216"
 >2.6. I just installed <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
diff --git a/doc/webserver/faq/misc.html b/doc/webserver/faq/misc.html
index 5b5545a0..21a7b40d 100644
--- a/doc/webserver/faq/misc.html
+++ b/doc/webserver/faq/misc.html
@@ -78,7 +78,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN394"
+NAME="AEN396"
 >4.1. How much does <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -280,7 +280,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN445"
+NAME="AEN447"
 >4.7. Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -326,7 +326,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN456"
+NAME="AEN458"
 >4.8. Might some things break because header information is
 being altered?</A
 ></H3
@@ -372,7 +372,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN466"
+NAME="AEN468"
 >4.9. Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -403,7 +403,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN474"
+NAME="AEN476"
 >4.10. What about as a firewall? Can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -422,7 +422,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN479"
+NAME="AEN481"
 >4.11. The <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -458,7 +458,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN488"
+NAME="AEN490"
 >4.12. I have large empty spaces now where ads used to be. 
 Why?</A
 ></H3
@@ -474,7 +474,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN491"
+NAME="AEN493"
 >4.13. How can <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -504,7 +504,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN498"
+NAME="AEN500"
 >4.14. <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
diff --git a/doc/webserver/faq/trouble.html b/doc/webserver/faq/trouble.html
index e6ef887d..5a561e78 100644
--- a/doc/webserver/faq/trouble.html
+++ b/doc/webserver/faq/trouble.html
@@ -78,7 +78,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN557"
+NAME="AEN559"
 >5.1. I just upgraded and am getting <SPAN
 CLASS="QUOTE"
 >"connection refused"</SPAN
@@ -128,7 +128,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN570"
+NAME="AEN572"
 >5.2. I just added a new rule, but the steenkin ad is 
 still getting through. How?</A
 ></H3
@@ -155,7 +155,7 @@ CLASS="SECT2"
 ><H3
 CLASS="SECT2"
 ><A
-NAME="AEN576"
+NAME="AEN578"
 >5.3. One of my favorite sites does not work with <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index 1d7ad579..f8e069fe 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -81,27 +81,27 @@ HREF="#SUPPORT"
 ><DD
 ><DL
 ><DT
->.1. <A
+><A
 HREF="#CONTACT-SUPPORT"
 >Get Support</A
 ></DT
 ><DT
->.2. <A
+><A
 HREF="#CONTACT-BUGS"
 >Report bugs</A
 ></DT
 ><DT
->.3. <A
+><A
 HREF="#CONTACT-FEATURE"
 >Request new features</A
 ></DT
 ><DT
->.4. <A
+><A
 HREF="#CONTACT-ADS"
 >Report ads or other filter problems</A
 ></DT
 ><DT
->.5. <A
+><A
 HREF="#CONTACT-OTHER"
 >Other</A
 ></DT
@@ -110,16 +110,16 @@ HREF="#CONTACT-OTHER"
 ><DT
 ><A
 HREF="#AEN101"
->Copyright</A
+>License</A
 ></DT
 ><DT
 ><A
-HREF="#AEN108"
+HREF="#AEN121"
 >History</A
 ></DT
 ><DT
 ><A
-HREF="#AEN119"
+HREF="#AEN132"
 ></A
 ></DT
 ></DL
@@ -342,7 +342,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="CONTACT-SUPPORT"
->.1. Get Support</A
+>Get Support</A
 ></H2
 ><P
 >   <P
@@ -363,7 +363,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="CONTACT-BUGS"
->.2. Report bugs</A
+>Report bugs</A
 ></H2
 ><P
 >   <P
@@ -401,7 +401,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="CONTACT-FEATURE"
->.3. Request new features</A
+>Request new features</A
 ></H2
 ><P
 >   <P
@@ -422,7 +422,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="CONTACT-ADS"
->.4. Report ads or other filter problems</A
+>Report ads or other filter problems</A
 ></H2
 ><P
 >You can also send feedback on websites that Privoxy has problems with. Please bookmark
@@ -454,7 +454,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="CONTACT-OTHER"
->.5. Other</A
+>Other</A
 ></H2
 ><P
 >   <P
@@ -481,22 +481,42 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="AEN101"
->Copyright</A
+>License</A
 ></H1
 ><P
+> Copyright © 2001, 2002 by Privoxy Developers <TT
+CLASS="EMAIL"
+>&#60;<A
+HREF="mailto:developers@privoxy.org"
+>developers@privoxy.org</A
+>&#62;</TT
+></P
+><P
+> Some source code is based on code Copyright © 1997 by Anonymous Coders
+ and Junkbusters, Inc. and licensed under the <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>.</P
+><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > 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.</P
+ redistribute it and/or modify it under the terms of the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>, version 2, as published by the Free Software Foundation.</P
 ><P
 > 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
+ FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+> for
  
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
@@ -504,17 +524,40 @@ CLASS="APPLICATION"
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
 TARGET="_top"
->GNU General Public License</A
+> <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+></A
 >
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.</P
+ along with this program; if not, write to the <P
+CLASS="ADDRESS"
+>&nbsp;Free&nbsp;Software<br>
+&nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
+CLASS="STREET"
+>59 Temple Place</SPAN
+>&nbsp;-&nbsp;Suite&nbsp;330<br>
+&nbsp;<SPAN
+CLASS="CITY"
+>Boston</SPAN
+>,&nbsp;<SPAN
+CLASS="STATE"
+>MA</SPAN
+>&nbsp;<SPAN
+CLASS="POSTCODE"
+>02111-1307</SPAN
+><br>
+&nbsp;<SPAN
+CLASS="COUNTRY"
+>USA</SPAN
+>&nbsp;</P
+></P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN108"
+NAME="AEN121"
 >History</A
 ></H1
 ><P
@@ -561,14 +604,14 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN119"
+NAME="AEN132"
 ></A
 ></H1
 ><P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN122"
+NAME="AEN135"
 ></A
 ><P
 ></P
@@ -597,6 +640,11 @@ SRC="http://sourceforge.net/sflogo.php?group_id=11118&type=1&dummy=.gif">
 ></P
 ></DIV
 ></P
+><P
+> <SUB
+>  Copyright © 2001, 2002 by Privoxy Developers
+ </SUB
+></P
 ></DIV
 ></DIV
 ></BODY
diff --git a/doc/webserver/man-page/privoxy-man-page.html b/doc/webserver/man-page/privoxy-man-page.html
index 7724748b..be1b7c7a 100644
--- a/doc/webserver/man-page/privoxy-man-page.html
+++ b/doc/webserver/man-page/privoxy-man-page.html
@@ -2,7 +2,7 @@
 <HTML><HEAD><TITLE>Manpage of PRIVOXY</TITLE>
 <LINK REL="STYLESHEET" TYPE="text/css" HREF="../p_doc.css"></HEAD><BODY>
 <H1>PRIVOXY</H1>
-Section:  (1)<BR>Updated: 25 April 2002<BR><A HREF="#index">Index</A>
+Section:  (1)<BR>Updated: 09 May 2002<BR><A HREF="#index">Index</A>
 <HR>
 
 <A NAME="lbAB">&nbsp;</A>
@@ -285,8 +285,7 @@ Sourceforge.
 <A HREF="http://config.privoxy.org">http://config.privoxy.org</A>
 may work in some situations where the first does not.
 <P>
-<A HREF="http://p.p/">http://p.p/</A>  
-to submit ``misses'' to the developers. 
+<A HREF="http://p.p/">http://p.p/</A> to submit ``misses'' to the developers. 
 <P>
 <A HREF="http://www.junkbusters.com/ht/en/cookies.html">http://www.junkbusters.com/ht/en/cookies.html</A>
 <P>
@@ -319,24 +318,41 @@ to submit ``misses'' to the developers.
 <A NAME="lbAN">&nbsp;</A>
 <H2>COPYRIGHT AND LICENSE</H2>
 
+<A NAME="lbAO">&nbsp;</A>
+<H3>COPYRIGHT</H3>
+
+<P>
+
+Copyright (C) 2001, 2002 by Privoxy Developers &lt;<A HREF="mailto:developers@privoxy.org">developers@privoxy.org</A>&gt;
+<P>
+
+Some source code is based on code Copyright (C) 1997 by Anonymous Coders
+and Junkbusters, Inc. and licensed under the <I>GNU General Public
+License</I>.
+<A NAME="lbAP">&nbsp;</A>
+<H3>LICENSE</H3>
+
 <P>
 
 <B>Privoxy</B> 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.
+redistribute it and/or modify it under the terms of the 
+<I>GNU General Public
+License</I>, version 2, as published by the Free Software Foundation.
 <P>
 
 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
+FITNESS FOR A PARTICULAR PURPOSE.  See the 
+<I>GNU General Public License</I> for
 more details, which is available from the Free Software Foundation, Inc, 59
 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 <P>
 
-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.
+You should have received a copy of the  <I>GNU General Public License</I>
+along with this program; if not, write to the  Free Software
+Foundation, Inc. 59 Temple Place - Suite 330
+Boston, MA 02111-1307
+USA 
 <P>
 
 <HR>
@@ -355,11 +371,15 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 <DT><A HREF="#lbAL">SEE ALSO</A><DD>
 <DT><A HREF="#lbAM">DEVELOPMENT TEAM</A><DD>
 <DT><A HREF="#lbAN">COPYRIGHT AND LICENSE</A><DD>
+<DL>
+<DT><A HREF="#lbAO">COPYRIGHT</A><DD>
+<DT><A HREF="#lbAP">LICENSE</A><DD>
+</DL>
 </DL>
 <HR>
 This document was created by
 man2html,
 using the manual pages.<BR>
-Time: 14:43:58 GMT, April 25, 2002
+Time: 20:47:35 GMT, May 09, 2002
 </BODY>
 </HTML>
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index e38d503c..87413b5f 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -751,7 +751,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2718"
+NAME="AEN2732"
 >14.2. <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
@@ -800,7 +800,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN2733"
+NAME="AEN2747"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -829,7 +829,7 @@ TARGET="_top"
     editing of actions files:
   </P
 ><A
-NAME="AEN2740"
+NAME="AEN2754"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -849,7 +849,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN2745"
+NAME="AEN2759"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -869,7 +869,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN2750"
+NAME="AEN2764"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -889,7 +889,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN2755"
+NAME="AEN2769"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -913,7 +913,7 @@ CLASS="QUOTE"
    to run, but only as a pass-through proxy, with no actions taking place:
   </P
 ><A
-NAME="AEN2761"
+NAME="AEN2775"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -930,7 +930,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN2765"
+NAME="AEN2779"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -944,7 +944,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN2768"
+NAME="AEN2782"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
diff --git a/doc/webserver/user-manual/contact.html b/doc/webserver/user-manual/contact.html
index ce7e02fd..a0209a17 100644
--- a/doc/webserver/user-manual/contact.html
+++ b/doc/webserver/user-manual/contact.html
@@ -14,7 +14,7 @@ REL="PREVIOUS"
 TITLE="Templates"
 HREF="templates.html"><LINK
 REL="NEXT"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
@@ -267,7 +267,10 @@ VALIGN="top"
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Copyright and History</TD
+><SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Copyright, License and History</TD
 ></TR
 ></TABLE
 ></DIV
diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 42a8af66..20307fe8 100644
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -1,7 +1,7 @@
 <HTML
 ><HEAD
 ><TITLE
->Copyright and History</TITLE
+>Privoxy Copyright, License and History</TITLE
 ><META
 NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.64
@@ -72,30 +72,53 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="COPYRIGHT"
->12. Copyright and History</A
+>12. <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Copyright, License and History</A
 ></H1
+><P
+> Copyright © 2001, 2002 by Privoxy Developers <TT
+CLASS="EMAIL"
+>&#60;<A
+HREF="mailto:developers@privoxy.org"
+>developers@privoxy.org</A
+>&#62;</TT
+></P
+><P
+> Some source code is based on code Copyright © 1997 by Anonymous Coders
+ and Junkbusters, Inc. and licensed under the <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>.</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2493"
->12.1. Copyright</A
+NAME="AEN2498"
+>12.1. License</A
 ></H2
 ><P
 > <SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
 > 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.</P
+ redistribute it and/or modify it under the terms of the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public
+ License</I
+>, version 2, as published by the Free Software Foundation.</P
 ><P
 > 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
+ FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+> for
  
  more details, which is available from the Free Software Foundation, Inc, 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</P
@@ -103,10 +126,33 @@ CLASS="APPLICATION"
 > You should have received a copy of the <A
 HREF="http://www.gnu.org/copyleft/gpl.html"
 TARGET="_top"
->GNU General Public License</A
+> <I
+CLASS="CITETITLE"
+>GNU General Public License</I
+></A
 >
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.</P
+ along with this program; if not, write to the <P
+CLASS="ADDRESS"
+>&nbsp;Free&nbsp;Software<br>
+&nbsp;Foundation,&nbsp;Inc.&nbsp;<SPAN
+CLASS="STREET"
+>59 Temple Place</SPAN
+>&nbsp;-&nbsp;Suite&nbsp;330<br>
+&nbsp;<SPAN
+CLASS="CITY"
+>Boston</SPAN
+>,&nbsp;<SPAN
+CLASS="STATE"
+>MA</SPAN
+>&nbsp;<SPAN
+CLASS="POSTCODE"
+>02111-1307</SPAN
+><br>
+&nbsp;<SPAN
+CLASS="COUNTRY"
+>USA</SPAN
+>&nbsp;</P
+></P
 ></DIV
 ><DIV
 CLASS="SECT2"
diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 3bf97fd4..ea08e987 100644
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -29,27 +29,23 @@ CLASS="TITLE"
 NAME="AEN2"
 >Privoxy User Manual</A
 ></H1
-><DIV
-CLASS="AUTHORGROUP"
-><A
-NAME="AEN5"
-></A
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
-></H3
-><DIV
-CLASS="AFFILIATION"
-><SPAN
-CLASS="ORGNAME"
->By: Privoxy Developers<BR></SPAN
-></DIV
-></DIV
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $<BR></P
+> <SUB
+> <A
+HREF="copyright.html"
+>Copyright</A
+> © 2001, 2002 by 
+ <A
+HREF="http://www.privoxy.org"
+TARGET="_top"
+>Privoxy Developers</A
+>
+ </SUB
+><BR></P
+><P
+CLASS="PUBDATE"
+>$Id: user-manual.sgml,v 1.105 2002/05/05 20:26:02 hal9 Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -68,7 +64,7 @@ CLASS="APPLICATION"
 >Privoxy</SPAN
 ></A
 >.
-  </P
+ </P
 ><P
 > <SPAN
 CLASS="APPLICATION"
@@ -107,7 +103,7 @@ TARGET="_top"
 >Contact section</A
 > on how to
   contact the developers.
-  </P
+ </P
 ><P
 ></P
 ></DIV
@@ -741,14 +737,17 @@ HREF="contact.html#CONTACT-OTHER"
 ><DT
 >12. <A
 HREF="copyright.html"
->Copyright and History</A
+><SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Copyright, License and History</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN2493"
->Copyright</A
+HREF="copyright.html#AEN2498"
+>License</A
 ></DT
 ><DT
 >12.2. <A
@@ -776,7 +775,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN2718"
+HREF="appendix.html#AEN2732"
 ><SPAN
 CLASS="APPLICATION"
 >Privoxy</SPAN
diff --git a/doc/webserver/user-manual/seealso.html b/doc/webserver/user-manual/seealso.html
index 2ddf4c11..b4a48898 100644
--- a/doc/webserver/user-manual/seealso.html
+++ b/doc/webserver/user-manual/seealso.html
@@ -10,7 +10,7 @@ REL="HOME"
 TITLE="Privoxy User Manual"
 HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Copyright and History"
+TITLE="Privoxy Copyright, License and History"
 HREF="copyright.html"><LINK
 REL="NEXT"
 TITLE="Appendix"
@@ -306,7 +306,10 @@ HREF="appendix.html"
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Copyright and History</TD
+><SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> Copyright, License and History</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
-- 
2.39.2