X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Fwebserver%2Findex.sgml;h=10fc19c913c2c6788a543dcda655c53edee4ce2d;hb=e3abb9046a8c63f250ea3778e10a0a6f35eb2ca7;hp=c9d124455104920b58000f180e5bfa50fff65caf;hpb=4ca1b3964ffd8d2ac27cf2a9f4de9bb7ac67259e;p=privoxy.git

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index c9d12445..10fc19c9 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -5,10 +5,10 @@
 <!entity history SYSTEM "history.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
-<!entity p-version "3.0.19">
-<!entity p-status "stable">
-<!entity % p-not-stable "IGNORE">
-<!entity % p-stable "INCLUDE">
+<!entity p-version "3.0.25">
+<!entity p-status "beta">
+<!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        -->
@@ -20,9 +20,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 2.19 2011/11/13 17:03:54 fabiankeil Exp $
+ $Id: index.sgml,v 2.44 2016/05/27 15:24:13 fabiankeil Exp $
 
- Copyright (C) 2001-2009 Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
+ Copyright (C) 2001-2016 Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
  See LICENSE.
 
  ========================================================================
@@ -47,16 +47,6 @@
 
 <!-- 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;[
@@ -87,32 +77,20 @@
 
 <sect1 renderas="sect2" id="download" label=""><title>Download</title>
 <para>
- <itemizedlist>
-  <listitem>
-   <para>
-    <ulink url="https://sourceforge.net/projects/ijbswa/files/">Download recent releases</ulink>
-   </para>
-  </listitem>
- <!-- 
- deprecated
-  <listitem>
-   <para>
-    <ulink url="http://cvs.sourceforge.net/cvstarballs/ijbswa-cvsroot.tar.bz2">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>
 
 <sect1 renderas="sect2" id="docs" label=""><title>Documentation</title>
 <para>
  <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>
@@ -155,21 +133,11 @@
     <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>
+    <ulink url="https://www.privoxy.org/team/index.html">Pictures of the Privoxy Team</ulink>
    </para>
   </listitem>
  </itemizedlist>
@@ -182,36 +150,13 @@
 <!-- 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 -->
@@ -222,10 +167,24 @@
 <!-- GNUMakefile is inserting this now -->
 <para>
  <subscript>
-  Copyright __copy 2001-2010 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>
  
  <!--
@@ -247,159 +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 2.19  2011/11/13 17:03:54  fabiankeil
- Bump entities for 3.0.18 stable
-
- Revision 2.18  2011/08/17 10:40:07  fabiankeil
- Update the entities.
-
- This commit is chronological out of order.
-
- Revision 2.17  2010/11/10 21:49:38  fabiankeil
- Set p-version to 3.0.17
-
- Revision 2.16  2010/02/13 17:38:39  fabiankeil
- Update entities for 3.0.16 stable.
-
- Revision 2.15  2010/02/13 16:38:18  fabiankeil
- Update copyright.
-
- Revision 2.14  2010/01/11 13:47:25  fabiankeil
- Finally bump entities for 3.0.16 UNRELEASED here, too.
-
- Revision 2.13  2009/10/10 06:07:40  fabiankeil
- Prepare for 3.0.15 beta.
-
- Revision 2.12  2009/08/01 11:48:22  fabiankeil
- Update the "Download recent releases" URL and fix the "Pictures of the Privoxy Team" URL.
- privoxy.org redirects to www.privoxy.org anyway.
-
- Revision 2.11  2009/07/18 16:24:39  fabiankeil
- Bump entities for 3.0.14 beta.
-
- Revision 2.10  2009/06/12 14:30:59  fabiankeil
- Update entities for 3.0.13 beta.
-
- Revision 2.9  2009/02/19 14:12:02  fabiankeil
- Change link to the project page to https://.
-
- Revision 2.8  2009/02/12 16:09:44  fabiankeil
- Declare the code stable.
-
- Revision 2.7  2009/01/13 16:50:36  fabiankeil
- The standard.action file is gone.
-
- Revision 2.6  2008/08/16 08:51:28  fabiankeil
- Update version-related entities.
-
- Revision 2.5  2008/06/18 17:42:13  fabiankeil
- - Remove link to soon-to-be-removed PDFs.
- - Use https for the download URL.
- - Update copyright year.
-
- Revision 2.4  2006/08/28 01:08:57  hal9
- Remove reference to defunct nightly cvs tarballs.
-
- Revision 2.3  2006/07/18 14:48:51  david__schmidt
- Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
- with what was really the latest development (the v_3_0_branch branch)
-
- Revision 1.16.2.12  2004/01/30 14:33:41  oes
- Vi(m) syntax voodoo now hidden; copyright updated
-
- Revision 1.16.2.11  2003/08/16 12:16:30  hal9
- Update cvs tarball URL (to bz2)
-
- Revision 1.16.2.10  2003/03/28 03:33:09  hal9
- Include link for announce.txt, and change handling of &copy;.
-
- Revision 1.16.2.9  2003/03/26 02:03:45  oes
- Updated hard-coded copyright dates
-
- 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>