X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=ba47611b48b925f4a3d50c43e1df79df825b5fca;hp=46fa09ba81fc1be4a125392df0abb9dc03c39ed9;hb=54d2e5af532d3c94bcae3c21f8093eace7e60e6e;hpb=f5e64b537f21ec76c6a1665277d78b6dc8f861d2

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index 46fa09ba..ba47611b 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -1,14 +1,14 @@
 <!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 SYSTEM "doc_version.tmp">
-<!entity p-status SYSTEM "doc_status.tmp">
+<!entity p-version "3.0.26">
+<!entity p-status "stable">
 <!entity % p-not-stable "IGNORE">
-<!entity % p-stable "IGNORE">
+<!entity % p-stable "INCLUDE">
 <!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        -->
@@ -20,9 +20,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 1.16.2.8 2002/08/16 03:05:42 hal9 Exp $
+ $Id: index.sgml,v 2.46 2016/07/28 08:25:33 fabiankeil Exp $
 
- Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
+ Copyright (C) 2001-2016 Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
  See LICENSE.
 
  ========================================================================
@@ -47,18 +47,17 @@
 
 <!-- copyright is at bottom of page -->
 
- <keywordset>
-  <keyword>privoxy</keyword> <keyword>HTTP</keyword> <keyword>proxy</keyword> <keyword>privacy</keyword>
-  <keyword>popups</keyword>  <keyword>po-ups</keyword> <keyword>HTML</keyword> <keyword>JavaScript</keyword>
-  <keyword>cleaning</keyword> <keyword>blocking</keyword> <keyword>cleaner</keyword> <keyword>blocker</keyword>
-  <keyword>filter</keyword> <keyword>proxy</keyword> <keyword>junk</keyword> <keyword>ad</keyword>
-  <keyword>advertisement</keyword> <keyword>banner</keyword> <keyword>webbugs</keyword>
-  <keyword>web-bugs</keyword> <keyword>werbung</keyword> <keyword>junkbusters</keyword>
-  <keyword>junkbuster</keyword>
- </keywordset>
-
  <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>
+]]>
 
 <!-- Include privoxy.sgml boilerplate: -->
   &p-intro;
@@ -66,7 +65,7 @@
 
 <![%p-homepage;[
   <para>
-   The most recent release is &p-version; (&p-status;). 
+   The most recent release is <ulink url="announce.txt">&p-version; (&p-status;)</ulink>. 
   </para>
 ]]>
 
@@ -78,23 +77,9 @@
 
 <sect1 renderas="sect2" id="download" label=""><title>Download</title>
 <para>
- <itemizedlist>
-  <listitem>
-   <para>
-    <ulink url="http://sourceforge.net/project/showfiles.php?group_id=11118">Download recent releases</ulink>
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    <ulink url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.gz">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>
+ You can <ulink url="/sf-download-mirror/">download Privoxy here</ulink>,
+ from <ulink url="http://www.silvester.org.uk/privoxy/">this mirror</ulink>,
+ or from <ulink url="https://sourceforge.net/projects/ijbswa/files/">SourceForge</ulink>.
 </para>
 </sect1>
 
@@ -103,26 +88,24 @@
  <itemizedlist>
   <listitem>
    <para>
-    <ulink url="user-manual/index.html">User manual</ulink>
+    <ulink url="user-manual/quickstart.html">Quickstart after installation</ulink>
    </para>
   </listitem>
   <listitem>
    <para>
-    <ulink url="faq/index.html">Frequently Asked Questions</ulink>
+    <ulink url="user-manual/index.html">User manual</ulink>
    </para>
   </listitem>
   <listitem>
    <para>
-    <ulink url="developer-manual/index.html">Developer Manual</ulink>
+    <ulink url="faq/index.html">Frequently Asked Questions</ulink>
    </para>
   </listitem>
-<![%p-homepage;[
-<!-- not included for local installation index page -->
   <listitem>
    <para>
-    <ulink url="pdf/privoxy-pdf-docs.zip">The above docs as PDF in Zip archive</ulink>
+    <ulink url="developer-manual/index.html">Developer Manual</ulink>
    </para>
-  </listitem> ]]>
+  </listitem>
   <listitem>
    <para>
     <ulink url="man-page/privoxy-man-page.html">Classic Man Page</ulink>
@@ -150,21 +133,11 @@
     <ulink url="user-manual/introduction.html#FEATURES">List of (new) Features</ulink>
    </para>
   </listitem>
-  <listitem>
-   <para>
-    <ulink url="http://sourceforge.net/projects/ijbswa/">The project page</ulink> at <ulink url="http://sourceforge.net/">SourceForge</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://privoxy.org/team/index.html">Pictures of the Privoxy Team</ulink>
+    <ulink url="https://www.privoxy.org/team/index.html">Pictures of the Privoxy Team</ulink>
    </para>
   </listitem>
  </itemizedlist>
@@ -177,48 +150,41 @@
 <!-- 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">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>
+ <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>
  <subscript>
-  Copyright &copy; 2001, 2002 by Privoxy Developers
+  Copyright __copy 2001-2016 by Privoxy Developers
  </subscript>
 </para>
 
+<![%p-homepage;[
+<para>
+ <!--
+   The markup for the sponsor logo gets inserted into the generated
+   HTML by the dok-webserver target because the logo uses the shiny
+   new PNG format which our awesome Docbook toolchain apparently does
+   not support yet.
+  -->
+ <subscript>
+   Hosting sponsored by ChameleonJohn.
+ </subscript>
+</para>
+]]>
+
 </sect1>
  
  <!--
@@ -240,90 +206,6 @@
  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.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
-
- 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>