[or-cvs] r12091: cleanups and fixes; move the mailing list box higher but not (website/trunk/en)

arma at seul.org arma at seul.org
Mon Oct 22 07:11:03 UTC 2007


Author: arma
Date: 2007-10-22 03:11:02 -0400 (Mon, 22 Oct 2007)
New Revision: 12091

Modified:
   website/trunk/en/download.wml
Log:
cleanups and fixes; move the mailing list box higher but not too high


Modified: website/trunk/en/download.wml
===================================================================
--- website/trunk/en/download.wml	2007-10-22 06:44:45 UTC (rev 12090)
+++ website/trunk/en/download.wml	2007-10-22 07:11:02 UTC (rev 12091)
@@ -11,8 +11,8 @@
 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
 under the <a href="<svnsandbox>LICENSE">3-clause BSD license</a>.
 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>.
+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">
@@ -26,10 +26,10 @@
 <tr>
 <td>Windows<br><a href="<page docs/tor-doc-win32>">Install &amp; configure guide</a></td>
 <td>
-Tor &amp; Privoxy &amp; Vidalia bundle (recommended):
+Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle (recommended):
 <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>)
 <br>
-Expert install <a href="<page docs/tor-doc-unix>#privoxy">(use UNIX instructions)</a>:
+Expert install:
 <a href="<package-win32-stable>"><version-win32-stable></a>
 (<a href="<package-win32-stable-sig>">sig</a>)
 </td>
@@ -53,7 +53,7 @@
 
 <br>
 Packages for experts:
-Tor &amp; Privoxy only bundle (experts only):<br>
+Tor &amp; Privoxy only bundle:<br>
 &nbsp;&nbsp;&nbsp; 10.4 (Tiger) Universal Binary:
 <a href="<package-osx-stable>"><version-osx-stable></a> (<a href="<package-osx-stable-sig>">sig</a>)
 
@@ -77,8 +77,8 @@
 <br>
 
 <a id="Warning"></a>
-<b><a class="anchor" href="#Warning">Warning: Want Tor to really
-work?</a></b>
+<h2><a class="anchor" href="#Warning">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!
@@ -92,8 +92,6 @@
 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.
-<!-- , and follow <a href="comingsoon">other recommendations for other
-supported applications</a>. -->
 </li>
 
 <li>Browser plugins such as Java, Flash, ActiveX, RealPlayer,
@@ -107,11 +105,6 @@
 more information about the websites you type in (like Google toolbar),
 as they may bypass Tor and/or broadcast sensitive information. Some
 people prefer using two browsers (one for Tor, one for unsafe browsing).
-<!-- You may even want to use a text browser, such as <a
-href="http://lynx.browser.org/">lynx</a> when you are using Tor. -->
-<!-- You may also find
-<a href="https://addons.mozilla.org/firefox/722/">NoScript</a> and <a
-href="https://addons.mozilla.org/firefox/1865/">AdBlock</a> helpful. -->
 </li>
 
 <li>Beware of cookies: if you ever browse without Tor and Privoxy
@@ -145,14 +138,30 @@
 all the issues</a>.
 </p>
 
-<h2>Developers: test releases &amp; source code</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 need to confirm via email). You can also
+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch
+the RSS feed</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">
+</form>
+
+<h2>Development releases and source code</h2>
+
 <p>
-These releases are alpha, and are released for testing and development purposes.
-Even though these have a higher version number than the stable versions
-listed above, there is a much higher chance of serious bugs in these downloads.
-Unless you have a specific reason to use these alpha builds, please use
-the stable versions above for better reliability and security.
+These development snapshots are released so you can help us test new
+features and bugfixes. Even though these 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 report bugs.
 </p>
 
 <table width="100%" border="1" cellspacing="0" cellpadding="2">
@@ -166,10 +175,10 @@
 <tr>
 <td>Windows<br><a href="<page docs/tor-doc-win32>">Install &amp; configure guide</a></td>
 <td>
-Tor &amp; Privoxy &amp; Vidalia bundle (recommended):
+Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton 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="<page docs/tor-doc-unix>#privoxy">(use UNIX instructions)</a>:
+Expert install:
 <a href="<package-win32-alpha>"><version-win32-alpha></a>
 (<a href="<package-win32-alpha-sig>">sig</a>)
 </td>
@@ -193,7 +202,7 @@
 
 <br>
 Packages for experts:
-Tor &amp; Privoxy only (experts only):<br>
+Tor &amp; Privoxy only:<br>
 &nbsp;&nbsp;&nbsp; 10.4 (Tiger) Universal Binary:
 <a href="<package-osx-alpha>"><version-osx-alpha></a> (<a href="<package-osx-alpha-sig>">sig</a>)
 
@@ -227,50 +236,25 @@
 <br>
 
 <p>
-See the <a href="<page documentation>#Developers">developer
-documentation</a> for instructions on fetching Tor from SVN to get
-the latest development version. Note that this version may not work or
-even compile!
+See our <a
+href="http://wiki.noreply.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>
 
-<h2>More Information</h2>
-
 <p>
-To keep informed of security advisories and new stable releases (you will
-need to confirm via email), subscribe to the
-<a href="http://archives.seul.org/or/announce/">or-announce mailing list</a>
+See the <a href="<page documentation>#Developers">developer
+documentation</a> for instructions on fetching Tor from SVN to get
+the very latest development version.
+You can also download the <a href="dist/">Privoxy source</a> or <a
+href="dist/vidalia-bundles/?C=M;O=D">Vidalia source</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">
-</form>
-
-<p>There is also an <a
-href="http://rss.gmane.org/gmane.network.onion-routing.announce">RSS
-feed</a> of the or-announce list at <a
-href="http://gmane.org">gmane.org</a>.</p>
-
 <p>
-If you have trouble downloading Tor from this site,
-here is a <a href="<page mirrors>">list of
-sites mirroring the Tor site</a>. Here is a <a
-href="http://opensource.depthstrike.com/?category=tor">page with torrents
-for each download above</a>. You can also download the
-<a href="dist/">Privoxy source</a>
-or <a href="dist/vidalia-bundles/?C=M;O=D">Vidalia source</a>.
+If you have trouble downloading Tor from this site, here is a <a
+href="<page mirrors>">list of sites mirroring the Tor site</a>.
 </p>
 
-<p>
-See our <a
-href="http://wiki.noreply.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>
-
 <a id="ChangeLog"></a>
 <p>
 For a list of all changes made in various Tor releases, see the
@@ -324,7 +308,7 @@
 
 
 <a id="Testing"></a>
-<h2><a class="anchor" href="#Testing">Recent changes to developer (testing/alpha) releases</a></h2>
+<h2><a class="anchor" href="#Testing">Recent changes to development releases</a></h2>
 
 <p>2007-10-12:
 Tor 0.2.0.8-alpha



More information about the tor-commits mailing list