consistent look. reuse of copyright, history et. al.

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 9ecfc23..5ac6c74 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -21,7 +21,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $
+ $Id: developer-manual.sgml,v 1.22 2002/04/04 17:27:56 swa Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
@@ -35,7 +35,7 @@
   <artheader>
     <title>Privoxy Developer Manual</title>
 
-    <pubdate>$Id: developer-manual.sgml,v 1.21 2002/04/04 06:48:37 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 1.22 2002/04/04 17:27:56 swa Exp $</pubdate>
 
     <authorgroup>
       <author>
@@ -70,9 +70,7 @@
 <para>
  You can find the latest version of the this manual at <ulink
  url="http://www.privoxy.org/developer-manual/">http://www.privoxy.org/developer-manual/</ulink>.
- Please see the Contact section of the <ulink
- url="../user-manual/contact.html">User Manual</ulink> on how to contact the
- developers.
+ Please see the Contact section on how to contact the developers.
 </para>
 
 <!--        <para> -->
@@ -82,8 +80,18 @@
     </abstract>
   </artheader>
 
-  <!--   ~~~~~       New section      ~~~~~     -->
-  <sect1 id="introduction"><title>Introduction</title>
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect1 id="intro" label=""><title></title>
+<!-- dummy section to force TOC on page by itself -->
+<!-- DO NOT REMOVE! please ;) -->
+<para> </para>
+</sect1>
+
+<!--   ~~~~~       New section      ~~~~~     -->
+
+
+<!--   ~~~~~       New section      ~~~~~     -->
+  <sect1 label="1" id="introduction"><title>Introduction</title>
 <!--
 
  I don't like seeing blank space :) So added *something* here.
@@ -1324,7 +1332,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.21 2002/04/04 06:48:37 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.22 2002/04/04 17:27:56 swa Exp $";
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -1384,7 +1392,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.21 2002/04/04 06:48:37 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.22 2002/04/04 17:27:56 swa Exp $"
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -2058,7 +2066,7 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
   </sect1>
   
   <!--   ~~~~~       New section      ~~~~~     -->
-  <sect1 id="contact"><title>Contact the developers</title>
+  <sect1 id="contact"><title>Contacting the developers, Bug Reporting and Feature Requests</title>
 <!-- Include contacting.sgml  -->
  &contacting;
 <!-- end contacting -->
@@ -2110,6 +2118,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.22  2002/04/04 17:27:56  swa
+  more single file to be included at multiple points. make maintaining easier
+
   Revision 1.21  2002/04/04 06:48:37  hal9
   Structural changes to allow for conditional inclusion/exclusion of content
   based on entity toggles, e.g. 'entity % p-not-stable  "INCLUDE"'. And

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 4d17476..e2a89c3 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -4,6 +4,9 @@
 <!entity newfeatures SYSTEM "newfeatures.sgml">
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity seealso SYSTEM "seealso.sgml">
+<!entity contacting SYSTEM "contacting.sgml">
+<!entity history SYSTEM "history.sgml">
+<!entity copyright SYSTEM "copyright.sgml">
 <!entity p-version "2.9.13">
 <!entity p-status "BETA">
 <!entity % p-not-stable "INCLUDE"> <!-- set to IGNORE for stable release  -->
@@ -19,7 +22,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 1.40 2002/04/03 04:22:03 hal9 Exp $
+ $Id: faq.sgml,v 1.41 2002/04/04 06:48:37 hal9 Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
@@ -50,7 +53,7 @@
 <artheader>
 <title>Privoxy Frequently Asked Questions</title>
 
-<pubdate>$Id: faq.sgml,v 1.40 2002/04/03 04:22:03 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.41 2002/04/04 06:48:37 hal9 Exp $</pubdate>
 
 <authorgroup>
  <author>
@@ -83,9 +86,7 @@
  <para>
   You can find the latest version of the document at <ulink
   url="http://www.privoxy.org/faq/">http://www.privoxy.org/faq/</ulink>.
-  Please see the Contact section in the <ulink
-  url="../user-manual/contact.html">user-manual</ulink> if
-  you want to contact the developers.
+  Please see the Contact section if you want to contact the developers.
  </para>
 
 <!--   <para> -->
@@ -123,8 +124,7 @@
   significantly at this point. 
  </para>
  <para> 
-  Please see the <ulink
-  url="../user-manual/copyright.html#HISTORY">user-manual</ulink> for more
+  Please see the History section for more
   information on the history of <application>Junkbuster</application> and 
   <application>Privoxy</application>.
  </para>
@@ -283,12 +283,10 @@ This does not sound very scientific.</title>
 <sect2 renderas="sect3" id="license"><title>Is there is a license or fee? What about a 
 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 
-<ulink url="../user-manual/copyright.html#HISTORY">user-manual</ulink> for 
- more information on the license and copyright.
+  <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.
 
   </para>
  <para>
@@ -1209,25 +1207,6 @@ secure is it? Do I need to take any special precautions?</title>
 </para>
 </sect2>
 
-<sect2 renderas="sect3" id="seealso">
-<title>Where can I find more information about <application>Privoxy</application>
-and related issues?</title>
-
-<!--
- Include seealso.sgml
--->
- 
- &seealso;
-
-<!--
-<para>
- Please see the 
- <ulink url="../user-manual/seealso.html">user-manual</ulink> for 
- others references.
-</para>
--->
-</sect2>
-
 </sect1>
 
 
@@ -1350,17 +1329,37 @@ FIXME: Commented out until we have something to put here. HB 03/18/02.
 </sect1>
 -->
 
-<!--   ~~~~~       New section      ~~~~~     -->
-<!--
+  <!--   ~~~~~       New section      ~~~~~     -->
+  <sect1 id="contact"><title>Contacting the developers, Bug Reporting and Feature Requests</title>
+<!-- Include contacting.sgml  -->
+ &contacting;
+<!-- end contacting -->
+  </sect1>
+  
+  <!--   ~~~~~       New section      ~~~~~     -->
+  <sect1 id="copyright"><title>Copyright and History</title>
+
+<sect2><title>Copyright</title>
+<!-- Include copyright.sgml -->
+ &copyright;
+<!-- end -->
+</sect2>
 
-This is referenced in the doc header already. HB 03/25/02
+<sect2><title>History</title>
+<!-- Include history.sgml -->
+ &history;
+<!-- end -->
+</sect2>
 
-<sect1 id="contact"><title>Contact the developers</title>
-<para>Please see the user manual for information on how to contact the developers.
-</para>
-</sect1>
--->
+  </sect1>
+  
+  <!--   ~~~~~       New section      ~~~~~     -->
+  <sect1 id="seealso"><title>See also</title>
+<!-- Include seealso.sgml -->
+ &seealso;
+<!-- end  -->
 
+  </sect1>
 
 <!-- hhmts end -->
  <!--
@@ -1387,6 +1386,13 @@ This is referenced in the doc header already. HB 03/25/02
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 $Log: faq.sgml,v $
+Revision 1.41  2002/04/04 06:48:37  hal9
+Structural changes to allow for conditional inclusion/exclusion of content
+based on entity toggles, e.g. 'entity % p-not-stable  "INCLUDE"'. And
+definition of internal entities, e.g. 'entity p-version "2.9.13"' that will
+eventually be set by Makefile.
+More boilerplate text for use across multiple docs.
+
 Revision 1.40  2002/04/03 04:22:03  hal9
 Fixed several typos.
 

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 3c2b827..bb79008 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -24,7 +24,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: user-manual.sgml,v 1.66 2002/04/04 06:48:37 hal9 Exp $
+ $Id: user-manual.sgml,v 1.67 2002/04/04 17:27:57 swa Exp $
 
  Written by and Copyright (C) 2001 the SourceForge
  Privoxy team. http://www.privoxy.org/
@@ -39,7 +39,7 @@
 <artheader>
 <title>Privoxy User Manual</title>
 
-<pubdate>$Id: user-manual.sgml,v 1.66 2002/04/04 06:48:37 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.67 2002/04/04 17:27:57 swa Exp $</pubdate>
 
 <authorgroup>
  <author>
@@ -72,7 +72,7 @@
 
  <para>
   You can find the latest version of the user manual at  <ulink
-  url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/user-manual/</ulink>.
+  url="http://www.privoxy.org/user-manual/">http://www.privoxy.org/user-manual/</ulink>. Please see the Contact section on how to contact the developers.
   </para>
 
 <!--   <para> -->
@@ -82,10 +82,16 @@
 
 </artheader>
 
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect1 id="intro" label=""><title></title>
+<!-- dummy section to force TOC on page by itself -->
+<!-- DO NOT REMOVE! please ;) -->
+<para> </para>
+</sect1>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 
-<sect1 id="introduction"><title>Introduction</title>
+<sect1 label="1" id="introduction"><title>Introduction</title>
 
 <para>
  This documentation is included with the current &p-status; version of
@@ -3929,6 +3935,9 @@ Requests</title>
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.67  2002/04/04 17:27:57  swa
+ more single file to be included at multiple points. make maintaining easier
+
  Revision 1.66  2002/04/04 06:48:37  hal9
  Structural changes to allow for conditional inclusion/exclusion of content
  based on entity toggles, e.g. 'entity % p-not-stable  "INCLUDE"'. And