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

diff --git a/doc/source/webserver/index.sgml b/doc/source/webserver/index.sgml
index c59f2903..10fc19c9 100644
--- a/doc/source/webserver/index.sgml
+++ b/doc/source/webserver/index.sgml
@@ -6,7 +6,7 @@
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity p-version "3.0.25">
-<!entity p-status "UNRELEASED">
+<!entity p-status "beta">
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
 <!entity  my-copy "&copy;">        <!-- kludge for docbook2man            -->
@@ -20,9 +20,9 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
- $Id: index.sgml,v 2.35 2016/01/21 15:56:27 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.
 
  ========================================================================
@@ -77,10 +77,9 @@
 
 <sect1 renderas="sect2" id="download" label=""><title>Download</title>
 <para>
- Privoxy downloads are available at
- <ulink url="https://sourceforge.net/projects/ijbswa/files/">SourceForge</ulink>.
- If you are not comfortable with downloading binaries from SourceForge, please
- use <ulink url="http://www.silvester.org.uk/privoxy/">the mirror</ulink>.
+ 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>
 
@@ -134,45 +133,27 @@
     <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>
 </para>
 </sect1>
 
-<!--
-<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-homepage;[
 <!--   ~~~~~       New section      ~~~~~     -->
 <sect1 label="">
 <!-- dummy section, for spacing -->
 <title></title>
 <para>
-<!-- Mention SF per AUP -->
-Privoxy is developed on <ulink url="http://sourceforge.net/">SourceForge</ulink>.
-
-This page is also available as <ulink url="http://jvauzb4sb3bwlsnc.onion/">onion service</ulink>.
+ <subscript>
+   The Privoxy website is also available as
+   <ulink url="http://jvauzb4sb3bwlsnc.onion/">Tor onion service</ulink>.
+ </subscript>
 </para>
 ]]>
 
@@ -190,6 +171,20 @@ This page is also available as <ulink url="http://jvauzb4sb3bwlsnc.onion/">onion
  </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>
  
  <!--