X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=7816e55b601bf2689aae513c6ccaef2f66befd0f;hp=30e8ce312b40de21424d6566399574d0826dbab3;hb=a80d8f47218badafda3080ee8f89da827c0761cc;hpb=3926884a0bfbdf10d62077af0cc3c5fde3eb85c9

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 30e8ce31..7816e55b 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -1,211 +1,197 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-<!entity % dummy "INCLUDE"> 
+<!entity % dummy "IGNORE"> 
 <!entity p-intro SYSTEM "privoxy.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.15">
+<!entity license SYSTEM "license.sgml">
+<!entity p-version "3.0.20">
 <!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!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.10 2002/04/26 17:24:31 swa 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 2.23 2013/01/06 13:25:00 fabiankeil Exp $
 
+ Copyright (C) 2001-2009 Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
+ See LICENSE.
 
  ========================================================================
  NOTE: Please read developer-manual/documentation.html before touching 
  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.
+            privoxy-index.html, for packaging with docs
+ 
 -->
 
 <article id="index">
-
 <artheader>
+ <title>Privoxy - <![%p-homepage;[Home Page]]><![%p-index;[The Privacy Enhancing Proxy]]></title>
+ <![%p-index;[<subtitle>Project Index Page v&p-version;</subtitle>]]>
 
-<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>
-</keywordset>
+ <abstract>
 
-<abstract>
 <![%dummy;[
- <para>
- <comment>
-  This is here to keep vim syntax file from breaking :/
-  If I knew enough to fix it, I would.
-  PLEASE DO NOT REMOVE! HB: hal@foobox.net
- </comment>
- </para>
+  <para>
+   <comment>
+    This is here to keep vim syntax file from breaking :/
+    If I knew enough to fix it, I would.
+    PLEASE DO NOT REMOVE! HB: hal@foobox.net
+   </comment>
+  </para>
 ]]>
 
-</abstract>
+<!-- Include privoxy.sgml boilerplate: -->
+  &p-intro;
+<!-- end boilerplate -->
+
+<![%p-homepage;[
+  <para>
+   The most recent release is <ulink url="announce.txt">&p-version; (&p-status;)</ulink>. 
+  </para>
+]]>
 
+ </abstract>
 </artheader>
 
 <!--   ~~~~~       New section      ~~~~~     -->
-<sect1 id="intro" label="">
-<title>Introduction</title>
-<!-- Include privoxy.sgml boilerplate: -->
- &p-intro;
-<!-- end boilerplate -->
-</sect1>
 
-<sect1 id="moreinfo" label="">
-<title>More info</title>
+
+<sect1 renderas="sect2" id="download" label=""><title>Download</title>
 <para>
-<itemizedlist>
-	<listitem>
-	<literallayout>
-	The <ulink url="http://sourceforge.net/projects/ijbswa/">project
-page</ulink> on Sourceforge
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	A list of <ulink url="user-manual/introduction.html#AEN37">features</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="http://www.waldherr.org/junkbuster/">Stefan Waldherr's site</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">Junkbusters Corporation</ulink>
-	</literallayout>
-	</listitem>
-<!-- 	<listitem> -->
-<!-- 	<literallayout> -->
-<!-- 	Take a look at the <ulink url="team/">Privoxy team</ulink> -->
-<!-- 	</literallayout> -->
-<!-- 	</listitem> -->
+ <itemizedlist>
+  <listitem>
+   <para>
+    <ulink url="https://sourceforge.net/projects/ijbswa/files/">Download recent releases</ulink>
+   </para>
+  </listitem>
+ <!-- 
+ deprecated
+  <listitem>
+   <para>
+    <ulink url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.bz2">Download the latest CVS snapshot (source tarball)</ulink>
+   </para>
+  </listitem>
+ --> 
+  <listitem>
+   <para>
+    <ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
+   </para>
+  </listitem>
  </itemizedlist>
 </para>
 </sect1>
 
-<sect1 id="download" label="">
-<title>Download</title>
+<sect1 renderas="sect2" id="docs" label=""><title>Documentation</title>
 <para>
-<itemizedlist>
-	<listitem>
-	<literallayout>
-	<ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118">Download recent releases</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/current/">Browse our CVS repository</ulink>
-	</literallayout>
-	</listitem>
+ <itemizedlist>
+  <listitem>
+   <para>
+    <ulink url="user-manual/index.html">User manual</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="faq/index.html">Frequently Asked Questions</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="developer-manual/index.html">Developer Manual</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
+   </para>
+  </listitem>
  </itemizedlist>
 </para>
 </sect1>
 
-<sect1 id="docs" label="">
-<title>Documentation</title>
+<sect1 renderas="sect2" id="moreinfo" label=""><title>More information</title>
 <para>
-<itemizedlist>
-	<listitem>
-	<literallayout>
-	<ulink url="user-manual/index.html">User manual</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="faq/index.html">Frequently Asked Questions</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="team/index.html">Pictures of the Privoxy Team</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout>
-	<ulink url="developer-manual/index.html">Developer Manual</ulink>
-<!--  	,alternatively as a pdf file: <ulink url="">developer-manual.pdf</ulink>. -->
-	</literallayout>
-	</listitem>
+ <itemizedlist>
+  <listitem>
+   <para>
+    <ulink url="user-manual/contact.html">Support &amp; Service</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="user-manual/copyright.html">Copyright, License, History & Authors</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="user-manual/introduction.html#FEATURES">List of (new) Features</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="https://sourceforge.net/projects/ijbswa/">The project page</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <ulink url="user-manual/seealso.html">Related links</ulink>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <!-- please leave this link absolute so this file can be bundled with -->
+    <!-- documentation and still used locally -->
+    <ulink url="http://www.privoxy.org/team/index.html">Pictures of the Privoxy Team</ulink>
+   </para>
+  </listitem>
  </itemizedlist>
 </para>
 </sect1>
 
-<sect1 id="support" label="">
-<title>Support and Service via Sourceforge</title>
-<!-- Include contacting.sgml -->
- &contacting;
-<!-- end include -->
-</sect1>
-
-<sect1 label="">
-<title>Copyright</title>
-<!-- Include copyright.sgml -->
- &copyright;
-<!-- end -->
-</sect1>
-
-<sect1 label="">
-<title>History</title>
-<!-- Include history.sgml -->
- &history;
-<!-- end -->
-</sect1>
-
-
+<![%p-homepage;[
 <!--   ~~~~~       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">
  <tgroup cols=1 align="center" colsep=1 rowsep=1>
   <colspec colname=c1 align="center">
-   <tbody>
-    <row>
-     <entry align="center">
-      <ulink url="http://sourceforge.net/">
-       <inlinegraphic  fileref="http://sourceforge.net/sflogo.php?group_id=11118&#38;type=1&#38;dummy=.gif"></inlinegraphic>
-      </ulink>
+  <tbody>
+   <row>
+    <entry align="center">Privoxy is developed on:</entry>
+   </row>
+   <row>
+    <entry align="center">
+     <ulink url="http://sourceforge.net/">
+      <inlinegraphic  fileref="http://sourceforge.net/sflogo.php?group_id=11118&#38;type=1&#38;dummy=.gif"></inlinegraphic>
+     </ulink>
     </entry>
    </row>
   </tbody>
  </tgroup>
 </informaltable>
 </para>
+]]>
 
 <!--
 <informalfigure pgwide="1">
@@ -215,6 +201,21 @@ page</ulink> on Sourceforge
 </informalfigure>
 -->
 
+
+<![%p-index;[
+<sect1 label=""><title></title>
+<!-- dummy section for layout and spacing -->
+]]>
+
+<!-- Formal copyright markup does not work here. HB. -->
+<!-- NOTE: I could not get docbook to completely ignore &copy; -->
+<!-- GNUMakefile is inserting this now -->
+<para>
+ <subscript>
+  Copyright __copy 2001-2013 by Privoxy Developers
+ </subscript>
+</para>
+
 </sect1>
  
  <!--
@@ -238,6 +239,136 @@ page</ulink> on Sourceforge
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ Revision 2.23  2013/01/06 13:25:00  fabiankeil
+ Bumped entities for 3.0.20 beta
+
+ Revision 2.22  2012/09/20 10:43:11  fabiankeil
+ Ditch pointless keywords. Search engines no longer need them.
+
+ Revision 2.21  2012/03/18 15:41:49  fabiankeil
+ Bump entities to 3.0.20 UNRELEASED
+
+ Revision 2.20  2011/12/26 17:05:40  fabiankeil
+ Bump entities for 3.0.19
+
+ Revision 2.19  2011/11/13 17:03:54  fabiankeil
+ Bump entities for 3.0.18 stable
+
+ Revision 2.18  2011/08/17 10:40:07  fabiankeil
+ Update the entities.
+
+ This commit is chronological out of order.
+
+ Revision 2.17  2010/11/10 21:49:38  fabiankeil
+ Set p-version to 3.0.17
+
+ Revision 2.16  2010/02/13 17:38:39  fabiankeil
+ Update entities for 3.0.16 stable.
+
+ Revision 2.15  2010/02/13 16:38:18  fabiankeil
+ Update copyright.
+
+ Revision 2.14  2010/01/11 13:47:25  fabiankeil
+ Finally bump entities for 3.0.16 UNRELEASED here, too.
+
+ Revision 2.13  2009/10/10 06:07:40  fabiankeil
+ Prepare for 3.0.15 beta.
+
+ Revision 2.12  2009/08/01 11:48:22  fabiankeil
+ Update the "Download recent releases" URL and fix the "Pictures of the Privoxy Team" URL.
+ privoxy.org redirects to www.privoxy.org anyway.
+
+ Revision 2.11  2009/07/18 16:24:39  fabiankeil
+ Bump entities for 3.0.14 beta.
+
+ Revision 2.10  2009/06/12 14:30:59  fabiankeil
+ Update entities for 3.0.13 beta.
+
+ Revision 2.9  2009/02/19 14:12:02  fabiankeil
+ Change link to the project page to https://.
+
+ Revision 2.8  2009/02/12 16:09:44  fabiankeil
+ Declare the code stable.
+
+ Revision 2.7  2009/01/13 16:50:36  fabiankeil
+ The standard.action file is gone.
+
+ Revision 2.6  2008/08/16 08:51:28  fabiankeil
+ Update version-related entities.
+
+ Revision 2.5  2008/06/18 17:42:13  fabiankeil
+ - Remove link to soon-to-be-removed PDFs.
+ - Use https for the download URL.
+ - Update copyright year.
+
+ Revision 2.4  2006/08/28 01:08:57  hal9
+ Remove reference to defunct nightly cvs tarballs.
+
+ Revision 2.3  2006/07/18 14:48:51  david__schmidt
+ Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ with what was really the latest development (the v_3_0_branch branch)
+
+ Revision 1.16.2.12  2004/01/30 14:33:41  oes
+ Vi(m) syntax voodoo now hidden; copyright updated
+
+ Revision 1.16.2.11  2003/08/16 12:16:30  hal9
+ Update cvs tarball URL (to bz2)
+
+ Revision 1.16.2.10  2003/03/28 03:33:09  hal9
+ Include link for announce.txt, and change handling of &copy;.
+
+ Revision 1.16.2.9  2003/03/26 02:03:45  oes
+ Updated hard-coded copyright dates
+
+ Revision 1.16.2.8  2002/08/16 03:05:42  hal9
+ Put all pdf docs in a zip archive now.
+
+ Revision 1.16.2.7  2002/08/14 16:40:00  hal9
+ Add links to pdf docs.
+
+ Revision 1.16.2.6  2002/07/26 15:22:15  oes
+ Most recent release now inserted automatically (again)
+
+ Revision 1.16.2.5  2002/06/09 18:59:16  hal9
+ Correct typo.
+
+ Revision 1.16.2.4  2002/06/09 16:36:33  hal9
+ Clarifications on filtering and MIME. Hardcode 'latest release' in index.html.
+
+ 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,
+   added some links. Should we use the free space to better
+   describe what Privoxy is good for?
+
+ Revision 1.14  2002/05/10 01:48:20  hal9
+ 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).
+
+ 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.
+
+ 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