[or-cvs] r22935: {website} this download is a complete mess, needs a complete rewrite. (website/branches/web20/download/en)
Andrew Lewman
andrew at torproject.org
Tue Aug 17 18:38:41 UTC 2010
Author: phobos
Date: 2010-08-17 18:38:40 +0000 (Tue, 17 Aug 2010)
New Revision: 22935
Modified:
website/branches/web20/download/en/download.wml
Log:
this download is a complete mess, needs a complete rewrite.
Modified: website/branches/web20/download/en/download.wml
===================================================================
--- website/branches/web20/download/en/download.wml 2010-08-16 20:02:59 UTC (rev 22934)
+++ website/branches/web20/download/en/download.wml 2010-08-17 18:38:40 UTC (rev 22935)
@@ -7,22 +7,26 @@
<div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div>
<div id="maincol-left">
<h1>Download Tor</h1>
+ <!-- BEGIN WARNING -->
<div class="warning">
<p>Tor does not magically encrypt all of your Internet activities. Understand what Tor does and does not do for you.
- <br /><a href="#">Read more »</a></p>
+ <br /><a href="<page download/warning>">Read more »</a></p>
</div>
<!-- END WARNING -->
<table class="topforty">
<tr>
- <td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle for Microsoft Windows</a></div></td>
+ <td class="nopad" colspan="4"><div class="title"><a name="wim">Tor Browser Bundle</a></div></td>
</tr>
<tr>
- <td class="intro" colspan="4">The Tor Browser Bundle contains Tor, Vidalia, Torbutton, Polipo, and Firefox. This package requires no installation.</td>
+ <td class="intro" colspan="4">The Tor Browser
+ Bundle contains Tor, Vidalia, Torbutton, Polipo, and
+ Firefox. This package requires no installation. Just
+ extract it and run.</td>
</tr>
<tr>
<td><span class="column-title">Language</span></td>
<td><span class="column-title">Version</span></td>
- <td><span class="column-title">Windows</span></td>
+ <td><span class="column-title">Platform</span></td>
<td><span class="column-title">Source Code</span></td>
</tr>
<tr class="beige">
@@ -31,6 +35,12 @@
<td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
<td><span class="windows"><a href="torbrowser/dist/tor-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
</tr>
+ <tr>
+ <td>English (en-US)</td>
+ <td><version-torbrowserbundlelinux></td>
+ <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
+ <td></td>
+ </tr>
</table>
<table class="topforty">
<tr>
@@ -39,35 +49,31 @@
<tr>
<td><span class="column-title">Language</span></td>
<td><span class="column-title">Version</span></td>
- <td><span class="column-title">Windows</span></td>
- <td><span class="column-title">Linux</span></td>
+ <td><span class="column-title">Platform</span></td>
<td><span class="column-title">Source Code</span></td>
</tr>
<tr class="beige">
<td>English (en-US)</td>
<td><version-torimbrowserbundle></td>
- <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torbrowserbundle>_en-US.exe">Download</a></span></td>
+ <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a></span></td>
+ <td><span class="windows"><a href="torbrowser/dist/tor-im-browser-<version-torimbrowserbundle>_en-US.tar.gz">Download Tarball</a></span></td>
<td></td>
- <td><a href="#">Download Tarball</a></td>
</tr>
<tr>
<td>English (en-US)</td>
<td><version-torbrowserbundlelinux></td>
+ <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
<td></td>
- <td><span class="linux"><a href="torbrowser/dist/linux/tor-im-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a></td></span></td>
- <td><a href="#">Download Tarball</a></td>
</tr>
</tr>
</table>
<table class="topforty">
<tr>
- <td class="nopad" colspan="5"><div class="title"><a name="tor">Tor Bundles</a></div></td>
+ <td class="nopad" colspan="5"><div class="title"><a name="tor">Vidalia Bundles</a></div></td>
</tr>
<tr>
<td><span class="column-title">Version</span></td>
- <td><span class="column-title">Windows</span></td>
- <td><span class="column-title">Mac</span></td>
- <td><span class="column-title">Linux</span></td>
+ <td><span class="column-title">Platform</span></td>
<td><span class="column-title">Source Code</span></td>
</tr>
<tr class="beige">
@@ -98,14 +104,14 @@
<tr class="beige">
<td>Android</td>
<td><span class="android"><a href="#">Download</a></span></td>
- <td>1.3.3</td>
- <td><a href="#">Android</a></td>
+ <td><package-androidbundle-alpha></td>
+ <td><a href="<page download/android>">Instructions</a></td>
</tr>
<tr>
- <td>iPhone</td>
- <td><span class="mac"><a href="#">Download</a></span></td>
- <td>1.3.3</td>
- <td><a href="#">iPhone</a></td>
+ <td>iPhone, iPod Touch, iPad</td>
+ <td><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
+ <td></td>
+ <td></td>
</tr>
</table>
<table class="topforty">
More information about the tor-commits
mailing list