X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=6371814b2d19719fe55dbe35ed04b01769105929;hp=d01cf4d6b03f97e66aa1c83250c236d6c01091b4;hb=4755c62ad98c26bebd21d2c649689300809a7d76;hpb=556f2610e3b39222537927f8d60b2ef3c0eaf624

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index d01cf4d6..6371814b 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -5,23 +5,22 @@
 <!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           -->
-<!entity % p-readme "IGNORE">
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
+<!entity % p-homepage "IGNORE">    <!-- toggle for webserver index.html   -->
+<!entity % p-index "IGNORE">       <!-- toggle for local doc index        -->
 ]>
 <!--
  File        :  $Source: /cvsroot/ijbswa/current/doc/source/webserver/index.sgml,v $
 
- Purpose     :  Index file of the project's homepage
+ Purpose     :  Index file of the project's homepage and also documentation index
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.15 2002/05/24 00:02:05 oes 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.
@@ -31,14 +30,20 @@
  anything in this, or other Privoxy documentation. 
  ========================================================================
 
- Note: This is the privoxy home page. The Makefile is adding additional
- meta data and content via perl.
+ Note: This is the Privoxy home page *and* builds a page that can be 
+ used with local documentation as a focal point for docs or other points
+ of interest. The Makefile is adding additional meta data and content via
+ perl.
 
+ Generates: index.html, for webserver home page.
+            And privoxy-index.html, for packaging with docs.
+ 
 -->
 
 <article id="index">
 <artheader>
- <title>Privoxy - Homepage</title>
+ <title>Privoxy - <![%p-homepage;[Home Page]]><![%p-index;[The Privacy Enhancing Proxy]]></title>
+ <![%p-index;[<subtitle>Project Index Page v&p-version;</subtitle>]]>
 
 <!-- copyright is at bottom of page -->
 
@@ -68,9 +73,12 @@
   &p-intro;
 <!-- end boilerplate -->
 
+<![%p-homepage;[
   <para>
-   The most recent release is &p-version; (&p-status;).
+   The most recent version is &p-version; (&p-status;). (Odd numbered versions 
+   are available only through CVS.)
   </para>
+]]>
 
  </abstract>
 </artheader>
@@ -157,14 +165,16 @@
   </listitem>
   <listitem>
    <para>
-    <ulink url="team/index.html">Pictures of the Privoxy Team</ulink>
+    <!-- please leave this link absolute so this file can be bundled with -->
+    <!-- documentation and still used locally -->
+    <ulink url="http://privoxy.org/team/index.html">Pictures of the Privoxy Team</ulink>
    </para>
   </listitem>
  </itemizedlist>
 </para>
 </sect1>
 
-
+<![%p-homepage;[
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="">
 <!-- dummy section, for spacing -->
@@ -189,7 +199,7 @@
  </tgroup>
 </informaltable>
 </para>
-
+]]>
 
 <!--
 <informalfigure pgwide="1">
@@ -199,6 +209,12 @@
 </informalfigure>
 -->
 
+
+<![%p-index;[
+<sect1 label=""><title></title>
+<!-- dummy section for layout and spacing -->
+]]>
+
 <!-- Formal copyright markup does not work here. HB. -->
 <para>
  <subscript>
@@ -229,6 +245,23 @@
  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.
+
+ Revision 1.16.2.2  2002/05/26 22:04:46  hal9
+ Add several comments, and reworded 'most recent release', ie we don't officially
+ release odd numbered versions.
+
+ Revision 1.16.2.1  2002/05/26 17:40:02  hal9
+ Make team pictures link absolute for docs.
+
+ Revision 1.16  2002/05/24 10:06:31  oes
+ Nit
+
  Revision 1.15  2002/05/24 00:02:05  oes
  Tried to make more useful and concise:
    Reordered, no more TOC, link to instead of include info,