[or-cvs] r8284: clean up all the download pages; i am happy with them now. (website/trunk/en)

[arma@xxxxxxxx]

Author: arma
Date: 2006-08-29 04:03:30 -0400 (Tue, 29 Aug 2006)
New Revision: 8284

Modified:
   website/trunk/en/download-osx.wml
   website/trunk/en/download-unix.wml
   website/trunk/en/download-windows.wml
   website/trunk/en/download.wml
Log:
clean up all the download pages; i am happy with them now.


Modified: website/trunk/en/download-osx.wml
===================================================================
--- website/trunk/en/download-osx.wml	2006-08-29 07:10:09 UTC (rev 8283)
+++ website/trunk/en/download-osx.wml	2006-08-29 08:03:30 UTC (rev 8284)
@@ -34,47 +34,37 @@
 </thead>
 
 <tr>
-<td>Mac OS X: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
-<a href="<package-osx-bundle-stable>"><version-osx-bundle-stable> for Tiger (OSX 10.4)</a> (<a href="<package-osx-bundle-stable-sig>">sig</a>).
-<br />
-<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-bundle-stable-sig>">sig</a>).
+<td>OS X 10.4 (Tiger)</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="<package-osx-bundle-stable-sig>">sig</a>),
+<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>">OS X instructions</a>.
-</td>
+<td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
 <tr>
-<td>Dev packages: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
-<a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha> for Tiger (OSX 10.4)</a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>).
-<!--
-<br />
-<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha> for Panther OSX 10.3)</a> (<a href="<package-oldosx-bundle-alpha-sig>">sig</a>).
--->
+<td>OS X 10.3 (Panther)</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a href="<package-oldosx-bundle-stable-sig>">sig</a>),
+<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a> (<a href="<package-oldosx-bundle-alpha-sig>">sig</a>).
 </td>
-<td><a href="<page docs/tor-doc-osx>">OS X instructions</a>.
-</td>
+<td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
 <tr>
-<td>For experts only: just Tor &amp; Privoxy</td>
-<td>
-<a href="<package-osx-stable>"><version-osx-stable> for Tiger (OSX 10.4)</a> (<a href="<package-osx-stable-sig>">sig</a>).
-<br />
-<a href="<package-oldosx-stable>"><version-oldosx-stable> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-stable-sig>">sig</a>).
+<td>Experts only: Tiger</td>
+<td>Just Tor &amp; Privoxy:
+<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>).
 </td>
 <td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
 <tr>
-<td>For experts only: Dev packages, just Tor &amp; Privoxy</td>
-<td>
-<a href="<package-osx-alpha>"><version-osx-alpha> for Tiger (OSX 10.4)</a> (<a href="<package-osx-alpha-sig>">sig</a>).
-<!--
-<br />
-<a href="<package-oldosx-alpha>"><version-oldosx-alpha> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
--->
+<td>Experts only: Panther</td>
+<td>Just Tor &amp; Privoxy:
+<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>
 <td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>

Modified: website/trunk/en/download-unix.wml
===================================================================
--- website/trunk/en/download-unix.wml	2006-08-29 07:10:09 UTC (rev 8283)
+++ website/trunk/en/download-unix.wml	2006-08-29 08:03:30 UTC (rev 8284)
@@ -57,7 +57,7 @@
 <a href="<package-rpm-stable>"><version-rpm-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>)
 <br>
 <a href="<package-srpm-stable>"><version-rpm-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>)
-<br>
+<br />
 </td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix instructions</a>
@@ -68,7 +68,7 @@
 <td>Red Hat, development packages</td>
 <td>
 <a href="<package-rpm-alpha>"><version-rpm-alpha> RPM</a> (<a href="<package-rpm-alpha-sig>">sig</a>)
-<br>
+<br />
 <a href="<package-srpm-alpha>"><version-rpm-alpha> SRPM</a> (<a href="<package-srpm-alpha-sig>">sig</a>)
 </td>
 <td>
@@ -85,7 +85,7 @@
 <a href="<package-rpmsuse-stable>"><version-rpmsuse-stable> RPM</a> (<a href="<package-rpm-stable-sig>">sig</a>)
 <br>
 <a href="<package-srpmsuse-stable>"><version-rpmsuse-stable> SRPM</a> (<a href="<package-srpm-stable-sig>">sig</a>)
-<br>
+<br />
 </td>
 <td>
 <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix instructions</a>
@@ -96,7 +96,7 @@
 <td>SUSE, development packages</td>
 <td>
 <a href="<package-rpmsuse-alpha>"><version-rpmsuse-alpha> RPM</a> (<a href="<package-rpmsuse-alpha-sig>">sig</a>)
-<br>
+<br />
 <a href="<package-srpmsuse-alpha>"><version-rpmsuse-alpha> SRPM</a> (<a href="<package-srpmsuse-alpha-sig>">sig</a>)
 </td>
 <td>
@@ -141,7 +141,8 @@
 <tr>
 <td>Source tarballs</td>
 <td>
-<a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
+<a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>)
+<br />
 <a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
 </td>
 <td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd></td>

Modified: website/trunk/en/download-windows.wml
===================================================================
--- website/trunk/en/download-windows.wml	2006-08-29 07:10:09 UTC (rev 8283)
+++ website/trunk/en/download-windows.wml	2006-08-29 08:03:30 UTC (rev 8284)
@@ -34,41 +34,34 @@
 </thead>
 
 <tr>
-<td>Windows: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
+<td>Windows</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<a href="<local-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<local-win32-bundle-stable-sig>">sig</a>).
+<!--
 <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>).
-</td>
-<td><a href="<page docs/tor-doc-win32>">Windows
-instructions</a>; <a href="<local-win32-bundle-stable>">local mirror</a>
-(<a href="<local-win32-bundle-stable-sig>">sig</a>).
-You can get the old <a
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe";>TorCP
-bundle</a> (<a
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe.asc";>sig</a>)
-if you prefer.</td>
-</tr>
-
+-->
 <!--
-<tr>
-<td>Dev packages: Tor &amp; Privoxy &amp; Vidalia bundle</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-win32>">Windows instructions</a>;
-<a href="<local-win32-bundle-alpha>">local mirror</a>
-(<a href="<local-win32-bundle-alpha-sig>">sig</a>).</td>
+<td><a href="<page docs/tor-doc-win32>">Windows instructions</a></td>
 </tr>
--->
 
 <tr>
-<td>For experts only: just Tor</td>
-<td>
+<td>For experts only</td>
+<td>Just Tor:
+<a href="<package-win32-stable>"><version-win32-stable></a> (<a href="<package-win32-stable-sig>">sig</a>).
 <!--
-<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>similar to the <a href="<page docs/tor-doc-unix>#privoxy">Unix instructions</a></td>
+<td>similar to the <a href="<page docs/tor-doc-unix>#privoxy">Unix instructions</a>;
+you can get the old <a
+href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe";>TorCP
+bundle</a> (<a
+href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe.asc";>sig</a>)
+if you prefer.
+</td>
 </tr>
 
 </table>

Modified: website/trunk/en/download.wml
===================================================================
--- website/trunk/en/download.wml	2006-08-29 07:10:09 UTC (rev 8283)
+++ website/trunk/en/download.wml	2006-08-29 08:03:30 UTC (rev 8284)
@@ -42,71 +42,47 @@
 </thead>
 
 <tr>
-<td>Windows: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
+<td>Windows</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<!--
 <a href="<package-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<package-win32-bundle-stable-sig>">sig</a>).
+-->
+<a href="<local-win32-bundle-stable>"><version-win32-bundle-stable></a> (<a href="<local-win32-bundle-stable-sig>">sig</a>).
 </td>
-<td><a href="<page docs/tor-doc-win32>">Windows
-instructions</a>; <a href="<local-win32-bundle-stable>">local mirror</a>
-(<a href="<local-win32-bundle-stable-sig>">sig</a>).
-You can get the old <a
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe";>TorCP
-bundle</a> (<a
-href="http://www.freehaven.net/~edmanm/torcp/download/tor-0.1.1.18-torcp-0.0.4-bundle.exe.asc";>sig</a>)
-if you prefer.</td>
+<td><a href="<page docs/tor-doc-win32>">Windows instructions</a></td>
 </tr>
 
-<!--
 <tr>
-<td>Windows development: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
-<a href="<package-win32-bundle-alpha>"><version-win32-bundle-alpha></a> (<a href="<package-win32-bundle-alpha-sig>">sig</a>).
-</td>
+<td>Windows development and expert packages</td>
+<td><a href="<page download-windows>">Windows download page</a></td>
 <td><a href="<page docs/tor-doc-win32>">Windows instructions</a></td>
 </tr>
--->
 
 <tr>
-<td>Windows: just Tor (for experts)</td>
-<td>
-<!--
-<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>Mac OS X 10.4 (Tiger)</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<a href="<package-osx-bundle-stable>"><version-osx-bundle-stable></a> (<a href="
+<package-osx-bundle-stable-sig>">sig</a>),
+<a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha></a> (<a href="<p
+ackage-osx-bundle-alpha-sig>">sig</a>).
 </td>
-<td>similar to the <a href="<page docs/tor-doc-unix>#privoxy">Unix instructions</a></td>
+<td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
 <tr>
-<td>Mac OS X: Tor &amp; Privoxy &amp; Vidalia bundle</td>
-<td>
-<!--
-<a href="<package-osx-bundle-stable>"><version-osx-bundle-stable> for Tiger (OSX 10.4)</a> (<a href="<package-osx-bundle-stable-sig>">sig</a>).
--->
-<a href="<package-osx-bundle-alpha>"><version-osx-bundle-alpha> for Tiger (OSX 10.4)</a> (<a href="<package-osx-bundle-alpha-sig>">sig</a>).
-<br />
-<!--
-<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-bundle-stable-sig>">sig</a>).
--->
-<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha> for Panther OSX 10.3)</a> (<a href="<package-oldosx-bundle-alpha-sig>">sig</a>).
+<td>Mac OS X 10.3 (Panther)</td>
+<td>Tor &amp; Privoxy &amp; Vidalia bundle:
+<a href="<package-oldosx-bundle-stable>"><version-oldosx-bundle-stable></a> (<a 
+href="<package-oldosx-bundle-stable-sig>">sig</a>),
+<a href="<package-oldosx-bundle-alpha>"><version-oldosx-bundle-alpha></a> (<a hr
+ef="<package-oldosx-bundle-alpha-sig>">sig</a>).
 </td>
-<td><a href="<page docs/tor-doc-osx>">OS X instructions</a>.
-</td>
+<td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
 <tr>
-<td>Mac OS X: just Tor &amp; Privoxy (for experts)</td>
-<td>
-<!--
-<a href="<package-osx-stable>"><version-osx-stable> for Tiger (OSX 10.4)</a> (<a href="<package-osx-stable-sig>">sig</a>),
--->
-<a href="<package-osx-alpha>"><version-osx-alpha> for Tiger (OSX 10.4)</a> (<a href="<package-osx-alpha-sig>">sig</a>).
-<br />
-<!--
-<a href="<package-oldosx-stable>"><version-oldosx-stable> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-stable-sig>">sig</a>),
--->
-<a href="<package-oldosx-alpha>"><version-oldosx-alpha> for Panther (OSX 10.3)</a> (<a href="<package-oldosx-alpha-sig>">sig</a>)
-</td>
+<td>Mac OS X development and expert packages</td>
+<td><a href="<page download-osx>">OS X download page</a></td>
 <td><a href="<page docs/tor-doc-osx>">OS X instructions</a></td>
 </tr>
 
@@ -122,7 +98,7 @@
 <td>Source tarballs</td>
 <td>
 <a href="<package-source-stable>"><version-stable></a> (<a href="<package-source-stable-sig>">sig</a>),
-<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>)
+<a href="<package-source-alpha>"><version-alpha></a> (<a href="<package-source-alpha-sig>">sig</a>).
 </td>
 <td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd></td>
 </tr>