[or-cvs] r21834: {website} rename android to android bundle, break out the components, (in website/trunk: en include)

[Andrew Lewman <andrew@xxxxxxxxxxxxxx>]

Author: phobos
Date: 2010-03-06 20:17:16 +0000 (Sat, 06 Mar 2010)
New Revision: 21834

Modified:
   website/trunk/en/download-unix.wml
   website/trunk/include/versions.wmi
Log:
rename android to android bundle, break out the components, update the
download page.


Modified: website/trunk/en/download-unix.wml
===================================================================
--- website/trunk/en/download-unix.wml	2010-03-06 20:05:31 UTC (rev 21833)
+++ website/trunk/en/download-unix.wml	2010-03-06 20:17:16 UTC (rev 21834)
@@ -84,13 +84,11 @@
 <td align="center"><img src="images/distros/android-market.gif" alt="Android" width="32" height="32"/></td>
 <td>Android</td>
 <td>
-<a href="<package-android-stable>"><version-android-stable></a>
- (<a href="<package-android-stable-sig>">sig</a>)
 </td>
-<td>
-<a href="<package-android-latest>"><version-android-latest></a>
- (<a href="<package-android-latest-sig>">sig</a>)
+<a href="<package-androidbundle-alpha>"><version-androidbundle-tor></a>
+ (<a href="<package-androidbundle-alpha-sig>">sig</a>)
 </td>
+<td>
 <td><a href="<page docs/android>">Android instructions and information</a></td>
 <td></td>
 </tr>

Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2010-03-06 20:05:31 UTC (rev 21833)
+++ website/trunk/include/versions.wmi	2010-03-06 20:17:16 UTC (rev 21834)
@@ -30,13 +30,12 @@
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.7</define-tag>
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.3</define-tag>
 
-<define-tag version-android-stable whitespace=delete>0.2.2.9-alpha-orbot-0.0.2</define-tag>
-<define-tag version-android-latest whitespace=delete>alpha-orbot-latest</define-tag>
-<define-tag package-android-latest whitespace=delete>dist/android/<version-android-latest>.apk</define-tag>
-<define-tag package-android-latest-sig whitespace=delete><package-android-latest>.asc</define-tag>
-<define-tag package-android-stable whitespace=delete>dist/android/<version-android-stable>.apk</define-tag>
-<define-tag package-android-stable-sig whitespace=delete><package-android-stable>.asc</define-tag>
-<define-tag version-android-components whitespace=delete>privoxy-3.0.12-stable, libevent-1.4.12-stable</define-tag>
+<define-tag version-androidbundle-tor whitespace=delete>0.2.2.9-alpha</define-tag>
+<define-tag version-androidbundle-orbot whitespace=delete>0.0.2</define-tag>
+<define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag>
+<define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag>
+<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>
+<define-tag package-androidbundle-alpha-sig whitespace=delete><package-android-latest>.asc</define-tag>
 
 <define-tag package-win32-stable whitespace=delete>dist/win32/tor-<version-win32-stable>-win32.exe</define-tag>
 <define-tag package-win32-alpha whitespace=delete>dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag>