[or-cvs] r12097: if the goal is really to give only the correct choice in the (website/trunk/en)

[arma at seul.org]

Author: arma
Date: 2007-10-22 05:32:24 -0400 (Mon, 22 Oct 2007)
New Revision: 12097

Modified:
   website/trunk/en/download.wml
Log:
if the goal is really to give only the correct choice in the
first download box, then get the expert packages out of there.


Modified: website/trunk/en/download.wml
===================================================================
--- website/trunk/en/download.wml	2007-10-22 08:59:52 UTC (rev 12096)
+++ website/trunk/en/download.wml	2007-10-22 09:32:24 UTC (rev 12097)
@@ -28,12 +28,8 @@
 <tr>
 <td>Windows<br><a href="<page docs/tor-doc-win32>">Install &amp; configure guide</a></td>
 <td>
-Tor &amp; Privoxy &amp; Vidalia &amp; Torbutton bundle (recommended):
+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>)
-<br>
-Expert install:
-<a href="<package-win32-stable>"><version-win32-stable></a>
-(<a href="<package-win32-stable-sig>">sig</a>)
 </td>
 </tr>
 
@@ -44,7 +40,7 @@
 </td>
 
 <td>
-Tor &amp; Privoxy &amp; Vidalia bundle (recommended):<br>
+Tor &amp; Privoxy &amp; Vidalia bundle:<br>
 &nbsp;&nbsp;&nbsp; 10.4 (Tiger) Universal Binary:
 <a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="<package-osx-bundle-stable-sig>">sig</a>)
 
@@ -52,17 +48,6 @@
 &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>)
-
-<br>
-Packages for experts:
-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>)
-
-<br>
-&nbsp;&nbsp;&nbsp; 10.3 (Panther):
-<a href="<package-oldosx-stable>"><version-oldosx-stable></a> (<a
-href="<package-oldosx-stable-sig>">sig</a>)
 </td>
 </tr>
 
@@ -158,7 +143,7 @@
 
 <hr />
 
-<h2>Development releases and source code</h2>
+<h2>Development releases, packages for experts, and source code</h2>
 
 <p>
 These development snapshots are released so you can help us test new
@@ -183,6 +168,8 @@
 <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>
@@ -208,10 +195,13 @@
 Packages for experts:
 Tor &amp; Privoxy only:<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>),
 <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>