[or-cvs] r23745: {website} in response to ticket 2143, completely rework the download p (website/trunk/download/en)

Andrew Lewman andrew at torproject.org
Thu Nov 4 19:44:34 UTC 2010


Author: phobos
Date: 2010-11-04 19:44:33 +0000 (Thu, 04 Nov 2010)
New Revision: 23745

Modified:
   website/trunk/download/en/download.wml
Log:
in response to ticket 2143, completely rework the download page to be
less confusing, add more descriptions per operating system, and try to
more clearly lay out which package contains what software.


Modified: website/trunk/download/en/download.wml
===================================================================
--- website/trunk/download/en/download.wml	2010-11-04 17:18:58 UTC (rev 23744)
+++ website/trunk/download/en/download.wml	2010-11-04 19:44:33 UTC (rev 23745)
@@ -3,225 +3,184 @@
 # Translation-Priority: 3-low
 #include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes"
 
-    <div id="content" class="clearfix">
-			<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
-    	<div id="maincol-left">
-      	<h1>Download Tor</h1>
-        <!-- BEGIN TEASER WARNING -->
-      	<div class="warning">
-          <h2>Want Tor to really work?</h2>
+<div id="content" class="clearfix">
+<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
+<div id="maincol-left">
+<h1>Download Tor</h1>
+<!-- BEGIN TEASER WARNING -->
+<div class="warning">
+<h2>Want Tor to really work?</h2>
 <p>...then please don't just install it and go on.  You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>.
 </p>
-        </div>
-        <!-- END TEASER WARNING -->
-        <table class="topforty">
-        	<tr>
-          	<td class="nopad" colspan="4"><div class="title"><a name="torbrowser">Tor Browser Bundle</a></div></td>
-          </tr>
-          <tr>
-		      <td class="intro" colspan="4">The Tor Browser Bundle
-contains everything you need to safely browse the Internet. This package
-requires no installation. Just extract it and run. <a href="<page
-projects/torbrowser>">Learn more &raquo;</a></td>
-          </tr>
-          <tr>
-          	<td><span class="column-title">Language</span></td>
-            <td><span class="column-title">Version</span></td>
-            <td><span class="column-title">Platform</span></td>
-            <td><span class="column-title">Tor Browser Source Code</span></td>
-          </tr>
-          <tr class="beige">
-          	<td>English (en-US)</td>
-            <td><version-torbrowserbundle></td>
-            <td><span class="windows">
-              <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a>&nbsp;
-              (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
-              </span>
-            </td>
-            <td><span class="windows">
-              <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>&nbsp;
-              (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">sig</a>)
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>English (en-US)</td>
-            <td><version-torbrowserbundlelinux></td>
-            <td><span class="linux">
-              <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a>&nbsp;
-              (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>)
-              </span>
-            </td>
-            <td></td>
-          </tr>
-          <tr class="beige">
-            <td>English (en-US)</td>
-            <td><version-torbrowserbundleosx></td>
-            <td><span class="mac">
-              <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a>
-              (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
-              </span>
-            </td>
-            <td></td>
-          </tr>
-        </table>
-        <table class="topforty">
-	        <tr>
-          	<td class="nopad" colspan="5"><div class="title"><a name="torimbrowser">Tor Instant Messager Browser Bundles</a></div></td>
-          </tr>
-          <tr>
-		      <td class="intro" colspan="4">The Tor Browser Bundle
-contains everything you need to safely browse the Internet. This package
-requires no installation. Just extract it and run. <a href="<page
-projects/torbrowser>">Learn more &raquo;</a></td>
-          </tr>
-              <tr>
-                <td><span class="column-title">Language</span></td>
-                <td><span class="column-title">Version</span></td>
-                <td><span class="column-title">Platform</span></td>
-                <td><span class="column-title">Tor IM Browser Source Code</span></td>
-              </tr>
-              <tr class="beige">
-                <td>English (en-US)</td>
-                <td><version-torimbrowserbundle></td>
-                <td><span class="windows">
-                  <a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a>&nbsp;
-                  (<a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">sig</a>)
-                  </span>
-                </td>
-                <td><span class="windows">
-                  <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>
-                  (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">sig</a>)
-                  </span>
-                </td>
-                <td></td>
-              </tr>
-  		</table>
-        <table class="topforty">
-	        <tr>
-          	<td class="nopad" colspan="5"><div class="title"><a name="tor">Vidalia Bundles</a></div></td>
-          </tr>
-          <tr>
-		      <td class="intro" colspan="4">The Vidalia Bundle contains Tor, Vidalia, and Polipo for installation on your system.  You'll need to configure your applications to use it.</td>
-          </tr>
-          <tr>
-            <td><span class="column-title">Operating System</span></td>
-            <td><span class="column-title">Notes</span></td>
-            <td><span class="column-title">Stable</span></td>
-            <td><span class="column-title">Alpha</span></td>
-            <td><span class="column-title">Installation Guide</span></td>
-          </tr>
-	  <tr class="beige">
-	    <td><span class="windows">Windows</span></td>
-        <td>Windows 7, Vista, XP, 2003 Server</td>
-        <td><a href="<package-win32-bundle-stable>"><version-win32-stable></a>/(<a href="<package-win32-bundle-stable>.asc">sig</a>)</td>
-        <td><a href="<package-win32-bundle-alpha>"><version-win32-alpha></a>/(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</td>
-        <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
-      </tr>
-      <tr>
-        <td><span class="mac">Mac (x86)</span></td>
-        <td>Intel only</td>
-        <td><a href="<package-osx-x86-bundle-stable>"><version-osx-x86-stable></a>/(<a href="<package-osx-x86-bundle-stable>.asc">sig</a>)</td>
-        <td><a href="<package-osx-x86-bundle-alpha>"><version-osx-x86-alpha></a>/(<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)</td>
-        <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
-      </tr>
-      <tr class="beige">
-        <td><span class="mac">Mac (PPC)</span></td>
-        <td>PowerPC only</td>
-        <td><a href="<package-osx-ppc-bundle-stable>"><version-osx-ppc-stable></a>/(<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>)</td>
-        <td><a href="<package-osx-ppc-bundle-alpha>"><version-osx-ppc-alpha></a>/(<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>)</td>
-        <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
-      </tr>
-      <tr>
-        <td><span class="linux">Linux/Unix</span></td>
-        <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
-        <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
-        <td><a href="<page download/download-unix>">Linux/Unix</a></td>
-      </tr>
-      </table>
-        <table class="topforty">
-	        <tr>
-          	<td class="nopad" colspan="4"><div class="title"><a name="smartphones">Tor for Smartphones</a></div></td>
-          </tr>
-          <tr>
-              <td><span class="column-title">Device</span></td>
-              <td><span class="column-title">Version</span></td>
-              <td><span class="column-title">Download</span></td>
-              <td><span class="column-title">Installation Guide</span></td>
-            </tr>
-            <tr class="beige">
-              <td colspan="2">Android-based phones, tablets, computers</td>
-              <td><a href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk"><version-androidbundle-tor></a></td>
-              <td><a href="<page docs/android>">Instructions</a></td>
-          	</tr>
-            <tr>
-              <td colspan="2">iPhone, iPod Touch, iPad</td>
-              <td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
-          	</tr>
-          	<tr class="beige">
-              <td>Nokia Maemo/N900</td>
-              <td></td>
-              <td><span class="nokia"><a href="<page docs/N900>">Experimental instructions</a></span></td>
-              <td></td>
-          	</tr>
-        </table>
-        <table class="topforty">
-	        <tr>
-          	<td class="nopad" colspan="4"><div class="title"><a name="expert">Expert Packages</a></div></td>
-          </tr>
-          <tr>
-		      <td class="intro" colspan="4">The Expert Packages
-		      contain just Tor and nothing else.  You'll need
-		      to configure Tor and all of your applications
-		      manually.</td>
-          </tr>
-          		<tr>
-                <td><span class="column-title">Operating System</span></td>
-                <td><span class="column-title">Notes</span></td>
-                <td><span class="column-title">Stable</span></td>
-                <td><span class="column-title">Alpha</span></td>
-                <td><span class="column-title">Installation Guide</span></td>
-              </tr>
-              <tr class="beige">
-                <td><span class="windows">Windows</span></td>
-                <td>Windows 7, Vista, XP, 2000, 2003 Server</td>
-                <td><a href="../dist/win32/tor-<version-win32-stable>-win32.exe"><version-win32-stable></a> (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</td>
-                <td><a href="../dist/win32/tor-<version-win32-alpha>-win32.exe"><version-win32-alpha></a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>)</td>
-                <td><a href="<page docs/tor-doc-windows>">Windows</a></td>
-              </tr>
-              <tr>
-                <td><span class="mac">Mac (x86)</span></td>
-                <td>Intel only</td>
-                <td><a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg"><version-osx-x86-stable></a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg.asc">sig</a>)</td>
-                <td><a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg"><version-osx-x86-alpha></a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg.asc">sig</a>)</td>
-                <td><a href="<page docs/tor-doc-osx>">Mac (Intel)</a></td>
-              </tr>
-              <tr class="beige">
-                <td><span class="mac">Mac (PPC)</span></td>
-                <td>PowerPC only</td>
-                <td><a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg"><version-osx-ppc-stable></a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg.asc">sig</a>)</td>
-                <td><a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg"><version-osx-ppc-alpha></a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg.asc">sig</a>)</td>
-                <td><a href="<page docs/tor-doc-osx>">Mac (Power PC)</a></td>
-              </tr>
-              <tr>
-                <td><span class="linux">Linux/Unix</span></td>
-                <td>Redhat/CentOS, Fedora, Debian, Ubuntu, SUSE</td>
-                <td colspan="2">Read how to use <a href="<page download/download-unix>">our repositories</a>.</td>
-                <td><a href="<page download/download-unix>">Linux/Unix</a></td>
-              </tr>
-              <tr class="beige">
-                <td>Source Tarballs</td>
-                <td>./configure && make && src/or/tor</td>
-                <td><a href="../dist/tor-<version-stable>.tar.gz"><version-stable></a> (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>)</td>
-                <td><a href="../dist/tor-<version-alpha>.tar.gz"><version-alpha></a> (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>)</td>
-                <td></td>
-              </tr>
-        </table>
+</div>
+<!-- END TEASER WARNING -->
+<!-- START WINDOWS -->
+<table class="topforty">
+<tr>
+<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td>
+</tr>
+<tr>
+<td>The Tor Software comes bundled in three different ways:  
+<ul>
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
+<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system.  You need to configure your applications to use Tor.</li>
+<li>The <strong>Expert Package</strong> contains just Tor and nothing else.  You'll need to configure Tor and all of your applications manually.</li>
+</ul>
+<p>There are two versions of each package, a stable and alpha release.  Stable packages are released when we believe the features and code will not change for many months.  Alpha or 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.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p>
+<p>The current stable version of Tor for Windows is <version-win32-stable>.  The current alpha/unstable version of tor for Windows is <version-win32-alpha>.</p>
+</td>
+</tr>
+<tr class="beige">
+<td><span class="windows">
+Tor Browser Bundle version <version-torbrowserbundle>, <a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Download</a>&nbsp;(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
+</span>
+</td>
+</tr>
+<tr>
+<td><span class="windows">
+Tor Browser Instant Messaging Bundle version <version-torimbrowserbundle>, <a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe">Download</a>&nbsp;(<a href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-US.exe.asc">sig</a>)
+</span>
+ </td>
+ <tr class="beige">
+ <td><span class="windows">
+Tor Browser Bundle version <version-torbrowserbundle> source code,<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz">Download Tarball</a>&nbsp;(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>-src.tar.gz.asc">sig</a>)
+</span>
+</td>
+</tr>
+ <tr><td><span class="windows">
+ Stable Vidalia Bundle for Windows works with Windows 7, Vista, XP, 2003 Server, <a href="<package-win32-bundle-stable>">Download Stable</a>/(<a href="<package-win32-bundle-stable>.asc">sig</a>)
+ </span></td>
+ </tr>
+ <tr class="beige"><td><span class="windows">Unstable Vidalia Bundles for Windows works with Windows 7, Vista, XP, 2003 Server, <a href="<package-win32-bundle-alpha>">Download Unstable</a>/(<a href="<package-win32-bundle-alpha>.asc">sig</a>)</span></td>
+ </tr>
+ <tr>
+ <td><span class="windows">Stable Expert Bundle for Windows works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a href="../dist/win32/tor-<version-win32-stable>-win32.exe">Download Stable</a> (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>)</td>
+ <tr class="beige">
+ <td><span class="windows">Unstable Expert Bundle for Windows works with Windows 98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server,
+<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>)
+ </span></td>
+ </tr>
+ <tr>
+<td>
+<a href="<page docs/tor-doc-windows>">Documentation for Microsoft Windows clients</a>
+</td>
+</tr>
+</table>
+<!-- END WINDOWS -->
+<!-- START OS X -->
+<table class="topforty">
+<tr>
+<td class="nopad"><div class="title"><a name="mac">Apple OS X</a></div></td>
+</tr>
+<tr>
+<td class="intro">The Tor Software comes bundled in three different ways:  
+<ul>
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
+<li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, and Polipo for installation on your system.  You need to configure your applications to use Tor.</li>
+<li>The <strong>Expert Package</strong> contains just Tor and nothing else.  You'll need to configure Tor and all of your applications manually.</li>
+</ul>
+<p>There are two versions of each package, a stable and alpha release.  Stable packages are released when we believe the features and code will not change for many months.  Alpha or 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.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.</p>
+<p>The current stable version of Tor for OS X is <version-osx-x86-stable>.  The current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>.</p>
+</td>
+</tr>
+<tr class="beige">
+<td><span class="mac">Tor Browser Bundle for OS X Intel (beta version), 
+<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Download</a>
+(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>)
+</span>
+</td>
+</tr>
+<tr>
+<td><span class="mac">Stable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-stable>">Download Stable</a>/(<a href="<package-osx-x86-bundle-stable>.asc">sig</a>)</span></td></tr>
+<tr class="beige">
+<td><span class="mac">Unstable Vidalia Bundle for OS X Intel, <a href="<package-osx-x86-bundle-alpha>">Download Unstable</a>/(<a href="<package-osx-x86-bundle-alpha>.asc">sig</a>)</span></td>
+</tr>
+<tr>
+<td><span class="mac">Stable Vidalia for OS X PowerPC, <a href="<package-osx-ppc-bundle-stable>">Download Stable</a>/(<a href="<package-osx-ppc-bundle-stable>.asc">sig</a>)</td></tr>
+ <tr class="beige">
+<td><span class="mac">Unstable Vidalia for OS X PowerPC, <a href="<package-osx-ppc-bundle-alpha>">Download Unstable</a>/(<a href="<package-osx-ppc-bundle-alpha>.asc">sig</a>)</span></td>
+</tr>
+ <tr>
+<td><span class="mac">Stable Expert Package for OS X Intel, <a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg">Download Stable</a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-stable>-i386-Bundle.dmg.asc">sig</a>)</span></td>
+</tr>
+<tr class="beige">
+<td><span class="mac">Unstable Expert Package for OS X Intel, <a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg">Download Unstable</a> (<a href="../dist/osx-x86/Tor-<version-osx-x86-alpha>-i386-Bundle.dmg.asc">sig</a>)</span></td>
+</tr>
+<tr class="beige">
+<td><span class="mac">Stable Expert Package for OS X PowerPC, <a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg">Download Stable</a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg.asc">sig</a>)</span></td>
+</tr>
+<tr>
+<td><span class="mac">Unstable Expert Package for OS X PowerPC, <a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg">Download Unstable</a> (<a href="../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg.asc">sig</a>)</span></td>
+</tr>
+<tr class="beige">
+<td><a href="<page docs/tor-doc-osx>">Documentation for Apple OS X clients</a>.</td>
+</tr>
+</table>
+ <!-- END OS X -->
+ <!-- START UNIX -->
+ <table class="topforty">
+<tr>
+<td class="nopad"><div class="title"><a name="linux">Linux/Unix</a></div></td></tr>
+<tr>
+<td class="intro">The Tor Software comes bundled in two different ways:  
+<ul>
+<li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></li>
+<li>Read how to use <a href="<page download/download-unix>">our repositories for the Tor software.</a>.</li>
+</ul>
+</td>
+</tr>
+<tr class="beige">
+<td><span class="linux">Tor Browser Bundle for GNU/Linux on i686, 
+<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">Download</a>&nbsp;
+(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc">sig</a>)
+</span>
+</td>
+</tr>
+<tr>
+<td><span class="linux">Use <a href="<page download/download-unix>">our repositories</a> for all other Tor-related software.</span></td>
+</tr>
+</table>
+<table class="topforty">
+<tr>
+<td class="nopad"><div class="title"><a name="smartphones">Tor for Smartphones</a></div></td>
+</tr>
+<tr class="beige">
+<td colspan="2">Android-based phones, tablets, computers</td>
+<td><a href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk">Android Bundle</a></td>
+<td><a href="<page docs/android>">Android Instructions</a></td>
+</tr>
+<tr>
+<td colspan="2">iPhone, iPod Touch, iPad</td>
+<td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></span></td>
+</tr>
+<tr class="beige">
+<td>Nokia Maemo/N900</td>
+<td></td>
+<td><span class="nokia"><a href="<page docs/N900>">Experimental instructions</a></span></td>
+<td></td>
+</tr>
+</table>
+<!-- END UNIX -->
+<!-- BEGIN SOURCE -->
+<table class="topforty">
+<tr>
+<td class="nopad"><div class="title"><a name="source">Source Code</a></div></td>
+</tr>
+<tr class="beige">
+<td>Source Tarballs</td>
+<td>./configure && make && src/or/tor</td>
+<td><a href="../dist/tor-<version-stable>.tar.gz">Download Stable</a> (<a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a>)</td>
+<td><a href="../dist/tor-<version-alpha>.tar.gz">Download Unstable</a> (<a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a>)</td>
+</tr>
+</table>
+<!-- END SOURCE -->
 
+<br>
+
 <!-- BEGIN WARNING -->
-      	<div class="warning">
-	<a name="warning"></a>
-          <h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
+<div class="warning">
+<a name="warning"></a>
+<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2>
 <p>...then please don't just install it and go on.  You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. There are several major pitfalls to watch out for:
 </p>
 
@@ -294,47 +253,46 @@
 help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting
 all the issues</a>.
 </p>
-        </div>
-        <!-- END WARNING -->
-      </div>
-      <!-- END MAINCOL -->
-      <div id="sidecol-right">
-        <div class="img-shadow">
-        	<div class="sidenav-sub">
-          	<h2>Jump to:</h2>
-          	<ul>
-            	<li class="dropdown"><a href="#torbrowser">Tor Browser Bundles</a></li>
-            	<li class="dropdown"><a href="#torimbrowser">Tor Browser with Instant Messenger Client</a></li>
-            	<li class="dropdown"><a href="#tor">Vidalia Bundles</a></li>
-            	<li class="dropdown"><a href="#smartphones">Tor for Smartphones</a></li>
-            	<li class="dropdown"><a href="#expert">Expert Packages
-&amp; Tor Source Code</a></li>
-            </ul>
-          </div>
-      	</div>
-        <!-- END SIDENAV -->
-        <div class="img-shadow">
-          <div class="infoblock">
-          	<h2>What is the (sig) link?</h2>
-            <p>These are GPG signatures to allow you to verify that
-            your downloaded file is really from The Tor Project and not
-            an imposter.</p>
-            <a href="<page docs/verifying-signatures>">Learn more &raquo;</a>
-          </div>
-        </div>
-        <!-- END INFOBLOCK -->
-        <div class="img-shadow">
-        	<div class="sidenav-sub">
-          	<h2>Having Trouble?</h2>
-            <ul>
-              <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
-            </ul>
-          </div>
-      	</div>
-        <!-- END SIDENAV -->
-      </div>
-      <!-- END SIDECOL -->
-    </div>
-    <!-- END CONTENT -->
+</div>
+<!-- END WARNING -->
+</div>
+<!-- END MAINCOL -->
+<div id="sidecol-right">
+<div class="img-shadow">
+<div class="sidenav-sub">
+<h2>Jump to:</h2>
+<ul>
+<li class="dropdown"><a href="#Windows">Microsoft Windows</a></li>
+<li class="dropdown"><a href="#mac">Apple OS X</a></li>
+<li class="dropdown"><a href="#linux">Linux/Unix</a></li>
+<li class="dropdown"><a href="#smartphones">Smartphones</a></li>
+<li class="dropdown"><a href="#source">Source Code</a></li>
+</ul>
+</div>
+</div>
+<!-- END SIDENAV -->
+<div class="img-shadow">
+<div class="infoblock">
+<h2>What is the (sig) link?</h2>
+<p>These are GPG signatures to allow you to verify that
+your downloaded file is really from The Tor Project and not
+an imposter.</p>
+<a href="<page docs/verifying-signatures>">Learn more &raquo;</a>
+</div>
+</div>
+<!-- END INFOBLOCK -->
+<div class="img-shadow">
+<div class="sidenav-sub">
+<h2>Having Trouble?</h2>
+<ul>
+<li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
+</ul>
+</div>
+</div>
+<!-- END SIDENAV -->
+</div>
+<!-- END SIDECOL -->
+</div>
+<!-- END CONTENT -->
 
 #include <foot.wmi>



More information about the tor-commits mailing list