From 97c15a26185bd3c99025010fd123849545f48cc1 Mon Sep 17 00:00:00 2001
From: hal9 <hal9@users.sourceforge.net>
Date: Sun, 5 May 2002 20:26:02 +0000
Subject: [PATCH] Sorting out license vs copyright in these docs.
---
doc/source/copyright.sgml | 46 +++--------------
doc/source/developer-manual.sgml | 54 +++++++++++++++++---
doc/source/faq.sgml | 86 ++++++++++++++++++++++++--------
doc/source/privoxy-man-page.sgml | 12 ++++-
doc/source/user-manual.sgml | 45 +++++++++++++++--
doc/source/webserver/index.sgml | 44 +++++++++-------
6 files changed, 198 insertions(+), 89 deletions(-)
diff --git a/doc/source/copyright.sgml b/doc/source/copyright.sgml
index 05a715c2..db8a4f11 100644
--- a/doc/source/copyright.sgml
+++ b/doc/source/copyright.sgml
@@ -3,7 +3,7 @@
Purpose : Entity included in other project documents.
- $Id: copyright.sgml,v 1.3 2002/04/07 08:10:12 swa Exp $
+ $Id: copyright.sgml,v 1.4 2002/04/26 05:25:23 hal9 Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -25,48 +25,16 @@
user-manual
developer-manual
faq
- webserver/index.sgml
-->
<para>
- <application>Privoxy</application> is free software; you can
- redistribute it and/or modify it under the terms of the GNU General Public
-<!--
- <informalfigure pgwide="1" float="1">
- <mediaobject>
- <imageobject>
- <imagedata align="left" fileref="../gnu.jpg" format="jpg">
- </imageobject>
- <textobject>
- <phrase>GNU's Pet GNU</phrase>
- </textobject>
- </mediaobject>
- </informalfigure>
- or better:
- <inlinegraphic depth="1" align="left" fileref="../gnu.png"></inlinegraphic>
--->
-
- License as published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ Permission is granted to copy, distribute and/or modify this document under
+ the terms of the <ulink type="help" url="http://www.gnu.org/licenses/fdl.html"><citetitle>GNU Free
+ Documentation License</citetitle></ulink>, Version 1.1 or any later version
+ published by the Free Software Foundation with no Invariant Sections, no
+ Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be
+ found <ulink type="help" url="http://www.gnu.org/licenses/fdl.html">http://www.gnu.org/licenses/fdl.html</ulink>.
</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
-<!--
-<figure pgwide="0"><title>The Pythagorean Theorum Illustrated</title>
-</figure>
--->
- more details, which is available from the Free Software Foundation, Inc, 59
- Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-</para>
-
-<para>
- You should have received a copy of the <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</ulink>
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-</para>
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 9a2ebc2c..6fd323e2 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -7,6 +7,7 @@
<!entity seealso SYSTEM "seealso.sgml">
<!entity contacting SYSTEM "contacting.sgml">
<!entity copyright SYSTEM "copyright.sgml">
+<!entity license SYSTEM "license.sgml">
<!entity p-version "2.9.15">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
@@ -21,7 +22,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $
+ $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/
@@ -44,8 +45,32 @@
<artheader>
<title>Privoxy Developer Manual</title>
- <pubdate>$Id: developer-manual.sgml,v 1.40 2002/05/04 00:43:43 hal9 Exp $</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>
+
+<!--
+
+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.
+
+Hal.
+
+<legalnotice id="legalnotice">
+ <para>
+ text goes here ........
+ </para>
+</legalnotice>
+
+-->
+
+<!--
<authorgroup>
<author>
<affiliation>
@@ -53,7 +78,7 @@
</affiliation>
</author>
</authorgroup>
-
+-->
<abstract>
<![%dummy;[
<para>
@@ -1711,7 +1736,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.40 2002/05/04 00:43:43 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $";
/*********************************************************************
*
* File : $S<!-- Break CVS Substitution -->ource$
@@ -1771,7 +1796,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.40 2002/05/04 00:43:43 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.41 2002/05/04 08:44:44 swa Exp $"
/*********************************************************************
*
* File : $S<!-- Break CVS Substitution -->ource$
@@ -2627,8 +2652,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
<!-- end contacting -->
</sect1>
- <!-- ~~~~~ New section ~~~~~ -->
- <sect1 id="copyright"><title>Copyright and History</title>
+
+<!-- ~~~~~~~~ New section Header ~~~~~~~~~ -->
+<sect1 id="copyright"><title>Copyright, License and History</title>
<sect2><title>Copyright</title>
<!-- Include copyright.sgml -->
@@ -2636,13 +2662,22 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
<!-- end -->
</sect2>
+<!-- ~~~~~ New section ~~~~~ -->
+<sect2><title>License</title>
+<!-- Include copyright.sgml: -->
+ &license;
+<!-- end copyright -->
+</sect2>
+<!-- ~ End section ~ -->
+
+<!-- ~~~~~ New section ~~~~~ -->
<sect2><title>History</title>
<!-- Include history.sgml -->
&history;
<!-- end -->
</sect2>
- </sect1>
+</sect1>
<!-- ~~~~~ New section ~~~~~ -->
<sect1 id="seealso"><title>See also</title>
@@ -2673,6 +2708,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.41 2002/05/04 08:44:44 swa
+ bumped version
+
Revision 1.40 2002/05/04 00:43:43 hal9
-Remove TOC/first page kludge with proper stylesheet fix.
-Combined the two very brief sections: Intro and Quickstart.
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 30be80a7..26555c33 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -7,6 +7,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
+<!entity license SYSTEM "license.sgml">
<!entity p-version "2.9.15">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
@@ -22,7 +23,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: faq.sgml,v 1.55 2002/05/04 00:41:56 hal9 Exp $
+ $Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -61,8 +62,33 @@
<artheader>
<title>Privoxy Frequently Asked Questions</title>
-<pubdate>$Id: faq.sgml,v 1.55 2002/05/04 00:41:56 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.56 2002/05/04 08:44:44 swa Exp $</pubdate>
+
+ <copyright>
+ <year>2001</year>
+ <year>2002</year>
+ <holder>Privoxy Developers</holder>
+ </copyright>
+
+<!--
+
+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.
+
+Hal.
+
+<legalnotice id="legalnotice">
+ <para>
+ text goes here ........
+ </para>
+</legalnotice>
+
+-->
+
+<!--
<authorgroup>
<author>
<affiliation>
@@ -70,7 +96,7 @@
</affiliation>
</author>
</authorgroup>
-
+-->
<abstract>
<![%dummy;[
<para>
@@ -288,8 +314,9 @@ warranty? Registration?</title>
<para>
<application>Privoxy</application> 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 <link
+ linkend="copyright">Copyright</link> section for more information on the
+ license and copyright.
</para>
<para>
@@ -1412,22 +1439,38 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
<!-- end contacting -->
</sect1>
- <!-- ~~~~~ New section ~~~~~ -->
- <sect1 id="copyright"><title>Copyright and History</title>
-
-<sect2><title>Copyright</title>
-<!-- Include copyright.sgml -->
- ©right;
-<!-- end -->
-</sect2>
-
-<sect2><title>History</title>
-<!-- Include history.sgml -->
- &history;
-<!-- end -->
-</sect2>
+<!-- ~~~~~ New section ~~~~~ -->
+<sect1 id="copyright"><title>Copyright, License and History</title>
- </sect1>
+ <sect2><title>Copyright</title>
+ <!-- Include copyright.sgml -->
+ ©right;
+ <!-- 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>
+ <!-- Include copyright.sgml: -->
+ &license;
+ <!-- end copyright -->
+ </sect2>
+ <!-- ~ End section ~ -->
+
+ <!-- ~~~~~ New section ~~~~~ -->
+ <sect2><title>History</title>
+ <!-- Include history.sgml -->
+ &history;
+ <!-- end -->
+ </sect2>
+
+ </sect1>
+ <!-- ~ End section ~ -->
+
<!-- ~~~~~ New section ~~~~~ -->
<!--
@@ -1467,6 +1510,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.56 2002/05/04 08:44:44 swa
+bumped version
+
Revision 1.55 2002/05/04 00:41:56 hal9
-Remove TOC/first page kludge in favor of proper handling via dsl file.
diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index ffa9fd47..10b04fb8 100644
--- a/doc/source/privoxy-man-page.sgml
+++ b/doc/source/privoxy-man-page.sgml
@@ -5,7 +5,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: privoxy-man-page.sgml,v 1.9 2002/04/25 14:45:25 hal9 Exp $
+ $Id: privoxy-man-page.sgml,v 1.10 2002/05/04 08:44:44 swa Exp $
Written by and Copyright (C) 2001 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -44,6 +44,7 @@
<!entity p-intro SYSTEM "privoxy.sgml">
<!entity seealso SYSTEM "seealso.sgml">
<!entity copyright SYSTEM "copyright.sgml">
+<!entity license SYSTEM "license.sgml">
<!entity authors SYSTEM "p-authors.sgml">
<!entity p-version "2.9.15">
<!entity p-status "beta">
@@ -400,9 +401,18 @@
<!-- ~~~~~ New section ~~~~~ -->
<refsect1><title>Copyright and License</title>
+
+<refsect2><title>Copyright</title>
<!-- Include copyright.sgml boilerplate: -->
©right;
<!-- end boilerplate -->
+</refsect2>
+
+<refsect2><title>License</title>
+<!-- Include license.sgml boilerplate: -->
+ &license;
+<!-- end boilerplate -->
+</refsect2>
</refsect1>
</refentry>
diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index b219e284..3ca63862 100644
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -8,6 +8,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
+<!entity license SYSTEM "license.sgml">
<!entity p-version "2.9.15">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
@@ -25,7 +26,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $
+ $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/
@@ -44,10 +45,36 @@
<article id="index">
<artheader>
+
<title>Privoxy User Manual</title>
-<pubdate>$Id: user-manual.sgml,v 1.103 2002/05/04 00:40:53 hal9 Exp $</pubdate>
+<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>
+
+
+<!--
+
+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.
+Hal.
+
+<legalnotice id="legalnotice">
+ <para>
+ text goes here ........
+ </para>
+</legalnotice>
+
+-->
+
+<!--
<authorgroup>
<author>
<affiliation>
@@ -55,7 +82,7 @@
</affiliation>
</author>
</authorgroup>
-
+-->
<abstract>
<![%dummy;[
<para>
@@ -5009,14 +5036,21 @@ Requests</title>
<!-- ~~~~~ New section ~~~~~ -->
-<sect1 id="copyright"><title>Copyright and History</title>
+<sect1 id="copyright"><title>Copyright, License and History</title>
<sect2><title>Copyright</title>
<!-- Include copyright.sgml: -->
©right;
<!-- end copyright -->
</sect2>
+<!-- ~ End section ~ -->
+<!-- ~~~~~ New section ~~~~~ -->
+<sect2><title>License</title>
+<!-- Include copyright.sgml: -->
+ &license;
+<!-- end copyright -->
+</sect2>
<!-- ~ End section ~ -->
@@ -5922,6 +5956,9 @@ Requests</title>
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: user-manual.sgml,v $
+ Revision 1.104 2002/05/04 08:44:45 swa
+ bumped version
+
Revision 1.103 2002/05/04 00:40:53 hal9
-Remove the TOC first page kludge. It's fixed proper now in ldp.dsl.in.
-Some minor additions to Quickstart.
diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 30e8ce31..71d6a823 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -4,6 +4,7 @@
<!entity contacting SYSTEM "contacting.sgml">
<!entity history SYSTEM "history.sgml">
<!entity copyright SYSTEM "copyright.sgml">
+<!entity license SYSTEM "license.sgml">
<!entity p-version "2.9.15">
<!entity p-status "beta">
<!entity % p-not-stable "INCLUDE">
@@ -19,7 +20,7 @@
This file belongs into
ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
- $Id: index.sgml,v 1.10 2002/04/26 17:24:31 swa Exp $
+ $Id: index.sgml,v 1.11 2002/05/04 08:44:45 swa Exp $
Written by and Copyright (C) 2001, 2002 the SourceForge
Privoxy team. http://www.privoxy.org/
@@ -43,7 +44,7 @@
<artheader>
-<title>Privoxy - Homepage</title>
+<!-- copyright is at bottom of page -->
<keywordset>
<Keyword>stop, junk, privoxy, ad, advertisement, werbung, busters, junkbusters, junkbuster, mail, email, e-mail, direct, spam, spamoff, declare, telemarketing, telemarketers, privacy, sharing, names, renting, direct, marketing, database, databases, junk mail, lists, environment, conservation, recycling, catalogs, consumer, sending, opt out</Keyword>
@@ -77,7 +78,7 @@
<para>
<itemizedlist>
<listitem>
- <literallayout>
+ <literallayout class="normal">
The <ulink url="http://sourceforge.net/projects/ijbswa/">project
page</ulink> on Sourceforge
</literallayout>
@@ -88,17 +89,17 @@ page</ulink> on Sourceforge
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="http://www.waldherr.org/junkbuster/">Stefan Waldherr's site</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">Junkbusters Corporation</ulink>
</literallayout>
</listitem>
<!-- <listitem> -->
-<!-- <literallayout> -->
+<!-- <literallayout class="normal"> -->
<!-- Take a look at the <ulink url="team/">Privoxy team</ulink> -->
<!-- </literallayout> -->
<!-- </listitem> -->
@@ -111,17 +112,17 @@ page</ulink> on Sourceforge
<para>
<itemizedlist>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118">Download recent releases</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/current/">Browse our CVS repository</ulink>
</literallayout>
</listitem>
@@ -134,27 +135,27 @@ page</ulink> on Sourceforge
<para>
<itemizedlist>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="user-manual/index.html">User manual</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="faq/index.html">Frequently Asked Questions</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="team/index.html">Pictures of the Privoxy Team</ulink>
</literallayout>
</listitem>
<listitem>
- <literallayout>
+ <literallayout class="normal">
<ulink url="developer-manual/index.html">Developer Manual</ulink>
<!-- ,alternatively as a pdf file: <ulink url="">developer-manual.pdf</ulink>. -->
</literallayout>
@@ -171,9 +172,9 @@ page</ulink> on Sourceforge
</sect1>
<sect1 label="">
-<title>Copyright</title>
+<title>License</title>
<!-- Include copyright.sgml -->
- ©right;
+ &license;
<!-- end -->
</sect1>
@@ -187,8 +188,8 @@ page</ulink> on Sourceforge
<!-- ~~~~~ New section ~~~~~ -->
<sect1 label="">
-<title></title>
<!-- dummy section, for spacing -->
+<title></title>
<para>
<!-- show the SF logo per AUP -->
<informaltable frame=none label="" pgwide="1">
@@ -207,6 +208,7 @@ page</ulink> on Sourceforge
</informaltable>
</para>
+
<!--
<informalfigure pgwide="1">
<ulink url="http://sourceforge.net/">
@@ -215,6 +217,11 @@ page</ulink> on Sourceforge
</informalfigure>
-->
+<!-- Formal copyright markup does not work here. HB. -->
+<para>
+ Copyright © 2001, 2002 by Privoxy Developers
+</para>
+
</sect1>
<!--
@@ -238,6 +245,9 @@ page</ulink> on Sourceforge
Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$Log: index.sgml,v $
+ Revision 1.11 2002/05/04 08:44:45 swa
+ bumped version
+
Revision 1.10 2002/04/26 17:24:31 swa
bookmarks cleaned, changed structure of user manual, screen and programlisting cleanups, and numerous other changes that I forgot
--
2.49.0