3 files changed, 27 insertions, 26 deletions

diff --git a/doc/design/assistant/android.mdwn b/doc/design/assistant/android.mdwn
index a8ed891bb..b1b3c3a35 100644
--- a/doc/design/assistant/android.mdwn
+++ b/doc/design/assistant/android.mdwn
@@ -2,9 +2,8 @@
 
 1. Get git-annex working at the command line in Android,
    along with all the programs it needs, and the assistant. **done**
+2. Get an easy to install Android app built. **done**
 2. Get the webapp working. Needs Template Haskell, or a workaround.
-3. A hopefully small Java app will be developed, which runs the
-   webapp daemon, and a web browser to display it.
 
 ### Android specific features
 
@@ -20,3 +19,15 @@ Due to use of the FAT filesystem, which doesn't do symlinks, [[desymlink]]
 is probably needed for at least older Android devices that have SD cards.
 Additionally, cripped filesystem mode is needed, to avoid hard links,
 file modes, etc.
+
+## TODO
+
+* webapp
+* autostart any configured assistants. Best on boot, but may need to only
+  do it when app is opened for the first time.
+* Don't make app initially open terminal, but go to a page that
+  allows opening the webapp or terminal.
+* I have seen an assistant thread crash with an interrupted system call
+  when the device went to sleep while it was running. Auto-detect and deal with
+  that somehow.
+* Make git stop complaining that "warning: no threads uspport, ignoring --threads"
diff --git a/doc/install.mdwn b/doc/install.mdwn
index e1e055a75..589c71adc 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -3,6 +3,7 @@
 [[!table format=dsv header=yes data="""
 detailed instructions | quick install
 [[OSX]]               | [download git-annex.app](http://downloads.kitenet.net/git-annex/OSX/current/)
+[[Android]]           | [download git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/) **beta**
 [[Linux|linux_standalone]] | [download prebuilt linux tarball](http://downloads.kitenet.net/git-annex/linux/)
 [[Debian]]            | `apt-get install git-annex`
 [[Ubuntu]]            | `apt-get install git-annex`
@@ -14,7 +15,6 @@ detailed instructions | quick install
 [[ScientificLinux5]]  | (and other RHEL5 clones like CentOS5)
 [[openSUSE]]          | 
 Windows               | [[sorry, Windows not supported yet|todo/windows_support]]
-[[Android]]           | 
 """]]
 
 ## Using cabal
diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn
index 120e2453b..5936bfa7d 100644
--- a/doc/install/Android.mdwn
+++ b/doc/install/Android.mdwn
@@ -1,31 +1,17 @@
 git-annex can be used on Android, however you need to know your way around
-the command line to install and use it. (An Android app may be developed
-eventually.)
+the command line to install and use it. (Hope to get the webapp working eventually.)
 
-## prebuilt tarball
+## android app
 
-Download the [prebuilt tarball](http://downloads.kitenet.net/git-annex/android/).
-Instructions below assume it was downloaded to `/sdcard/Download`, which
-is the default if you use the web browser for the download.
+First, ensure your Android device is configured to allow installation of
+non-Market apps. Go to Setup -> Security -> and enable "Unknown Sources".
 
-To use this tarball, you need to install either
-[KBOX](http://kevinboone.net/kbox.html) or
-[Terminal IDE](https://play.google.com/store/apps/details?id=com.spartacusrex.spartacuside)
-(available in Google Play).
-This is both to get a shell console, as well as a location under
-`/data` where git-annex can be installed.
+Download the [git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/)
+onto your Android device, and open it to install.
 
-Open the console app you installed, and enter this command:
-
-	cd $(which sh)/..; tar xf /sdcard/Download/git-annex-android.tar.gz
-
-Now git-annex is installed, but to use it you need to enter a special
-shell environment:
-
-	runshell
-
-Now you have git-annex, git, and some other utilities available, and can
-do everything in the [[walkthrough]] and more.
+When you start the Git Annex app, it will dump you into terminal.
+From here, you can run git-annex, as well as many standard git and unix commands
+provided with the app. You can do everything in the [[walkthrough]] and more.
 
 ## building it yourself
 
@@ -35,3 +21,7 @@ and also have to `cabal install` all necessary dependencies. This is not
 yet an easy process. 
 
 You also need to install git and all the utilities listed on [[fromscratch]].
+
+Then to build the full Android app bundle, use `make androidapp`. You will
+need to have the Android SDK and NDK installed; edit
+`standalone/android/Makefile` to configure the paths to them.