[tor-commits] r26916: {website} update versions for TB 3.6.4 and 4.0-alpha-1 and finish upda (in website/trunk: include projects/en)

[Erinn Clark]

Author: erinn
Date: 2014-08-12 17:56:25 +0000 (Tue, 12 Aug 2014)
New Revision: 26916

Modified:
   website/trunk/include/versions.wmi
   website/trunk/projects/en/torbrowser.wml
Log:
update versions for TB 3.6.4 and 4.0-alpha-1 and finish updating the torbrowser page

Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2014-08-12 16:32:36 UTC (rev 26915)
+++ website/trunk/include/versions.wmi	2014-08-12 17:56:25 UTC (rev 26916)
@@ -23,11 +23,11 @@
 <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag>
 <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag>
 
-<define-tag version-torbrowserbundledir whitespace=delete>3.6.3</define-tag>
-<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.3</define-tag>
+<define-tag version-torbrowserbundledir whitespace=delete>3.6.4</define-tag>
+<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.4</define-tag>
 
-<define-tag version-torbrowserbundle whitespace=delete>3.6.3</define-tag>
-<define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag>
+<define-tag version-torbrowserbundle whitespace=delete>3.6.4</define-tag>
+<define-tag version-torbrowserbundlebeta whitespace=delete>4.0-alpha-1</define-tag>
 <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
 <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag>
 <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
@@ -37,19 +37,19 @@
 <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
 <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag>
 
-<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.3</define-tag>
-<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.3</define-tag>
-<define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag>
-<define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag>
+<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.4</define-tag>
+<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.4</define-tag>
+<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.0-alpha-1</define-tag>
+<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.0-alpha-1</define-tag>
 <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
 <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag>
 <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
 <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>
 <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag>
 
-<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.3</define-tag>
+<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.4</define-tag>
 <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag>
-<define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag>
+<define-tag version-torbrowserbundleosx32beta whitespace=delete>4.0-alpha-1</define-tag>
 <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag>
 <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>
 <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag>

Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml	2014-08-12 16:32:36 UTC (rev 26915)
+++ website/trunk/projects/en/torbrowser.wml	2014-08-12 17:56:25 UTC (rev 26916)
@@ -89,6 +89,8 @@
     for your
     preferred language. This file can be saved wherever is convenient,
     e.g. the Desktop or a USB flash drive.</p></div>
+    <p></p>
+    <center><h3>Stable Tor Browser</h3></center>
     <div class="pjtext">
       <div class="dltable" style="margin-top: -35px;">
         <table>
@@ -299,7 +301,18 @@
           </tbody>
         </table>
       </div>
+      </div>
+<p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
+      which allows you to make sure you've downloaded the file we intended
+      you to get. Also, note that the Firefox ESR in our bundles is
+      <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/">modified</a> from the <a
+      href="https://www.mozilla.org/en-US/firefox/organizations/">default
+      Firefox ESR</a></p>
 <!-- alpha bundles -->
+<hr>
+    <p></p>
+    <center><h3>Experimental Tor Browser</h3></center>
+     <div class="pjtext">
       <div class="dltable" style="margin-top: -35px;">
         <table>
           <thead>
@@ -509,13 +522,7 @@
           </tbody>
         </table>
       </div>
-      <>
-      <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>,
-      which allows you to make sure you've downloaded the file we intended
-      you to get. Also, note that the Firefox ESR in our bundles is
-      <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/">modified</a> from the <a
-      href="https://www.mozilla.org/en-US/firefox/organizations/">default
-      Firefox ESR</a></p>
+      </div>
     </div>
       </div>