[or-cvs] r21731: {website} Android website updated (website/trunk/docs/en)

[Jacob Appelbaum <jacob@xxxxxxxxxxxxx>]

Author: ioerror
Date: 2010-02-23 04:49:10 +0000 (Tue, 23 Feb 2010)
New Revision: 21731

Modified:
   website/trunk/docs/en/android.wml
Log:
Android website updated

Modified: website/trunk/docs/en/android.wml
===================================================================
--- website/trunk/docs/en/android.wml	2010-02-23 04:45:50 UTC (rev 21730)
+++ website/trunk/docs/en/android.wml	2010-02-23 04:49:10 UTC (rev 21731)
@@ -9,36 +9,96 @@
 <div class="main-column">
 
 <a id="Android"></a>
-<h2><a class="anchor" href="#Android">Installing Tor on Android</a></h2>
+<h2><a class="anchor" href="#Android">Tor on Android</a></h2>
 <br />
 <p>
-Tor will soon be available for Android.
+Tor is available for Android by installing our package named Orbot.
 </p>
+<p>
+Orbot is an application that allows mobile phone users to access the web,
+instant messaging and email without being monitored or blocked by their mobile
+internet service provider. Orbot brings the features and functionality of Tor
+to the Android mobile operating system.
+</p>
+<p>
+Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy
+and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot
+has the ability to transparently torify all of the TCP traffic on your Android
+device when it has the correct permissions.
+</p>
 
-<a id="market"></a>
-<h2><a class="anchor" href="#market">Installing Tor from the Android Market</a></h2>
+<a id="Market"></a>
+<h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>
 <br />
 <p>
-Here's how you install Tor from the Android market.
+Orbot is not currently in the Android Market. It will be available in the
+market in the very near future.
 </p>
 
-<a id="manual"></a>
-<h2><a class="anchor" href="#manual">Installing Tor from our website</a></h2>
+<a id="Manual"></a>
+<h2><a class="anchor" href="#Manual">Installing Tor from our website</a></h2>
 <br />
 <p>
-Here's how you install Tor from our website.
+You can download our most recent beta of Orbot and a gpg signature from our
+server.
 </p>
 
+<a id="Screenshots"></a>
+<h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>
+<br />
 <p>
-Visit <a href="https://check.torproject.org/";>TorCheck</a> to confirm that
-you are routing browser traffic through Tor: <br />
-<a href="../img/android/android.png">
-<img border="0" alt="Android check Tor"
-src="../img/android/android_check_tor-small.png"/>
+<a href="../img/android/android-off.jpg">
+<img border="0" alt="Android Tor off"
+src="../img/android/android-off-150x150.jpg"/>
 </a>
+<a href="../img/android/android-bootstrapping.jpg">
+<img border="0" alt="Android Tor bootstrapping"
+src="../img/android/android-bootstrapping-150x150.jpg"/>
+</a>
+<a href="../img/android/android-activated.jpg">
+<img border="0" alt="Android Tor activated"
+src="../img/android/android-activated-150x150.jpg"/>
+</a>
+<a href="../img/android/android-settings.jpg">
+<img border="0" alt="Android Tor settings"
+src="../img/android/android-settings-150x150.jpg"/>
+</a>
 </p>
 
+<a id="Notes"></a>
+<h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>
+<br />
 <p>
+For standard Android 1.x devices (G1, MyTouch3G, Hero, Droid Eris, Cliq, Moment):
+<ul>
+<li>The âProxySurfâ browser available in the Android Market allows for use
+    of a proxy. Simply set the HTTP Proxy to '127.0.0.1' and port '8118'.
+<li>For Instant Messsaging, try âBeemâ in the market.
+</ul>
+</p>
+<p>
+For Android 2.x devices: Droid, Nexus One
+<ul>
+<li>You must root your device for Orbot to transparently proxy all TCP traffic.
+<li>For non-modified and non-rooted phones, you'll want to manually configure
+    your specific applications.
+<li>If you root your device, whether it is 1.x or 2.x based, Orbot will
+    automatically, transparently proxy all web traffic on port 80 and 443
+    and all DNS requests. This includes the built-in Browser, Gmail, YouTube,
+    Maps and any other application that uses standard web traffic.
+</ul>
+</p>
+
+<a id="Source"></a>
+<h2><a class="anchor" href="#Source">Source code access</a></h2>
+<br />
+<p>
+All of the source code is available in the
+<a href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/";>Orbot
+subversion repository</a>.
+</p>
+
+<p>
 Note that this might not always give you the latest stable Tor version.
 Additionally, the Android web browser does not have Torbutton. This means that
 while it may be useful for circumvention, it probably is unsuitable for strong