Android page

9 files changed, 69 insertions, 15 deletions

diff --git a/doc/Android.mdwn b/doc/Android.mdwn
new file mode 100644
index 000000000..d5c862450
--- /dev/null
+++ b/doc/Android.mdwn
@@ -0,0 +1,58 @@
+git-annex is now available for Android. This includes the 
+[[git-annex assistant|/assistant]], for easy syncing between your Android
+and other devices.
+
+[[Android installation instructions|/install/android]]
+
+When you run the git-annex Android app, two windows will open. The first is
+a terminal window, and the second is a web browser running the git-annex
+webapp.
+
+## using the webapp
+
+You can use the webapp on Android much the same as on any other
+operating system, to set up the git-annex assistant.
+
+The repository created by the webapp on your Android device is configured,
+by default, as a "source" repository. This way, when you create a file on
+Android (by, for example, taking a picture), it will be uploaded from your
+Android device, and then its content removed from the device. This saves
+storage space.
+
+If you want to send files to your Android, and use them there, you should
+edit the repository's configuration, and select "client". Bear in mind that
+this will make it try to get every file placed in your repository on any
+other computer, which might take up a lot of space.
+
+## closing and reopening the webapp
+
+The webapp does not need to be left open after you've set up your
+repository. As long as the terminal window is left open, git-annex will
+remain running and sync your files. To re-open the webapp after closing it,
+click on the + icon in the terminal window.
+
+## starting git-annex
+
+The app is not currently automatically started on boot, so you will need to
+manually open it to keep your files in sync. You do not need to leave the
+app running all the time, though. It will sync back up automatically when
+started.
+
+## stopping git-annex
+
+Simply close the terminal window to stop git-annex from running.
+
+## using the command line
+
+[[!img terminal.png alt="Android terminal"]]
+
+If you prefer to use `git-annex` at the command line, you can do so using the
+terminal. A fairly full set of tools is provided, including `git`, `ssh`,
+`rsync`, and `gpg`.
+
+To prevent the webapp from being automatically started
+when a terminal window opens, go into the terminal preferences, to "Inital
+Command", and clear out the default `git annex webapp &` setting.
+
+Or, if you'd like to run the assistant automatically, but not open the
+webapp, change the "Initial Command" to: `git annex assistant --autostart`
diff --git a/doc/assistant/android/appinstalled.png b/doc/android/appinstalled.png
index 166120d48..166120d48 100644
--- a/doc/assistant/android/appinstalled.png
+++ b/doc/android/appinstalled.png
diff --git a/doc/assistant/android/install.png b/doc/android/install.png
index 882455df1..882455df1 100644
--- a/doc/assistant/android/install.png
+++ b/doc/android/install.png
diff --git a/doc/assistant/android/terminal.png b/doc/android/terminal.png
index 9afa2720f..9afa2720f 100644
--- a/doc/assistant/android/terminal.png
+++ b/doc/android/terminal.png
diff --git a/doc/assistant/android/webapp.png b/doc/android/webapp.png
index edb5c5ccd..edb5c5ccd 100644
--- a/doc/assistant/android/webapp.png
+++ b/doc/android/webapp.png
diff --git a/doc/assistant.mdwn b/doc/assistant.mdwn
index 9f9ed0c89..a437b9801 100644
--- a/doc/assistant.mdwn
+++ b/doc/assistant.mdwn
@@ -1,5 +1,5 @@
 The git-annex assistant creates a folder on each of your computers,
-removable drives, and cloud services, which
+Android devices, removable drives, and cloud services, which
 it keeps synchronised, so its contents are the same everywhere.
 It's very easy to use, and has all the power of git and git-annex.
 
@@ -18,6 +18,7 @@ the [[release_notes]] for known infelicities and upgrade instructions.
 ## documentation
 
 * [[Basic usage|quickstart]]
+* [[Android documentation/Android]]
 * Want to make two nearby computers share the same synchronised folder?  
   Follow the [[local_pairing_walkthrough]].
 * Or perhaps you want to share files between computers in different
diff --git a/doc/design/assistant/blog/day_195__real_android_app.mdwn b/doc/design/assistant/blog/day_195__real_android_app.mdwn
index f97f8841c..f6a4eeebe 100644
--- a/doc/design/assistant/blog/day_195__real_android_app.mdwn
+++ b/doc/design/assistant/blog/day_195__real_android_app.mdwn
@@ -1,12 +1,12 @@
 Well, it's built. [Real Android app for git-annex](http://downloads.kitenet.net/git-annex/android/current/).
 
-[[!img /assistant/android/appinstalled.png]]
+[[!img /android/appinstalled.png]]
 
 When installed, this will open a terminal in which you have access to
 git-annex and all the git commands and busybox commands as well. No webapp
 yet, but command line users should feel right at home.
 
-[[!img /assistant/android/terminal.png]]
+[[!img /android/terminal.png]]
 
 Please test it out, at least as far as installing it, opening the terminal,
 and checking that you can run `git annex`; I've only been able to test on
diff --git a/doc/design/assistant/blog/day_253__OMG.mdwn b/doc/design/assistant/blog/day_253__OMG.mdwn
index b79fb8144..b1cc89fff 100644
--- a/doc/design/assistant/blog/day_253__OMG.mdwn
+++ b/doc/design/assistant/blog/day_253__OMG.mdwn
@@ -1,4 +1,4 @@
-[[!img /assistant/android/webapp.png alt="git-annex webapp on Android"]]
+[[!img /android/webapp.png alt="git-annex webapp on Android"]]
 
 I fixed what I thought was keeping the webapp from working on Android, but
 then it started segfaulting every time it was started. Eventually I
diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn
index 59f25af51..2a95f3c42 100644
--- a/doc/install/Android.mdwn
+++ b/doc/install/Android.mdwn
@@ -1,20 +1,15 @@
-git-annex can be used on Android, however you need to know your way around
-the command line to install and use it. (Hope to get the webapp working
-eventually.)
+Now git-annex can be used on Android!
+
+[[Documentation for using git-annex on Android|/android]]
 
 ## Android app
 
-First, ensure your Android device is configured to allow installation of
-non-Market apps. Go to Setup -> Security, and enable "Unknown Sources".
+First, ensure your Android device is configured to allow installation
+of the app. Go to Setup -> Security, and enable "Unknown Sources".
 
-Download the [git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/)
+[Download the git-annex.apk](http://downloads.kitenet.net/git-annex/android/current/)
 onto your Android device, and open it to install.
 
-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.
-
 ## autobuilds
 
 A daily build is also available.