Author: erinn
Date: 2010-10-27 07:13:19 +0000 (Wed, 27 Oct 2010)
New Revision: 23682
Modified:
website/trunk/Makefile
website/trunk/projects/en/torbrowser.wml
Log:
add the OSX info back to the TBB page
Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile 2010-10-27 01:56:53 UTC (rev 23681)
+++ website/trunk/Makefile 2010-10-27 07:13:19 UTC (rev 23682)
@@ -10,7 +10,7 @@
# 4. make
# 5. ./publish
-export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git
+export TORGIT=TORTUGA
export STABLETAG=tor-0.2.2.17-alpha
export DEVTAG=tor-0.2.2.17-alpha
Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml 2010-10-27 01:56:53 UTC (rev
23681)
+++ website/trunk/projects/en/torbrowser.wml 2010-10-27 07:13:19 UTC (rev
23682)
@@ -24,10 +24,10 @@
learning your physical location, and it lets you access sites which are
blocked.</p>
- <p>The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows
- or Linux without needing to
- install any software. It can run off a USB flash drive, comes with a
- pre-configured web browser and is self-contained.
+ <p>The <strong>Tor Browser Bundle</strong> lets you use Tor on
+ Windows Mac OS X, or Linux without needing to install any software. It
+ can run off a USB flash drive, comes with a pre-configured web browser
+ and is self-contained.
The <strong>Tor IM Browser Bundle</strong> additionally allows instant
messaging and chat over Tor.
@@ -118,8 +118,55 @@
<li><a
href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe">简体字
(zh-CN)</a> (<a
href="../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc"
style="font-size: 90%;">signature</a>)</li>
</ul>
+
+ <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin:
5mm">BETA: Tor Browser Bundle for i386 Mac OS X with Firefox (version
+<version-torbrowserbundleosx>, 28 MB)</p>
+
+ <ul>
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">English
(en-US)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip">العربية
+(ar)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ar.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip">Deutsch
(de)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-de.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip">Español
+(es-ES)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip">فارسی
(fa) </a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fa.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip">Français
(fr)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-fr.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip">Italiano
(it)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-it.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip">Nederlands
(nl)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-nl.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip">Polish
(pl)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pl.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip">Português
(pt-PT)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip">Русский
+(ru)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-ru.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ <li><a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip">简体字
(zh-CN)</a>
+ (<a
href="dist/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-zh-CN.zip.asc"
style="font-size: 90%;">signature</a>)</li>
+
+ </ul>
+
+
- <p id="Download-torbrowserbundlelinux" style="font-size: 120%; margin:
5mm">BETA: Tor Browser Bundle for Linux with Firefox (version
<version-torbrowserbundlelinux>, 22 MB)</p>
+ <p id="Download-torbrowserbundlelinux" style="font-size: 120%; margin:
5mm">BETA: Tor Browser Bundle for Linux with Firefox (version
<version-torbrowserbundlelinux>, 24 MB)</p>
<ul>
<li>English (en-US): <a
href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">i386</a>
(<a
href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc"
style="font-size: 90%;">sig</a>) | <a
href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux>-dev-en-US.tar.gz">x86_64</a>
(<a
href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux>-dev-en-US.tar.gz.asc"
style="font-size: 90%;">sig</a>)</li>
@@ -159,7 +206,15 @@
we're currently working with Mozilla to see if they want
us to change the name to make this clearer.
</p>
-
+
+ <a id="MacOSX"></a>
+ <h3><a class="anchor" href="#MacOSX">Mac OS X instructions</a></h3>
+ <p>Download the file above, save it somewhere, then click on it. Mac OS
+ X will automatically unarchive it and you will have a TorBrowser
+ application in your chosen language (for example, TorBrowser_en-US.app).
+ Click the file to launch Vidalia. Once Vidalia connects to Tor, it will
+ launch Firefox.</p>
+
<a id="Linux"></a>
<h3><a class="anchor" href="#Linux">Linux instructions</a></h3>
<p>Download the architecture-appropriate file above, save it somewhere,
then
