[tor-commits] r25686: {website} address ticket 6162 and fix references to firefox. (website/trunk/projects/en)

[Andrew Lewman]

Author: phobos
Date: 2012-06-20 20:28:07 +0000 (Wed, 20 Jun 2012)
New Revision: 25686

Modified:
   website/trunk/projects/en/torbrowser.wml
Log:
address ticket 6162 and fix references to firefox.


Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml	2012-06-20 19:10:10 UTC (rev 25685)
+++ website/trunk/projects/en/torbrowser.wml	2012-06-20 20:28:07 UTC (rev 25686)
@@ -79,7 +79,7 @@
     e.g. the Desktop or a USB flash drive.</p>
     
     <p id="Download-torbrowserbundle" style="font-size: 120%; margin:
-    5mm">Tor Browser Bundle for Windows with Firefox Aurora (version
+    5mm">Tor Browser Bundle for Windows (version
     <version-torbrowserbundle>)</p>
     
     <ul>
@@ -170,13 +170,9 @@
     
     </ul>
     
-    <p>The Tor IM Browser Bundle has been <a
-    href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-temporarily">temporarily
-    discontinued</a>.</p>
-
     <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin:
-    5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher
-    with Firefox Aurora (version <version-torbrowserbundleosx32>, 28 MB)</p>
+    5mm">Tor Browser Bundle for Intel Mac OS X 10.6 and higher (version
+    <version-torbrowserbundleosx32>)</p>
 
 
     <ul>
@@ -325,9 +321,9 @@
     </ul>
     
     <p id="Download-torbrowserbundlelinux" style="font-size: 120%;
-    margin: 5mm">BETA: Tor Browser Bundle for Linux with Firefox
-    Aurora (version <version-torbrowserbundlelinux32> (32-bit),
-    <version-torbrowserbundlelinux64> (64-bit), 24 MB)</p>
+    margin: 5mm">BETA: Tor Browser Bundle for Linux
+    (version <version-torbrowserbundlelinux32> (32-bit),
+    <version-torbrowserbundlelinux64> (64-bit))</p>
 
     <ul>
     <li>English (en-US): <a
@@ -489,9 +485,9 @@
     <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 Aurora in our bundles is
+    you to get. Also, note that the Firefox ESR in our bundles is
     <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a
-    href="http://www.mozilla.com/firefox/">default Firefox Aurora</a>;
+    href="http://www.mozilla.com/firefox/">default Firefox ESR</a>;
     we're currently working with Mozilla to see if they want us to change
     the name to make this clearer.</p>
    
@@ -501,7 +497,7 @@
     X will automatically unarchive it and you will have a TorBrowser
     application in your chosen language (for example, TorBrowser_en-US.app).
     Click the TorBrowser application to launch Vidalia.  Once Vidalia connects to Tor, it will
-    launch Firefox Aurora.</p>
+    launch Firefox ESR.</p>
     
     <p><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" /></p>
  
@@ -532,7 +528,7 @@
     
     <p>Download the file above, and save it somewhere, then double click on it.
     Click on the button labelled <strong>"..."</strong> (1) and select where you want
-    to save the bundle then click <strong>OK</strong> (2). At least 50 MB free
+    to save the bundle then click <strong>OK</strong> (2). At least 50 MB free
     space must be available in the location you select. If you want to leave the
     bundle on the computer, saving it to the Desktop is a good choice. If you want
     to move it to a different computer or limit the traces you leave behind, save
@@ -622,9 +618,8 @@
     instructions</a>.</p>
     
     <p>Tor Browser Bundle is partially based on <a
-    href="http://portableapps.com/apps/internet/firefox_portable">Mozilla
-    Firefox Aurora, Portable Edition</a> from <a
-    href="http://portableapps.com/">PortableApps.com</a>.</p>
+    href="https://www.mozilla.org/en-US/firefox/organizations/">Mozilla
+    Firefox ESR</a>.</p>
 
   </div>
   <!-- END MAINCOL -->