[or-cvs] Apply nile"s patch for the new download page

[Peter Palfrader]

Update of /home/or/cvsroot/website/en
In directory moria:/tmp/cvs-serv9588

Modified Files:
	download.wml 
Log Message:
Apply nile's patch for the new download page

Index: download.wml
===================================================================
RCS file: /home/or/cvsroot/website/en/download.wml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- download.wml	15 Nov 2005 21:17:16 -0000	1.8
+++ download.wml	5 Dec 2005 18:33:37 -0000	1.9
@@ -11,15 +11,13 @@
 <p>Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
 under the <a href="<cvssandbox>tor/LICENSE">3-clause BSD license</a>.</p>
 
-<p>You can get the latest release from the <a href="dist/">download
-directory</a>.
-The latest stable release is <b><version-stable></b>, and the
-latest development release is <b><version-alpha></b>.
-To keep informed of security advisories and new stable releases, subscribe
-to the <a href="http://archives.seul.org/or/announce/">or-announce
-mailing list</a>: (you will need to confirm via email)
-</p>
+<p>The latest stable release is <b><version-stable></b>, and the
+latest development release is <b><version-alpha></b>.</p>
 
+<p><b>Subscribe</b> to the 
+<a href="http://archives.seul.org/or/announce/">or-announce mailing list</a>
+to keep informed of security advisories and new stable releases (you will 
+need to confirm via email):
 <form action="http://freehaven.net/cgi-bin/majordomo.cgi">
 <input type="hidden" name="mlist" value="or-announce">
 <input type="hidden" name="subscribe" value="1">
@@ -27,51 +25,121 @@
 <input name="email" size="15">
 <input type="submit" value="subscribe">
 </form>
+</p>
 
-<p>Tor should run on Linux, BSD, OS X, Windows, Solaris, and more.</p>
-<ul>
-<li><b>Windows</b> installer:
+
+<table border="1" cellspacing="0" cellpadding="2">
+<tr>
+<td><strong>Platform</strong></td>
+<td><strong>Package</strong></td>
+<td><strong>Setup info</strong></td>
+</tr>
+
+<tr>
+<td>Windows</td>
+<td>
 <a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>),
-<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>).
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-win32.html">Win32 Tor instructions</a>.</li>
+<a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-stable-sig>">sig</a>)
+</td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-win32.html">Win32 instructions</a></td>
+</tr>
 
-<li><b>Mac OS X Tiger</b> installer: 
+<tr>
+<td>Mac OS X Tiger</td>
+<td>
 <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>),
-<a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>).
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X Tor instructions</a>.
-</li>
+<a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>)
+</td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X instructions</a></td>
+</tr>
 
-<li><b>Mac OS X Panther/Jaguar</b> installer: 
-<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a href="<package-oldosx-stable-sig>">sig</a>).
-Be sure to read the <a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X Tor instructions</a>.
-</li>
-<li><b>Debian packages</b>: <kbd>apt-get install tor</kbd> (<a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">guide for Sarge and experimental Tor versions</a>)
-</li>
+<tr>
+<td>Mac OS X Panther/Jaguar</td>
+<td>
+<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a href="<package-oldosx-stable-sig>">sig</a>)
+</td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-osx.html">OS X instructions</a></td>
+</tr>
 
-<li><b>Red Hat Linux</b> package:
-<a href="<package-rpm-stable>"><version-rpm-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>),
-<a href="<package-srpm-stable>"><version-rpm-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>),
-<a href="<package-rpm-alpha>"><version-rpm-alpha> RPM</a> (<a href="<package-rpm-alpha-sig>">sig</a>),
+<tr>
+<td>Debian</td>
+<td><kbd>apt-get install tor</kbd></td>
+<td>
+<ul>
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
+<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorOnDebian">Backports to Woody and Sarge, Packages for Ubuntu, and packages of experimental Tor versions</a></li>
+</ul>
+</td>
+</tr>
+
+<tr>
+<td>Gentoo</td>
+<td><kbd>emerge tor</kbd></td>
+<td>
+<ul>
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
+<li><a href="http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy">Gentoo-wiki guide</a></li>
+</ul>
+</td>
+</tr>
+
+<tr>
+<td>Red Hat Linux</td>
+<td>
+<a href="<package-rpm-stable>"><version-rpm-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>)
+<br>
+<a href="<package-srpm-stable>"><version-rpm-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>)
+<br>
+<a href="<package-rpm-alpha>"><version-rpm-alpha> RPM</a> (<a href="<package-rpm-alpha-sig>">sig</a>)
+<br>
 <a href="<package-srpm-alpha>"><version-rpm-alpha> SRPM</a> (<a href="<package-srpm-alpha-sig>">sig</a>)
-</li>
+</td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
+</tr>
 
-<li><b>Gentoo</b>: <kbd>emerge tor</kbd> (<a href="http://gentoo-wiki.com/HOWTO_Anonymity_with_Tor_and_Privoxy">guide</a>)</li>
-<li><b>FreeBSD</b>: <kbd>portinstall -s security/tor</kbd></li>
-<li><b>OpenBSD</b>: <kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd> (<a href="http://wiki.noreply.org/noreply/TheOnionRouter/OpenbsdChrootedTor">guide to chrooting</a>)</li>
-<li><b>NetBSD</b>: <kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></li>
-<li>Latest source tarballs: <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
-<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>) </li>
+<tr>
+<td>FreeBSD</td>
+<td><kbd>portinstall -s security/tor</kbd></td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
+</tr>
+
+<tr>
+<td>OpenBSD</td>
+<td><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>
+<td>
+<ul>
+<li><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></li>
+<li><a href="http://wiki.noreply.org/noreply/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a></li>
 </ul>
+</td>
+</tr>
 
-<p>Instructions for setting up Tor on Linux/BSD/Unix are <a
-href="<cvssandbox>tor/doc/tor-doc-unix.html">here</a>. This <a
-href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#DistSignatures">FAQ
-entry</a> explains how to verify package signatures.
-</p>
+<tr>
+<td>NetBSD</td>
+<td><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>
+<td><a href="<cvssandbox>tor/doc/tor-doc-unix.html">Linux/BSD/Unix instructions</a></td>
+</tr>
 
-<p>See the <a href="<page developers>">developers page</a> for instructions
-on fetching Tor from CVS.
-</p>
+<tr>
+<td>Source tarballs</td>
+<td>
+<a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
+<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
+</td>
+<td>n/a</td>
+</tr>
+
+</table>
+
+<hr />
+
+<h2>More Information</h2>
+
+<ul>
+<li>See the <a href="<page documentation>">">docs page</a> for instructions on setting up Tor for your platform.</li>
+<li>See this <a href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#DistSignatures">FAQ entry</a> for instructions on verifying package signatures, which allows you to make sure you've downloaded the file you wanted.</li>
+<li>See the <a href="<page developers>">developers page</a> for instructions on fetching Tor from CVS to get the latest development version. Note that this version may not work or even compile!
+</ul>
 
 <p>For a list of sites mirroring Tor see <a href="<page mirrors>">this page</a>.
 </p>