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

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 3a2c2658..30e8ce31 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -4,10 +4,10 @@
 <!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-version "2.9.15">
+<!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">
@@ -19,9 +19,9 @@
                 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 $
+ $Id: index.sgml,v 1.10 2002/04/26 17:24:31 swa Exp $
 
- Written by and Copyright (C) 2001 the SourceForge
+ Written by and Copyright (C) 2001, 2002 the SourceForge
  Privoxy team. http://www.privoxy.org/
 
  Based on the Internet Junkbuster originally written
@@ -31,11 +31,12 @@
 
  ========================================================================
  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. The Makefile is adding additional
+ meta data and content via perl.
+
 -->
 
 <article id="index">
@@ -44,10 +45,9 @@
 
 <title>Privoxy - Homepage</title>
 
-<!-- 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"> -->
+<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>
 <![%dummy;[
@@ -67,16 +67,13 @@
 <!--   ~~~~~       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:
--->
+<!-- Include privoxy.sgml boilerplate: -->
  &p-intro;
+<!-- end boilerplate -->
 </sect1>
 
-<sect1 id="moreinfos" label="">
-<title>More infos</title>
+<sect1 id="moreinfo" label="">
+<title>More info</title>
 <para>
 <itemizedlist>
 	<listitem>
@@ -87,7 +84,7 @@ page</ulink> on Sourceforge
 	</listitem>
 	<listitem>
 	<literallayout>
-	A list of <ulink url="user-manual/introduction.html#AEN37">new features</ulink>
+	A list of <ulink url="user-manual/introduction.html#AEN37">features</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
@@ -97,7 +94,7 @@ page</ulink> on Sourceforge
 	</listitem>
 	<listitem>
 	<literallayout>
-	<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">JunkBuster Corporation</ulink>
+	<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">Junkbusters Corporation</ulink>
 	</literallayout>
 	</listitem>
 <!-- 	<listitem> -->
@@ -153,7 +150,13 @@ page</ulink> on Sourceforge
 	</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>
@@ -162,10 +165,9 @@ page</ulink> on Sourceforge
 
 <sect1 id="support" label="">
 <title>Support and Service via Sourceforge</title>
-<!--
- Include file
--->
+<!-- Include contacting.sgml -->
  &contacting;
+<!-- end include -->
 </sect1>
 
 <sect1 label="">
@@ -182,6 +184,39 @@ page</ulink> on Sourceforge
 <!-- end -->
 </sect1>
 
+
+<!--   ~~~~~       New section      ~~~~~     -->
+<sect1 label="">
+<title></title>
+<!-- dummy section, for spacing -->
+<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>
+    </entry>
+   </row>
+  </tbody>
+ </tgroup>
+</informaltable>
+</para>
+
+<!--
+<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>
+-->
+
+</sect1>
+ 
  <!--
 
  This program is free software; you can redistribute it 
@@ -203,6 +238,31 @@ page</ulink> on Sourceforge
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ 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
+
+ Revision 1.9  2002/04/14 01:00:07  hal9
+ Fix the logo properly with docbook.
+
+ Revision 1.7  2002/04/12 10:11:53  swa
+ changed bookmarklet text so that users can easily find the bookmark
+
+ Revision 1.6  2002/04/12 08:34:18  swa
+ added link to new page
+
+ Revision 1.5  2002/04/12 02:05:19  david__schmidt
+ Tiny English fix: infos -> info
+ Add copyright date 2002
+
+ Revision 1.4  2002/04/08 20:42:07  swa
+ fixed JB spelling
+
+ Revision 1.3  2002/04/07 20:27:18  hal9
+ Fix meta data.
+
+ Revision 1.2  2002/04/07 09:06:45  swa
+ users can now completely browse offline
+
  Revision 1.1  2002/04/07 08:10:48  swa
  create some of the webserver docs
  automatically (in particular if