Mass commit for new entities, most significantly so docs can read version

and code status info from tmp files, so perl is no longer used. Also, docs can
differentiate on alpha -> beta -> stable now.

diff --git a/doc/source/announce.sgml b/doc/source/announce.sgml
index 220e9ec..23b217a 100644 (file)
--- a/doc/source/announce.sgml
+++ b/doc/source/announce.sgml
@@ -5,9 +5,9 @@
 <!entity contacting SYSTEM "../contacting.sgml">
 <!entity history SYSTEM "../history.sgml">
 <!entity newfeatures SYSTEM "../newfeatures.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!entity % p-stable "IGNORE">
 <!entity % p-supp-userman "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
@@ -19,7 +19,7 @@
 
  Purpose     :  Announcement text
                 
- $Id: announce.sgml,v 1.1 2002/05/27 22:03:51 hal9 Exp $
+ $Id: announce.sgml,v 1.2 2002/06/03 00:28:16 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.

diff --git a/doc/source/authors.sgml b/doc/source/authors.sgml
index 64b6728..d9df232 100644 (file)
--- a/doc/source/authors.sgml
+++ b/doc/source/authors.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  AUTHORS file for Privoxy
                 
- $Id: authors.sgml,v 1.7 2002/05/04 08:44:44 swa Exp $
+ $Id: authors.sgml,v 1.8 2002/05/10 01:48:19 hal9 Exp $
 
  
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
@@ -26,9 +26,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!entity % dummy "IGNORE"> 
 <!entity authors SYSTEM "p-authors.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "INCLUDE">           <!-- define we are a text only doc -->
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->

diff --git a/doc/source/config.sgml b/doc/source/config.sgml
index 563a4dc..1068781 100644 (file)
--- a/doc/source/config.sgml
+++ b/doc/source/config.sgml
@@ -1,18 +1,18 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN"[
 <!entity % dummy "IGNORE"> 
 <!entity config SYSTEM "p-config.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!entity % user-man "IGNORE">
 <!entity % config-file "IGNORE">
 ]>
 <!--
- File        :  $Source: /cvsroot/ijbswa/current/doc/source/Attic/config.sgml,v $
+ File        :  $Source: /cvsroot/ijbswa/current/doc/source/config.sgml,v $
 
  Purpose     :  config file generation
                 
- $Id: config.sgml,v 1.1 2002/05/29 02:01:02 hal9 Exp $
+ $Id: config.sgml,v 1.2 2002/06/03 00:28:16 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 304514c..bedd0b2 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -8,9 +8,9 @@
 <!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">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!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           -->
@@ -23,7 +23,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: developer-manual.sgml,v 1.51 2002/05/29 00:30:59 mal0rd Exp $
+ $Id: developer-manual.sgml,v 1.49 2002/06/03 00:28:16 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -48,7 +48,7 @@
     </pubdate>
 
 
-    <pubdate>$Id: developer-manual.sgml,v 1.51 2002/05/29 00:30:59 mal0rd Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 1.49 2002/06/03 00:28:16 hal9 Exp $</pubdate>
 
 <!--
 
@@ -67,7 +67,7 @@ Hal.
 
 -->
 
-    <abstract>
+<abstract>
 
 <![%dummy;[
  <para>
@@ -1740,7 +1740,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.46.2.4 2002/05/29 00:30:59 mal0rd Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.49 2002/06/03 00:28:16 hal9 Exp $";
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -1800,7 +1800,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.46.2.4 2002/05/29 00:30:59 mal0rd Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.49 2002/06/03 00:28:16 hal9 Exp $"
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
@@ -2835,6 +2835,9 @@ at sourceforge. Three simple steps:
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
+  Revision 1.49  2002/06/03 00:28:16  hal9
+  Sync with various changes from 3.0 branch. Add two new files for config stuff.
+
   Revision 1.51 2002/05/29 00:30:59  mal0rd
   Fixed a little formatting.  Clarified debian section.
 

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index bb5b5cf..fa0d6e3 100644 (file)
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -8,9 +8,9 @@
 <!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">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!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           -->
@@ -24,7 +24,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: faq.sgml,v 1.61 2002/05/25 12:37:25 hal9 Exp $
+ $Id: faq.sgml,v 1.62 2002/06/03 00:28:16 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -70,7 +70,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 1.61 2002/05/25 12:37:25 hal9 Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 1.62 2002/06/03 00:28:16 hal9 Exp $</pubdate>
 
 <!--
 
@@ -1575,6 +1575,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.62  2002/06/03 00:28:16  hal9
+Sync with various changes from 3.0 branch. Add two new files for config stuff.
+
 Revision 1.61  2002/05/25 12:37:25  hal9
 Various minor changes and edits.
 

diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml
index 4560bc1..c11a390 100644 (file)
--- 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.14 2002/05/26 17:04:25 hal9 Exp $
+ $Id: privoxy-man-page.sgml,v 1.15 2002/06/03 00:28:17 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -42,9 +42,9 @@
 <!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">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">           <!-- define we are not a text only doc -->
 <!entity % p-authors-formal "IGNORE"> <!-- exclude additional formating      -->

diff --git a/doc/source/readme.sgml b/doc/source/readme.sgml
index aa6c2f2..46cf428 100644 (file)
--- a/doc/source/readme.sgml
+++ b/doc/source/readme.sgml
@@ -4,10 +4,12 @@
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity buildsource SYSTEM "buildsource.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
-<!entity % p-not-stable "INCLUDE">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
 <!entity % p-stable "IGNORE">
+<!entity % p-not-stable "IGNORE">  <!-- beta or alpha -->
+<!entity % p-alpha "IGNORE">
+<!entity % p-beta "IGNORE">
 <!entity % p-text "INCLUDE">       <!-- define we are a text only doc    -->
 <!entity % p-doc "IGNORE">         <!-- and never a text doc             -->
 <!entity % p-readme "INCLUDE">     <!-- all your README belong to us     -->
@@ -17,7 +19,7 @@
 
  Purpose     :  README for Privoxy
                 
- $Id: readme.sgml,v 1.16 2002/05/26 17:04:25 hal9 Exp $
+ $Id: readme.sgml,v 1.17 2002/06/03 00:28:17 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -100,10 +102,12 @@
 <para>
  <!-- include some conditional text -->
  This README is included with <![%p-not-stable;[ the development version of]]>
- Privoxy &p-version;<![%p-not-stable;[, which will eventually become Privoxy v3.0 (and soon we
- hope!)]]>. See http://www.privoxy.org/ for more information. The current code
- level is &p-status;<![%p-not-stable;[, and seems stable to us :)]]>.
-</para>
+ Privoxy &p-version;<![%p-not-stable;[, which will eventually become Privoxy v3.2]]><![%p-beta;[ (and soon we hope!)]]>. 
+ See http://www.privoxy.org/ for more information. The current code
+ level is &p-status;<![%p-beta;[, but seems stable to us :)]]><![%p-alpha;[,
+ and may break in mysterious ways :) There may be features only partially 
+ implemented, or worse, not functional]]>. 
+ </para>
 </abstract>
 </artheader>
 
@@ -196,14 +200,14 @@
 <sect1 id="documentation"><title>DOCUMENTATION</title>
 <para>
  There should be documentation in the 'doc' subdirectory<![%p-not-stable;[, but it
- is not completed at this point]]>. In particular, see the User Manual there,
+ may not be in sync with current code]]>. In particular, see the User Manual there,
  the FAQ, and those interested in Privoxy development, should look at
  developer-manual. 
 </para>
 <para>
  <![%p-not-stable;[
  The most up to date source of information on the current development version,
- may still be either comments in the source code, or the included
+ may  be either comments in the source code, or the included
  configuration files. ]]>The source and configuration files are all well
  commented. The main configuration files are: 'config', 'default.action', and
  'default.filter'<![%p-not-stable;[ in the toplevel source directory]]>. 
@@ -228,7 +232,7 @@
 <!-- </LiteralLayout> -->
 <!-- </para> -->
 <!-- <para> -->
-<!--  $Id: readme.sgml,v 1.16.2.1 2002/05/26 17:04:25 hal9 Exp $ -->
+<!--  $Id: readme.sgml,v 1.17 2002/06/03 00:28:17 hal9 Exp $ -->
 <!-- </para> -->
 
 </article>

diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml
index 8bc7508..76fcb62 100644 (file)
--- a/doc/source/user-manual.sgml
+++ b/doc/source/user-manual.sgml
@@ -11,10 +11,10 @@
 <!entity license SYSTEM "license.sgml">
 <!entity p-authors SYSTEM "p-authors.sgml">
 <!entity config SYSTEM "p-config.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
 <!entity % p-authors-formal "INCLUDE"> <!-- include additional text, etc  -->
-<!entity % p-not-stable "INCLUDE">
+<!entity % p-not-stable "IGNORE">
 <!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           -->
@@ -32,7 +32,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: user-manual.sgml,v 1.124 2002/05/29 02:01:02 hal9 Exp $
+ $Id: user-manual.sgml,v 1.125 2002/06/03 00:28:17 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -58,7 +58,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: user-manual.sgml,v 1.124 2002/05/29 02:01:02 hal9 Exp $</pubdate>
+<pubdate>$Id: user-manual.sgml,v 1.125 2002/06/03 00:28:17 hal9 Exp $</pubdate>
 
 <!--
 
@@ -5507,6 +5507,9 @@ In file: user.action <guibutton>[ View ]</guibutton> <guibutton>[ Edit ]</guibut
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: user-manual.sgml,v $
+ Revision 1.125  2002/06/03 00:28:17  hal9
+ Sync with various changes from 3.0 branch. Add two new files for config stuff.
+
  Revision 1.123.2.5  2002/05/29 02:01:02  hal9
  This is break out of the entire config section from u-m, so it can
  eventually be used to generate the comments, etc in the main config file

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index b50137c..6371814 100644 (file)
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -5,9 +5,9 @@
 <!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">
+<!entity p-version SYSTEM "doc_version.tmp">
+<!entity p-status SYSTEM "doc_status.tmp">
+<!entity % p-not-stable "IGNORE">
 <!entity % p-stable "IGNORE">
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
 <!entity % p-homepage "IGNORE">    <!-- toggle for webserver index.html   -->
@@ -20,7 +20,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.18 2002/05/28 02:31:38 hal9 Exp $
+ $Id: index.sgml,v 1.19 2002/06/03 00:28:17 hal9 Exp $
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
@@ -245,6 +245,9 @@
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 1.19  2002/06/03 00:28:17  hal9
+ Sync with various changes from 3.0 branch. Add two new files for config stuff.
+
  Revision 1.16.2.3  2002/05/28 02:31:38  hal9
  New file, privoxy-index.html, for bundling with documentation. Built from
  index.sgml, like homepage, but with content toggles more suitable for this use.