X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=94074acb4d4eececea7ac310f22c1cdc4e7a2853;hp=cd1dd13ef8c4bf0ef20fe9abbe290f01967203d3;hb=8759d4dc1727547fb5c495766d9c89b9cd90f8e1;hpb=0ae2f69052130030cce6886aeef181a9e9e0088d

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index cd1dd13e..94074acb 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -4,7 +4,8 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
-<!entity p-version "2.9.14">
+<!entity license SYSTEM "license.sgml">
+<!entity p-version "2.9.15">
 <!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
@@ -19,7 +20,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.7 2002/04/12 10:11:53 swa Exp $
+ $Id: index.sgml,v 1.12 2002/05/05 20:26:02 hal9 Exp $
 
  Written by and Copyright (C) 2001, 2002 the SourceForge
  Privoxy team. http://www.privoxy.org/
@@ -42,9 +43,10 @@
 <article id="index">
 
 <artheader>
-
 <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>
@@ -77,28 +79,28 @@
 <para>
 <itemizedlist>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	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>
+	A list of <ulink url="user-manual/introduction.html#AEN37">features</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="http://www.waldherr.org/junkbuster/">Stefan Waldherr's site</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">Junkbusters Corporation</ulink>
 	</literallayout>
 	</listitem>
 <!-- 	<listitem> -->
-<!-- 	<literallayout> -->
+<!-- 	<literallayout class="normal"> -->
 <!-- 	Take a look at the <ulink url="team/">Privoxy team</ulink> -->
 <!-- 	</literallayout> -->
 <!-- 	</listitem> -->
@@ -111,17 +113,17 @@ page</ulink> on Sourceforge
 <para>
 <itemizedlist>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118">Download recent releases</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/current/">Browse our CVS repository</ulink>
 	</literallayout>
 	</listitem>
@@ -134,28 +136,29 @@ page</ulink> on Sourceforge
 <para>
 <itemizedlist>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="user-manual/index.html">User manual</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="faq/index.html">Frequently Asked Questions</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="team/index.html">Pictures of the Privoxy Team</ulink>
 	</literallayout>
 	</listitem>
 	<listitem>
-	<literallayout>
+	<literallayout class="normal">
 	<ulink url="developer-manual/index.html">Developer Manual</ulink>
+<!--  	,alternatively as a pdf file: <ulink url="">developer-manual.pdf</ulink>. -->
 	</literallayout>
 	</listitem>
  </itemizedlist>
@@ -170,9 +173,9 @@ page</ulink> on Sourceforge
 </sect1>
 
 <sect1 label="">
-<title>Copyright</title>
+<title>License</title>
 <!-- Include copyright.sgml -->
- &copyright;
+ &license;
 <!-- end -->
 </sect1>
 
@@ -186,24 +189,42 @@ page</ulink> on Sourceforge
 
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="">
+<!-- dummy section, for spacing -->
 <title></title>
-<para></para>
-<!-- dummy, for spacing -->
-</sect1>
-
-<!--
-BWAAAAAAA!!!!!!!!!!!
 <para>
- <ulink url="http://sourceforge.net/>
-  <graphic align="center" fileref="http://sourceforge.net/sflogo.php?group_id=11118&#38;type=1"></graphic>
- </ulink>
+<!-- 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>
 
-NOTE: Sourceforge Logo is required. Makefile is dumping that here, 
-courtesy of Mr Perl.
 
+<!--
+<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>
 -->
 
+<!-- Formal copyright markup does not work here. HB. -->
+<para>
+  Copyright &copy; 2001, 2002 by Privoxy Developers
+</para>
+
+</sect1>
+ 
  <!--
 
  This program is free software; you can redistribute it 
@@ -225,6 +246,18 @@ courtesy of Mr Perl.
  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  $Log: index.sgml,v $
+ 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
+
+ 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