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

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 94074acb..fbfb5272 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -1,228 +1,200 @@
 <!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 license SYSTEM "license.sgml">
-<!entity p-version "2.9.15">
-<!entity p-status "beta">
+<!entity p-version "3.0.29">
+<!entity p-status "UNRELEASED">
 <!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 $
+ File        :  doc/source/webserver/index.sgml
 
- Purpose     :  Index file of the project's homepage
-                This file belongs into
-                ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
+ Purpose     :  Index file of the project's homepage and also documentation index
                 
- $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/
-
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and 
- Junkbusters Corporation.  http://www.junkbusters.com
-
+ Copyright (C) 2001-2020 Privoxy developers <privoxy-devel@lists.privoxy.org>
+ 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 - 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 -->
 
-<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 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">features</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="http://www.waldherr.org/junkbuster/">Stefan Waldherr's site</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="http://www.junkbusters.com/ht/en/ijbfaq.html">Junkbusters Corporation</ulink>
-	</literallayout>
-	</listitem>
-<!-- 	<listitem> -->
-<!-- 	<literallayout class="normal"> -->
-<!-- 	Take a look at the <ulink url="team/">Privoxy team</ulink> -->
-<!-- 	</literallayout> -->
-<!-- 	</listitem> -->
- </itemizedlist>
+ You can <ulink url="/sf-download-mirror/">download Privoxy here</ulink>,
+ from <ulink url="https://www.silvester.org.uk/privoxy/">this mirror</ulink>,
+ or from <ulink url="https://sourceforge.net/projects/ijbswa/files/">SourceForge</ulink>.
+</para>
+<para>
+ Note that the Privoxy project currently has no trusted build infrastructure.
+ Binary packages are built and uploaded by individual members of the Privoxy
+ project or external contributors. For details check the signatures.
+</para>
+<para>
+ Subscribe to the <ulink url="/feeds/privoxy-releases.xml">release feed</ulink>
+ to get informed when new releases are available.
 </para>
 </sect1>
 
-<sect1 id="download" label="">
-<title>Download</title>
+<sect1 renderas="sect2" id="docs" label=""><title>Documentation</title>
 <para>
-<itemizedlist>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118">Download recent releases</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<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 class="normal">
-	<ulink url="user-manual/index.html">User manual</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="faq/index.html">Frequently Asked Questions</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<literallayout class="normal">
-	<ulink url="team/index.html">Pictures of the Privoxy Team</ulink>
-	</literallayout>
-	</listitem>
-	<listitem>
-	<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>
+  <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>
+    <!-- please leave this link absolute so this file can be bundled with -->
+    <!-- documentation and still used locally -->
+    <ulink url="https://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>License</title>
-<!-- Include copyright.sgml -->
- &license;
-<!-- end -->
-</sect1>
-
-<sect1 label="">
-<title>History</title>
-<!-- Include history.sgml -->
- &history;
-<!-- end -->
-</sect1>
-
-
+<![%p-homepage;[
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="">
 <!-- 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>
-    </entry>
-   </row>
-  </tbody>
- </tgroup>
-</informaltable>
+ <subscript>
+   The Privoxy website is also available as
+   <ulink url="http://jvauzb4sb3bwlsnc.onion/">Tor onion service</ulink>.
+ </subscript>
 </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>
--->
+<![%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>
-  Copyright &copy; 2001, 2002 by Privoxy Developers
+ <subscript>
+  Copyright __copy 2001-2020 by Privoxy Developers
+ </subscript>
 </para>
 
+<![%p-homepage;[
+<para>
+ <subscript>
+  Hosting and development is funded in part by:
+ </subscript>
+ <subscript>
+  <ulink url="https://www.top10vpn.com">https://www.top10vpn.com</ulink>
+ </subscript>
+ <subscript>
+  <ulink url="https://www.vpnranks.com/">https://www.vpnranks.com/</ulink>
+ </subscript>
+</para>
+<para>
+ <subscript>
+  <ulink url="/faq/general.html#SPONSOR">Become a sponsor</ulink>
+ </subscript>
+</para>
+]]>
+
 </sect1>
  
  <!--
@@ -244,47 +216,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.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
-
- 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
- those docs recycle other documentation
- fragments). Now committed webserver's
- index file.
-
-
  -->
 
 </article>