Merge branch 'master' of ssh://git-annex.branchable.com

3 files changed, 25 insertions, 1 deletions

diff --git a/doc/Android/comment_2_c2422b7dd9d526b3616e49f48cf178c2._comment b/doc/Android/comment_2_c2422b7dd9d526b3616e49f48cf178c2._comment
new file mode 100644
index 000000000..bfa4decc4
--- /dev/null
+++ b/doc/Android/comment_2_c2422b7dd9d526b3616e49f48cf178c2._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-05-17T22:28:34Z"
+ content="""
+The Android app works on many non-rooted Android systems.
+
+The \"link busybox: Read-only file system\" means that `/data/data/ga.androidterm/lib/lib.busybox.so` cannot be hard linked to `/data/data/ga.androidterm/busybox`. That's not normal. I'd appreciate if you could provide more information on your Android device, like Android version and model number.
+"""]]
diff --git a/doc/Android/comment_3_0e4980c27b13dbc28477c02a82898248._comment b/doc/Android/comment_3_0e4980c27b13dbc28477c02a82898248._comment
new file mode 100644
index 000000000..fdbfac1c6
--- /dev/null
+++ b/doc/Android/comment_3_0e4980c27b13dbc28477c02a82898248._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://yarikoptic.myopenid.com/"
+ nickname="site-myopenid"
+ subject="Follow-up information on my system"
+ date="2013-05-18T01:23:28Z"
+ content="""
+Sorry for the delay:  my android is stock Samsung-tuned Jelly beans.
+Android 4.1.2
+Baseband version N7000XXLSO
+
+not sure if that would be of any use :-/  nothing in the logs (aLogcat) if I filter by annex -- should there any debug output? what should be a key to search by?
+
+
+"""]]
diff --git a/doc/design/assistant/blog/day_267__windows_autobuilder.mdwn b/doc/design/assistant/blog/day_267__windows_autobuilder.mdwn
index 8ac2845b0..f80b8f839 100644
--- a/doc/design/assistant/blog/day_267__windows_autobuilder.mdwn
+++ b/doc/design/assistant/blog/day_267__windows_autobuilder.mdwn
@@ -4,6 +4,6 @@ half of today setting up the build.
 
 Got the test suite to pass in direct mode, and indeed in direct mode
 on a FAT filesystem. Had to fix one corner case in direct mode `git annex
-add`. Unofrtunatly it still doesn't work on Android; somehow `git clone` 
+add`. Unfortunately it still doesn't work on Android; somehow `git clone` 
 of a local repository is broken there. Also got the test suite to build,
 and run on Windows, though it fails pretty miserably.