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

14 files changed, 334 insertions, 1 deletions

diff --git a/doc/assistant/comment_2_befa1f48e5a43a7965060491430a6bc4._comment b/doc/assistant/comment_2_befa1f48e5a43a7965060491430a6bc4._comment
new file mode 100644
index 000000000..cbc955b07
--- /dev/null
+++ b/doc/assistant/comment_2_befa1f48e5a43a7965060491430a6bc4._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9smfyJFgp3f2WjqqZWY6b7vo5eZv7GGQ"
+ nickname="Bryan"
+ subject="Ooh.  Do want on Windows"
+ date="2013-07-03T20:44:05Z"
+ content="""
+Sadly, I didn't know about this when the Kickstarter was underway - I'd be happy to chip in $100 if it means I can get annex assistant on Windows earlier.
+
+"""]]
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID.mdwn b/doc/bugs/Internal_Server_Error:_Unknown_UUID.mdwn
new file mode 100644
index 000000000..d69689ac6
--- /dev/null
+++ b/doc/bugs/Internal_Server_Error:_Unknown_UUID.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+
+One of my repositories has no name:
+http://screencast.com/t/3OjxFzpz
+
+And when I try to disable it I get this error:
+
+    Internal Server Error
+    Unknown UUID
+
+When I try to delete it I get this error:
+
+    Internal Server Error
+    unknown UUID; cannot modify
+
+I think this was the result of adding a Local Computer Repo, and then that computer signed off.  Maybe.
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version 4.20130601-g2b6c3f2
+Mac OS 10.7.5
+
+### Please provide any additional information below.
+
+Maybe it's a glitch that only will happen this once, the problem is I can't get rid of it!  Are there anyways of manually getting rid of a repo with uid?
diff --git a/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn b/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
new file mode 100644
index 000000000..60a150e7f
--- /dev/null
+++ b/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
@@ -0,0 +1,191 @@
+### Please describe the problem.
+
+"git annex --pathdepth=3 addurl URL" displays this error message and reports "failed", even though the operation succeeds when using --fast:
+
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+
+### What steps will reproduce the problem?
+
+I have lots of downloaded files I'd like to add an URL to, so I'm doing this:
+
+    $ ga addurl --fast --pathdepth=3 $(for f in *.mp3; do echo http://traffic.libsyn.com/geologicpodcast/$f; done)
+    addurl
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+    failed
+    addurl
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+    failed
+    addurl
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+    [... Delete 166 lines ...]
+    addurl
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+    failed
+    addurl
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/2325: rename: does not exist (No such file or directory)
+    failed
+    (Recording state in git...)
+    git-annex: addurl: 60 failed
+    $
+
+This "ga" command is a wrapper around git-annex to make it work everywhere with the .tar.gz version:
+
+    #!/bin/bash
+
+    #=======================================================================
+    # ga
+    # File ID: e89047ce-29d1-11e2-bb6f-00c0a8deee11
+    #=======================================================================
+
+    if test "$1" = "sync"; then
+        stat_output="$(git status --porcelain | grep -v '^??')"
+        test -n "$stat_output" && { echo ga: Repo has modifications, will not git-annex sync >&2; exit 1; }
+    fi
+    /opt/git-annex/runshell /opt/git-annex/git-annex "$@"
+
+$PATH is also set up to include /opt/git-annex/bin/ , and all other operations work nicely. In my ~/bin/ directory I've also symlinked this script to "git-annex".
+
+When dropping "--fast", this happens:
+
+    $ ga addurl --pathdepth=3 $(for f in *.mp3; do echo http://traffic.libsyn.com/geologicpodcast/$f; done | tail -20 | head -1)
+    addurl  (downloading http://traffic.libsyn.com/geologicpodcast/GeologicPodcast302-Feb28-13.mp3 ...) --2013-07-04 14:08:01--  http://traffic.libsyn.com/geologicpodcast/GeologicPodcast302-Feb28-13.mp3
+    Resolving traffic.libsyn.com (traffic.libsyn.com)... 204.16.245.39
+    Connecting to traffic.libsyn.com (traffic.libsyn.com)|204.16.245.39|:80... connected.
+    HTTP request sent, awaiting response... 302 Found
+    Location: http://ec.libsyn.com/p/6/9/b/69b9837556ed5238/GeologicPodcast302-Feb28-13.mp3?d13a76d516d9dec20c3d276ce028ed5089ab1ce3dae902ea1d01cf853ed5cd5c0f85&c_id=5440885 [following]
+    --2013-07-04 14:08:02--  http://ec.libsyn.com/p/6/9/b/69b9837556ed5238/GeologicPodcast302-Feb28-13.mp3?d13a76d516d9dec20c3d276ce028ed5089ab1ce3dae902ea1d01cf853ed5cd5c0f85&c_id=5440885
+    Resolving ec.libsyn.com (ec.libsyn.com)... 68.232.34.133
+    Connecting to ec.libsyn.com (ec.libsyn.com)|68.232.34.133|:80... connected.
+    HTTP request sent, awaiting response... 200 OK
+    Length: 53173384 (51M) [audio/mpeg]
+    Saving to: `/media/usb32g-1/annex/musikk/.git/annex/tmp/URL--http&c%%traffic.libsyn.com%geologicpodcast%GeologicPodcast302-Feb28-13.mp3'
+
+    100%[==================================================================================================================================================================>] 53,173,384  3.50M/s   in 45s
+
+    2013-07-04 14:08:47 (1.13 MB/s) - `/media/usb32g-1/annex/musikk/.git/annex/tmp/URL--http&c%%traffic.libsyn.com%geologicpodcast%GeologicPodcast302-Feb28-13.mp3' saved [53173384/53173384]
+
+    (checksum...)
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/tmp/3970: rename: does not exist (No such file or directory)
+    failed
+    (Recording state in git...)
+    git-annex: addurl: 1 failed
+    $
+
+git-annex now believes that the file is stored locally, but an fsck shows how things really are:
+
+    $ ga fsck
+    fsck GeologicPodcast02-Feb21-07.mp3 ok
+    fsck GeologicPodcast03-Feb28-07.mp3 ok
+    [... Delete 35 lines ...]
+    fsck GeologicPodcast301-Feb22-13.mp3 ok
+    fsck GeologicPodcast302-Feb28-13.mp3 (fixing location log)
+      ** Based on the location log, GeologicPodcast302-Feb28-13.mp3
+      ** was expected to be present, but its content is missing.
+    failed
+    fsck GeologicPodcast303-Mar07-13.mp3 ok
+    fsck GeologicPodcast303.1_Fancast6-Mar09-13.mp3 ok
+    [... Delete 16 lines ...]
+    fsck GeologicPodcast72-Jul03-08.mp3 ok
+    (Recording state in git...)
+    git-annex: fsck: 3 failed
+    $
+
+After this fsck, everything is OK again; the location log is correct and "get" from this URL works.
+
+The file data didn't exist locally (it's stored on another disk) when doing this, but I also experimented what would happen if the file data did exist:
+
+    $ rm GeologicPodcast297-Jan24-13.mp3
+    $ wget http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3
+    --2013-07-04 14:35:15--  http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3
+    Resolving traffic.libsyn.com (traffic.libsyn.com)... 204.16.245.39
+    Connecting to traffic.libsyn.com (traffic.libsyn.com)|204.16.245.39|:80... connected.
+    HTTP request sent, awaiting response... 302 Found
+    Location: http://hwcdn.libsyn.com/p/9/d/f/9df13b1a6d622c46/GeologicPodcast297-Jan24-13.mp3?c_id=5341445&expiration=1372945406&hwt=476d03abba40d71119011bf7cb51f68a [following]
+    --2013-07-04 14:35:16--  http://hwcdn.libsyn.com/p/9/d/f/9df13b1a6d622c46/GeologicPodcast297-Jan24-13.mp3?c_id=5341445&expiration=1372945406&hwt=476d03abba40d71119011bf7cb51f68a
+    Resolving hwcdn.libsyn.com (hwcdn.libsyn.com)... 69.16.175.42, 69.16.175.10
+    Connecting to hwcdn.libsyn.com (hwcdn.libsyn.com)|69.16.175.42|:80... connected.
+    HTTP request sent, awaiting response... 200 OK
+    Length: 49299974 (47M) [audio/mpeg]
+    Saving to: ‘GeologicPodcast297-Jan24-13.mp3’
+
+    100%[===========================================================================================================================================>] 49,299,974  5.88MB/s   in 30s
+
+    $ ga add
+    add GeologicPodcast297-Jan24-13.mp3 (checksum...) ok
+    (Recording state in git...)
+    $ ga addurl --pathdepth=3 http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3
+
+At this stage, the data for this .mp3 file exist locally, but git-annex is either unaware of it, or it insists on verifying the data. Anyhow, it downloads the file:
+
+    $ ga addurl --pathdepth=3 http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3
+    addurl  (downloading http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3 ...) --2013-07-04 14:42:40--  http://traffic.libsyn.com/geologicpodcast/GeologicPodcast297-Jan24-13.mp3
+    Resolving traffic.libsyn.com (traffic.libsyn.com)... 204.16.245.39
+    Connecting to traffic.libsyn.com (traffic.libsyn.com)|204.16.245.39|:80... connected.
+    HTTP request sent, awaiting response... 302 Found
+    Location: http://ec.libsyn.com/p/9/d/f/9df13b1a6d622c46/GeologicPodcast297-Jan24-13.mp3?d13a76d516d9dec20c3d276ce028ed5089ab1ce3dae902ea1d01cf853ed5cc54b707&c_id=5341445 [following]
+    --2013-07-04 14:42:41--  http://ec.libsyn.com/p/9/d/f/9df13b1a6d622c46/GeologicPodcast297-Jan24-13.mp3?d13a76d516d9dec20c3d276ce028ed5089ab1ce3dae902ea1d01cf853ed5cc54b707&c_id=5341445
+    Resolving ec.libsyn.com (ec.libsyn.com)... 68.232.34.133
+    Connecting to ec.libsyn.com (ec.libsyn.com)|68.232.34.133|:80... connected.
+    HTTP request sent, awaiting response... 206 Partial Content
+    Length: 49299974 (47M), 48727654 (46M) remaining [audio/mpeg]
+    Saving to: `/media/usb32g-1/annex/musikk/.git/annex/tmp/URL--http&c%%traffic.libsyn.com%geologicpodcast%GeologicPodcast297-Jan24-13.mp3'
+
+    100%[====================================================================================================================================================================>] 49,299,974  2.07M/s   in 88s
+
+    2013-07-04 14:44:10 (538 KB/s) - `/media/usb32g-1/annex/musikk/.git/annex/tmp/URL--http&c%%traffic.libsyn.com%geologicpodcast%GeologicPodcast297-Jan24-13.mp3' saved [49299974/49299974]
+
+    (checksum...)
+    git-annex: /media/usb32g-1/annex/musikk/.git/annex/objects/gp/7Z/SHA256-s49299974--ff6758202d7168a0548b004d0c6e79a095b7738f442aa14d2603665914bee7e0/SHA256-s49299974--ff6758202d7168a0548b004d0c6e79a095b7738f442aa14d2603665914bee7e0: rename: does not exist (No such file or directory)
+    failed
+    (Recording state in git...)
+    git-annex: addurl: 1 failed
+    2013-07-04 14:44:11 sunny@dg-vbox:/media/usb32g-1/annex/musikk/podcast/Geologic Podcast (master)
+    $
+
+The error message appears again, but because the data did exist from before, git-annex fsck has nothing to complain about:
+
+    $ ga fsck
+    [...]
+    fsck GeologicPodcast297-Jan24-13.mp3 (checksum...) ok
+    [...]
+    2013-07-04 14:44:33 sunny@dg-vbox:/media/usb32g-1/annex/musikk/podcast/Geologic Podcast (master)
+    $
+
+### What version of git-annex are you using? On what operating system?
+
+v4.20130627 Linux i386 and AMD64. Both versions behave the same way. Tested on two computers:
+
+Computer #1 (AMD64 version):
+
+    $ uname -a
+    Linux dg-vbox 3.8.0-19-generic #30-Ubuntu SMP Wed May 1 16:35:23 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
+    $ lsb_release -a
+    No LSB modules are available.
+    Distributor ID: LinuxMint
+    Description:    Linux Mint 15 Olivia
+    Release:        15
+    Codename:       olivia
+
+Computer #2 (i386 version):
+
+    $ uname -a
+    Linux linode 2.6.39.1-linode34 #1 SMP Tue Jun 21 10:29:24 EDT 2011 i686 GNU/Linux
+    $ lsb_release -a
+    Distributor ID: Ubuntu
+    Description:    Ubuntu 10.04.4 LTS
+    Release:        10.04
+    Codename:       lucid
+    No LSB modules are available.
+
+Also tested with v4.20130601, same thing happens.
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+All interesting transcripts are posted above with cruft removed.
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/hGetContents:_user_error/comment_5_f80bce48c3f96b0cd6892af43ee88a96._comment b/doc/bugs/hGetContents:_user_error/comment_5_f80bce48c3f96b0cd6892af43ee88a96._comment
new file mode 100644
index 000000000..0d5bf0f52
--- /dev/null
+++ b/doc/bugs/hGetContents:_user_error/comment_5_f80bce48c3f96b0cd6892af43ee88a96._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://m-f-k.myopenid.com/"
+ ip="84.138.125.150"
+ subject="comment 5"
+ date="2013-07-04T15:24:51Z"
+ content="""
+No, I can't.  The kernel is handled by strato. :(
+"""]]
diff --git a/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_6_76b936263e82ca6c415a16ed57e770b4._comment b/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_6_76b936263e82ca6c415a16ed57e770b4._comment
new file mode 100644
index 000000000..919027842
--- /dev/null
+++ b/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_6_76b936263e82ca6c415a16ed57e770b4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
+ nickname="Jimmy"
+ subject="comment 6"
+ date="2013-07-04T08:32:54Z"
+ content="""
+Just wondering if its because I have gnupg 1.1.0 on the Lion build machine thats causing the problem. I could try installing gnupg 2.0.19 if that will fix the problem. What version of gnupg is on the Mountain Lion build?
+"""]]
diff --git a/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex.mdwn b/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex.mdwn
new file mode 100644
index 000000000..436b4c48d
--- /dev/null
+++ b/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex.mdwn
@@ -0,0 +1,17 @@
+### Please describe the problem.
+I tried to setup a fresh local repository and got an error:
+> Internal Server Error
+> user error (git ["--git-dir=/home/jana/Bilder/Fotos/.git","--work-tree=/home/jana/Bilder/Fotos","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 128)
+
+When clicking on "View logs", I get the following error:
+
+> Internal Server Error
+> internal liftAnnex
+
+### What steps will reproduce the problem?
+1. Run git-annex from programs menu
+2. Click "Make repository"
+
+### What version of git-annex are you using? On what operating system?
+- git-annex 4.20130627 on Ubuntu 13.10, installed from debian unstable (sid) repository.
+- git version 1.8.1.2
diff --git a/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex/comment_1_57547f9a480df2c3f7b3997b0fb7039a._comment b/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex/comment_1_57547f9a480df2c3f7b3997b0fb7039a._comment
new file mode 100644
index 000000000..44807b62f
--- /dev/null
+++ b/doc/bugs/view_logs_fails:_Internal_Server_Error__internal_liftAnnex/comment_1_57547f9a480df2c3f7b3997b0fb7039a._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://cweiske.de/"
+ nickname="cweiske"
+ subject="comment 1"
+ date="2013-07-04T20:20:15Z"
+ content="""
+Running git-annex from the command line shows me:
+
+> fatal: unable to auto-detect email address (got 'jana@sybo.(none)')
+
+Setting user.email and user.name fixed the error.
+"""]]
diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_20_1d47f3e1b9f0081649cedae4288bac83._comment b/doc/design/assistant/blog/day_288__success_stories/comment_20_1d47f3e1b9f0081649cedae4288bac83._comment
new file mode 100644
index 000000000..501cf561f
--- /dev/null
+++ b/doc/design/assistant/blog/day_288__success_stories/comment_20_1d47f3e1b9f0081649cedae4288bac83._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 20"
+ date="2013-07-04T12:41:35Z"
+ content="""
+I'm using git-annex to make videos, pictures and music available on all my devices (windows, android, linux). It has saved me on trips with my 2yr daughter when she's had meltdowns; I have her favorite movie ready. I quickly exceeded the free dropbox quota and git-annex has replaced the need and gives me greater confidence and control over my data. Thank you!
+"""]]
diff --git a/doc/design/assistant/blog/day_288__success_stories/comment_21_31d3f58cad83cb1ecc4821a15ca258d8._comment b/doc/design/assistant/blog/day_288__success_stories/comment_21_31d3f58cad83cb1ecc4821a15ca258d8._comment
new file mode 100644
index 000000000..99c6c14af
--- /dev/null
+++ b/doc/design/assistant/blog/day_288__success_stories/comment_21_31d3f58cad83cb1ecc4821a15ca258d8._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm0sGxsiJ7yj5iQsF-A5tEl6XKOGQieqEo"
+ nickname="Matthew"
+ subject="Writing papers"
+ date="2013-07-04T15:32:24Z"
+ content="""
+I'm a graduate student, so I write a lot.  I started using git to manage my latex sources a while ago, but I didn't like gumming up my repository with a bunch of figures (large binaries). I was constantly forgetting to scp the latest versions of my figures from here to there (as I do my work on a number of different computers.)  Git annex gives me a good way to version the figures and manage them with the same tool I'm using for the text.  
+
+My use case seems pretty far from typical, judging from the other comments here, so I thought I should add my two cents!  I'm constantly trying to sell this approach to my fellow students.
+
+Also, I'm going to slip in a plug for another great Haskell project here -- Pandoc. I work with people who suggest changes to my drafts, but only using Word's \"Track Changes\".  So now I'm generating Word docs from Pandoc markdown for my collaborators to edit.  When it comes time to publish, I can convert my markdown to latex and clean up the formatting.  
+
+Why are all the really cool projects written in Haskell? :)  
+"""]]
diff --git a/doc/design/assistant/blog/day_291__--all/comment_1_eaa9fef19a035bef9c439e87d47c834b._comment b/doc/design/assistant/blog/day_291__--all/comment_1_eaa9fef19a035bef9c439e87d47c834b._comment
new file mode 100644
index 000000000..60cb4abb0
--- /dev/null
+++ b/doc/design/assistant/blog/day_291__--all/comment_1_eaa9fef19a035bef9c439e87d47c834b._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
+ nickname="John"
+ subject="comment 1"
+ date="2013-07-03T22:16:32Z"
+ content="""
+Excellent stuff!  Another thing I'd like to see is that I find myself doing the following all the time:
+
+    git annex copy --to titan --not --in titan
+
+Meaning: copy everything to titan that it doesn't already have.  This operation is very quick.  But I write just:
+
+    git annex copy --to titan
+
+This operation is extremely slow, since it appears to scan through every file in the repository.  Is there a way to have the latter imply the former?  I wouldn't ever want to copy a file that it already has anyway...
+
+"""]]
diff --git a/doc/forum/USB_backup_with_files_visible/comment_5_5e10cffe8465ea4ecaa71c03a4c29ea4._comment b/doc/forum/USB_backup_with_files_visible/comment_5_5e10cffe8465ea4ecaa71c03a4c29ea4._comment
new file mode 100644
index 000000000..20853a4a0
--- /dev/null
+++ b/doc/forum/USB_backup_with_files_visible/comment_5_5e10cffe8465ea4ecaa71c03a4c29ea4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 5"
+ date="2013-07-04T05:11:46Z"
+ content="""
+Oh!  git annex merge is very nice.
+"""]]
diff --git a/doc/install/Android/comment_3_82c7cb31d19d4e18ca5548da5ca19a79._comment b/doc/install/Android/comment_3_82c7cb31d19d4e18ca5548da5ca19a79._comment
new file mode 100644
index 000000000..c049bfcab
--- /dev/null
+++ b/doc/install/Android/comment_3_82c7cb31d19d4e18ca5548da5ca19a79._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 3"
+ date="2013-07-04T15:06:36Z"
+ content="""
+Is it safe to upgrade by installing a daily build over an existing version? Will that overwrite any settings? 
+"""]]
diff --git a/doc/install/Android/comment_4_cebaa8ee5bbed27d9b2d032ca7bdec6e._comment b/doc/install/Android/comment_4_cebaa8ee5bbed27d9b2d032ca7bdec6e._comment
new file mode 100644
index 000000000..2745044a4
--- /dev/null
+++ b/doc/install/Android/comment_4_cebaa8ee5bbed27d9b2d032ca7bdec6e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.4.193"
+ subject="comment 4"
+ date="2013-07-05T00:53:00Z"
+ content="""
+It is safe to re-install, all your data and settings are stored in /sdcard and will not be touched, even if you delete the app!
+"""]]
diff --git a/doc/tips/using_the_web_as_a_special_remote.mdwn b/doc/tips/using_the_web_as_a_special_remote.mdwn
index 24ded90c0..3ce02a56a 100644
--- a/doc/tips/using_the_web_as_a_special_remote.mdwn
+++ b/doc/tips/using_the_web_as_a_special_remote.mdwn
@@ -53,5 +53,5 @@ number takes that many paths from the end.
 	addurl example.com_videos_2012_01_video.mpeg (downloading http://example.com/videos/2012/01/video.mpeg)
 	# git annex addurl http://example.com/videos/2012/01/video.mpeg --pathdepth=2
 	addurl 2012_01_video.mpeg (downloading http://example.com/videos/2012/01/video.mpeg)
-	# git annex addurl http://example.com/videos/2012/video.mpeg --pathdepth=-2
+	# git annex addurl http://example.com/videos/2012/01/video.mpeg --pathdepth=-2
 	addurl 01_video.mpeg (downloading http://example.com/videos/2012/01/video.mpeg)