[tor-commits] r26052: {website} update the android page to point at working repos and apk fi (website/trunk/docs/en)

[Andrew Lewman]

Author: phobos
Date: 2013-02-07 02:36:29 +0000 (Thu, 07 Feb 2013)
New Revision: 26052

Modified:
   website/trunk/docs/en/android.wml
Log:
update the android page to point at working repos and apk files.


Modified: website/trunk/docs/en/android.wml
===================================================================
--- website/trunk/docs/en/android.wml	2013-02-06 02:18:48 UTC (rev 26051)
+++ website/trunk/docs/en/android.wml	2013-02-07 02:36:29 UTC (rev 26052)
@@ -22,38 +22,31 @@
     to the Android mobile operating system.
     </p>
     <p>
-    Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy
+    Orbot contains Tor and libevent. 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 and system libraries.
     </p>
-    
-    <a id="QrCode"></a>
-    <h2><a class="anchor" href="#QrCode">Installing Tor with a QR code</a></h2>
+
+    <a id="F-Droid"></a>
+    <h2><a class="anchor" href="fdroid">Installing Orbot from a F-Droid repository</a></h2>
     <br>
-    <p>
-    Orbot is easy to install by simply scanning the following QR code with your
-    Android Barcode scanner.
-    </p>
-    
-    <p>
-    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png"><img alt="Android QR code" src="$(IMGROOT)/android/orbot-qr-code-latest.png"/></a>
-    </p>
-    
+    <p>Follow <a href="https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">these instructions</a> to install from Guardian Project's repository.</p>
+
     <a id="Market"></a>
-    <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2>
+    <h2><a class="anchor" href="#Market">Installing Orbot from the Android Market</a></h2>
     <br>
     <p>
     Orbot is available <a href="https://play.google.com/store/apps/details?id=org.torproject.android">in the Android Market</a>.
     </p>
-    
+
     <a id="Manual"></a>
-    <h2><a class="anchor" href="#Manual">Installing Tor from our website manually</a></h2>
+    <h2><a class="anchor" href="#Manual">Installing Tor from Guardian's website manually</a></h2>
     <br>
     <p>
-    You can download <a href="../<package-androidbundle-alpha>">our most recent version of Orbot</a> and <a href="../<package-androidbundle-alpha>.asc">the gpg signature</a> from our server.
+    You can download the most recent version from the <a href="https://guardianproject.info/releases/">Guardian Project release</a> listing.
     </p>
-    
+
     <a id="Screenshots"></a>
     <h2><a class="anchor" href="#Screenshots">Screenshots of Tor on Android</a></h2>
     <br>
@@ -73,7 +66,7 @@
     src="$(IMGROOT)/android/android-settings-150x150.jpg"/>
     </a>
     </p>
-    
+
     <a id="ProxySettings"></a>
     <h2><a class="anchor" href="#ProxySettings">Proxy settings and configuration
     </a></h2>
@@ -86,16 +79,11 @@
     <li>HTTP proxy 127.0.0.1:8118 </li>
     <li>Transparent proxying (on select devices)</li>
     </ul>
-    
+
     <a id="Notes"></a>
     <h2><a class="anchor" href="#Notes">Platform specific notes</a></h2>
     <br>
     <p>
-    The current version of Orbot ships with the following components:
-    <b><version-androidbundle-privoxy>, <version-androidbundle-libevent></b>
-    </p>
-    <br>
-    <p>
       For standard Android 1.x devices:
     </p>
     <ul>
@@ -111,10 +99,10 @@
     <li>For non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications.</li>
     <li>If you root your device and install an iptables-capable ROM (such as <a href="http://www.cyanogenmod.com/">Cyanogen</a>), Orbot can transparently proxy traffic on an app-by-app basis through Tor.</li>
     <li>You can also install Firefox for Android from the market with the <a href="https://guardianproject.info/apps/proxymob">Proxy Mobile Add-on</a> or install the text-only “NDBrowser” from the Android Market.
-Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li> 
+Both of these solutions all routing of web access through Tor on standard, un-rooted devices.</li>
     <li>For Instant Messaging, try <a href="https://guardianproject.info/apps/gibber">Gibberbot</a>, which includes support for connecting via Tor and Off-the-Record encryption.</li>
     </ul>
-    
+
     <a id="Source"></a>
     <h2><a class="anchor" href="#Source">Source code access</a></h2>
     <br>
@@ -123,16 +111,16 @@
     href="https://gitweb.torproject.org/orbot.git">Orbot git
     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
     web browser anonymity requirements.
     </p>
-    
+
     <hr>
-    
+
     <p>If you have suggestions for improving this document, please <a
     href="<page about/contact>">send them to us</a>. Thanks!</p>
   </div>
@@ -144,4 +132,4 @@
   <!-- END SIDECOL -->
 </div>
 <!-- END CONTENT -->
-#include <foot.wmi> 
+#include <foot.wmi>