[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r13889: Rewrite of the download page to put relevant info before the (website/trunk/en)



Author: phobos
Date: 2008-03-07 23:36:22 -0500 (Fri, 07 Mar 2008)
New Revision: 13889

Modified:
   website/trunk/en/download.wml
Log:
Rewrite of the download page to put relevant info before the fold, tease
the user about wanting tor to really work before the fold, clean up the
download tables and make it easier to find packages.


Modified: website/trunk/en/download.wml
===================================================================
--- website/trunk/en/download.wml	2008-03-08 01:11:54 UTC (rev 13888)
+++ website/trunk/en/download.wml	2008-03-08 04:36:22 UTC (rev 13889)
@@ -2,15 +2,93 @@
 # Revision: $Revision$
 # Translation-Priority: 1-high
 
-#include "head.wmi" TITLE="Tor: Download"
+#include "head.wmi" TITLE="Tor: Download" charset="UTF-8"
 
 <div class="main-column">
 
-<h2>Download current Tor version</h2>
+<h2>Available Tor Bundles</h2>
 
 <hr />
 
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<thead>
+<tr bgcolor="#e5e5e5">
+<th>Platform</th>
+<th>Download Stable</th>
+<th>Download Unstable</th>
+<th>Help</th>
+</tr>
+</thead>
+
+<tr>
+  <td>
+    Windows<br />
+    All Vista Versions, XP, 2000, 2003 Server, Millenium
+  </td>
+  <td>
+    <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a href="<package-win32-bundle-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a>
+  <td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    Mac OS X<br />
+    Universal Binary (OSX 10.4 &amp; 10.5)
+  </td>
+  <td>
+    <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="<package-osx-bundle-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
+  </td>
+</tr>
+
+<tr>
+  <td>
+    Mac OS X<br />
+    10.3 (Panther)
+  </td>
+  <td>
+    <a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a href="<package-oldosx-bundle-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
+  </td>
+</tr>
+
+<tr bgcolor="#e5e5e5">
+  <td>
+    Linux/Unix packages<br />
+    Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE
+  </td>
+  <td colspan="2">
+    <a href="<page download-unix>">Linux/Unix download page</a>
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-unix>">Install &amp; configure guide</a>
+  </td>
+</tr>
+</table>
+
+<br />
+
 <p>
+What's the <a href="#packagediff">difference between Stable &amp; Unstable</a>?
+</p>
+
+<p>
 Tor is distributed as <a href="http://www.fsf.org/";>Free Software</a>
 under the <a href="<svnsandbox>LICENSE">3-clause BSD license</a>. The
 bundles also include <a href="http://vidalia-project.net/";>Vidalia</a>
@@ -19,56 +97,35 @@
 </p>
 
 <p>
-There is no fee for installing Tor or using the Tor network, but
+There is no fee for installing Tor, or using the Tor network, but
 if you want Tor to become faster and more usable please consider
 <a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.
 </p>
 
-<table width="100%" border="1" cellspacing="0" cellpadding="2">
-<thead>
-<tr>
-<th>Platform</th>
-<th>Package</th>
-</tr>
-</thead>
+<p>Be smart and learn more. Understand what Tor does and does not offer.
+This list of pitfalls isn't complete, and we need your
+help <a href="<page volunteer>#Documentation">identifying and documenting
+all the issues</a>.
+</p>
 
-<tr>
-<td>Windows<br /><a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a></td>
-<td>
-Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle:
-<a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>)
-</td>
-</tr>
+<p>
+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 be asked to confirm via email). You can also
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce";>watch
+the list's RSS feed</a>.
+</p>
 
-<tr>
-<td>
-Mac OS X<br />
-<a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
-</td>
+<form action="http://freehaven.net/cgi-bin/majordomo.cgi";>
+<input type="hidden" name="mlist" value="or-announce">
+<input type="hidden" name="subscribe" value="1">
+<input type="hidden" name="host" value="freehaven.net">
+<input name="email" size="15">
+<input type="submit" value="subscribe to or-announce">
+</form>
 
-<td>
-Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle:<br />
-&nbsp;&nbsp;&nbsp; Universal Binary (OSX 10.4 &amp; 10.5):
-<a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="<package-osx-bundle-stable-sig>">sig</a>)
-
 <br />
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
-<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a
-href="<package-oldosx-bundle-stable-sig>">sig</a>)
-</td>
-</tr>
 
-<tr>
-<td>
-Linux/Unix packages
-</td>
-<td><a href="<page download-unix>">Linux/Unix download page</a></td>
-</tr>
-
-</table>
-
-<br />
-
 <a id="Warning"></a>
 <h2><a class="anchor" href="#Warning">Warning: Want Tor to really
 work?</a></h2>
@@ -80,14 +137,16 @@
 </p>
 
 <ol>
-<li>Tor only protects Internet applications that are configured to
+<li>
+Tor only protects Internet applications that are configured to
 send their traffic through Tor &mdash; it doesn't magically anonymize
 all your traffic just because you install it.  We recommend you
 use <a href="http://www.mozilla.org/firefox";>Firefox</a> with the <a
 href="https://addons.mozilla.org/firefox/2275/";>Torbutton</a> extension.
 </li>
 
-<li>Browser plugins such as Java, Flash, ActiveX, RealPlayer,
+<li>
+Browser plugins such as Java, Flash, ActiveX, RealPlayer,
 Quicktime, Adobe's PDF plugin, and others can be manipulated
 into revealing your IP address. You should probably
 <a href="http://plugindoc.mozdev.org/faqs/uninstall.html";>uninstall your
@@ -102,14 +161,16 @@
 people prefer using two browsers (one for Tor, one for unsafe browsing).
 </li>
 
-<li>Beware of cookies: if you ever browse without Tor and Privoxy
+<li>
+Beware of cookies: if you ever browse without Tor and Privoxy
 and a site gives you a cookie, that cookie could identify you even when
 you start using Tor again. You should clear your cookies frequently. <a
 href="https://addons.mozilla.org/firefox/82/";>CookieCuller</a> can help
 protect any cookies you do not want to lose.
 </li>
 
-<li>Tor anonymizes the origin of your traffic,
+<li>
+Tor anonymizes the origin of your traffic,
 and it encrypts everything inside the Tor network, but <a
 href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers";>it
 can't encrypt your traffic between the Tor network and its final
@@ -119,7 +180,8 @@
 end-to-end encryption and authentication.
 </li>
 
-<li>While Tor blocks attackers
+<li>
+While Tor blocks attackers
 on your local network from discovering or influencing your destination,
 it opens new risks: malicious or misconfigured Tor exit nodes can send
 you the wrong page, or even send you embedded Java applets disguised as
@@ -127,123 +189,121 @@
 </li>
 </ol>
 
-<p>Be smart and learn more. Understand what Tor does and does not offer.
-This list of pitfalls isn't complete, and we need your
-help <a href="<page volunteer>#Documentation">identifying and documenting
-all the issues</a>.
-</p>
+<hr />
 
+<a id="packagediff"></a>
+<h2><a class="anchor" href="#packagediff"></a>What's the difference between Stable &amp; Unstable?</h2>
+
 <p>
-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 be asked to confirm via email). You can also
-<a href="http://rss.gmane.org/gmane.network.onion-routing.announce";>watch
-the list's RSS feed</a>.
+Stable packages are released when we believe the features and code will
+not change for many months. These typically include a stable version of Vidalia, Privoxy, and Torbutton.
 </p>
+<p>
+Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
+than the stable versions listed above, there is a much higher chance of
+serious reliability and security bugs in these downloads. Newer,
+untested versions of Vidalia, Privoxy, and Torbutton are included in
+these unstable package. Please be prepared to <a href="https://bugs.torproject.org/";>report bugs</a>.
+</p>
 
-<form action="http://freehaven.net/cgi-bin/majordomo.cgi";>
-<input type="hidden" name="mlist" value="or-announce">
-<input type="hidden" name="subscribe" value="1">
-<input type="hidden" name="host" value="freehaven.net">
-<input name="email" size="15">
-<input type="submit" value="subscribe to or-announce">
-</form>
-
-<hr />
-
 <a id="Dev"></a>
-<h2><a class="anchor" href="#Dev">Development releases, packages for
-experts, and source code</a></h2>
+<h2><a class="anchor" href="#Dev">Expert Packages &amp; Source Code </a></h2>
 
 <p>
-These development snapshots are released so you can help us test new
-features and bugfixes. Even though they have a higher version number
-than the stable versions listed above, there is a much higher chance
-of serious reliability and security bugs in these downloads. Please be
-prepared to <a href="https://bugs.torproject.org/";>report bugs</a>.
+Expert packages do not contain Vidalia.  Privoxy and Torbutton are installed pre-configured for you.  You must configure Tor itself through your own editor.
 </p>
 
-<table width="100%" border="1" cellspacing="0" cellpadding="2">
+<table width="100%" border="0" cellspacing="0" cellpadding="2">
 <thead>
-<tr>
+<tr bgcolor="e5e5e5">
 <th>Platform</th>
-<th>Package</th>
+<th>Stable</th>
+<th>Unstable</th>
+<th>Help</th>
 </tr>
 </thead>
 
 <tr>
-<td>Windows<br /><a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a></td>
-<td>
-Tor &amp; Privoxy &amp; Vidalia &amp; <a
-href="https://torbutton.torproject.org/dev/";>Torbutton-dev</a> bundle
-(recommended):
-<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a href="<package-win32-bundle-alpha-sig>">sig</a>)
-<br />
-Expert install:
-<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>)
-</td>
+  <td>
+    Windows<br />
+    All Vista Versions, XP, 2000, 2003 Server, Millenium
+  </td>
+  <td>
+    <a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-win32-alpha>"><version-win32-alpha></a> (<a href="<package-win32-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-windows>">Install &amp; configure guide</a>
+  </td>
 </tr>
 
+<tr bgcolor="#e5e5e5">
+  <td>
+    Mac OS X<br />
+    Universal Binary (OSX 10.4 &amp; 10.5)
+  </td>
+  <td>
+    <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
+  </td>
+</tr>
+
 <tr>
-<td>
-Mac OS X<br />
-<a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
-</td>
+  <td>
+    Mac OS X<br />
+    10.3 (Panther)
+  </td>
+  <td>
+    <a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<ahref="<package-oldosx-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-osx>">Install &amp; configure guide</a>
+  </td>
+</tr>
 
-<td>
-Tor &amp; Privoxy &amp; Vidalia &amp; <a
-href="https://torbutton.torproject.org/dev/";>Torbutton-dev</a> bundle
-(recommended):<br />
-&nbsp;&nbsp;&nbsp; Universal Binary (10.4 &amp; 10.5):
-<a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>)
-
-<br />
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
-<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a> (<a
-href="<package-oldosx-bundle-alpha-sig>">sig</a>)
-
-<br />
-Packages for experts:
-Tor &amp; Privoxy &amp; Torbutton only:<br />
-&nbsp;&nbsp;&nbsp; Universal Binary (OSX 10.4 &amp; 10.5):
-<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>)
-
-<br />
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
-<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a
-href="<package-oldosx-stable-sig>">sig</a>),
-<a href="<package-oldosx-alpha>"><version-oldosx-alpha></a> (<a
-href="<package-oldosx-alpha-sig>">sig</a>)
-</td>
+<tr bgcolor="#e5e5e5">
+  <td>
+    Linux/Unix packages<br />
+    Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE
+  </td>
+  <td colspan="2">
+    <a href="<page download-unix>">Linux/Unix download page</a>
+  </td>
+  <td>
+    <a href="<page docs/tor-doc-unix>">Install &amp; configure guide</a>
+  </td>
 </tr>
 
 <tr>
-<td>
-Linux/Unix packages
-</td>
-<td><a href="<page download-unix>">Linux/Unix download page</a></td>
-</tr>
+  <td>
+    Source tarballs<br />
+    <kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>
+  </td>
+  <td>
+    <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)
+  </td>
+  <td>
+    <a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
+  </td>
+  <td>
 
-<tr>
-<td>
-Source tarballs<br />
-<kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd>
-</td>
-<td>
-Stable: <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)<br />
-Alpha: <a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
-</td>
 </tr>
-
 </table>
 
+<br />
+
 <p>
-See our <a
-href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>FAQ
+See our <a href="https://wiki.torproject.org/noreply/TheOnionRouter/VerifyingSignatures";>FAQ
 entry on verifying package signatures</a>, which allows
 you to make sure you've downloaded the file we intended you to get.
 </p>