X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=c59f29038b39c67b3383ba6bd9a6c1a39d35aea9;hp=3a2c265810e65d555e627b795431b0f5307eabdd;hb=7a99a61ab1a3ce0401821aedcd06eba19a698b2a;hpb=7e7c9b5a85cbf3f95e058231b6432b1bcb4e4e3d

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 3a2c2658..c59f2903 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -1,187 +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.13">
-<!entity p-status "BETA">
-<!entity % p-not-stable "INCLUDE"> <!-- set to IGNORE for stable release  -->
-<!entity % p-stable "IGNORE">      <!-- set INCLUDE for stable release    -->
-<!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 license SYSTEM "license.sgml">
+<!entity p-version "3.0.25">
+<!entity p-status "UNRELEASED">
+<!entity % p-not-stable "INCLUDE">
+<!entity % p-stable "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.1 2002/04/07 08:10:48 swa Exp $
-
- Written by and Copyright (C) 2001 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.35 2016/01/21 15:56:27 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. You have been warned!
- Failure to abide by this rule will result in the revocation of your license 
- to live a peaceful existence!
+ anything in this, or other Privoxy documentation. 
  ========================================================================
 
+ 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 -->
 
-<!-- FIXME -->
-<!-- <meta name="description" content="Privoxy helps consumers reduce unwanted junk email and protect their privacy from direct marketing companies."> -->
-<!-- <meta name="keywords" content="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 "> -->
-<!-- <meta name="MSSmartTagsPreventParsing" content="TRUE"> -->
+ <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>
-<!-- dummy section to force TOC on page by itself -->
-<!-- DO NOT REMOVE! please ;) -->
-<!--
- Include privoxy.sgml boilerplate:
--->
- &p-intro;
-</sect1>
 
-<sect1 id="moreinfos" label="">
-<title>More infos</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">new 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">JunkBuster Corporation</ulink>
-	</literallayout>
-	</listitem>
-<!-- 	<listitem> -->
-<!-- 	<literallayout> -->
-<!-- 	Take a look at the <ulink url="team/">Privoxy team</ulink> -->
-<!-- 	</literallayout> -->
-<!-- 	</listitem> -->
- </itemizedlist>
+ Privoxy downloads are available at
+ <ulink url="https://sourceforge.net/projects/ijbswa/files/">SourceForge</ulink>.
+ If you are not comfortable with downloading binaries from SourceForge, please
+ use <ulink url="http://www.silvester.org.uk/privoxy/">the mirror</ulink>.
 </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/quickstart.html">Quickstart after installation</ulink>
+   </para>
+  </listitem>
+  <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="developer-manual/index.html">Developer Manual</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 file
+<informalfigure pgwide="1">
+ <ulink url="http://sourceforge.net/">
+  <inlinegraphic align="center" fileref="http://sourceforge.net/sflogo.php?group_id=11118&#38;type=1&#38;dummy=.gif"></inlinegraphic>
+ </ulink>
+</informalfigure>
 -->
- &contacting;
-</sect1>
 
+<![%p-homepage;[
+<!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="">
-<title>Copyright</title>
-<!-- Include copyright.sgml -->
- &copyright;
-<!-- end -->
-</sect1>
+<!-- dummy section, for spacing -->
+<title></title>
+<para>
+<!-- Mention SF per AUP -->
+Privoxy is developed on <ulink url="http://sourceforge.net/">SourceForge</ulink>.
 
-<sect1 label="">
-<title>History</title>
-<!-- Include history.sgml -->
- &history;
-<!-- end -->
-</sect1>
+This page is also available as <ulink url="http://jvauzb4sb3bwlsnc.onion/">onion service</ulink>.
+</para>
+]]>
+
+<![%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-2016 by Privoxy Developers
+ </subscript>
+</para>
+
+</sect1>
+ 
  <!--
 
  This program is free software; you can redistribute it 
@@ -201,16 +211,6 @@ page</ulink> on Sourceforge
  http://www.gnu.org/copyleft/gpl.html
  or write to the Free Software Foundation, Inc., 59
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
- $Log: index.sgml,v $
- Revision 1.1  2002/04/07 08:10:48  swa
- create some of the webserver docs
- automatically (in particular if
- those docs recycle other documentation
- fragments). Now committed webserver's
- index file.
-
-
  -->
 
 </article>