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

20 files changed, 299 insertions, 3 deletions

diff --git a/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment
new file mode 100644
index 000000000..435040703
--- /dev/null
+++ b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314"
+ nickname="BehemothTheCat"
+ subject="push fails"
+ date="2015-02-14T00:11:40Z"
+ content="""
+These instructions don't work for me, unfortunately.
+
+This step:
+
+    git push origin master git-annex
+
+results in:
+
+    To ssh://my.server.com/home/itz/git/annex.git
+     ! [rejected]        git-annex -> git-annex (non-fast-forward)
+    error: failed to push some refs to 'ssh://my.server.com/home/itz/git/annex.git'
+    hint: Updates were rejected because a pushed branch tip is behind its remote
+    hint: counterpart. Check out this branch and integrate the remote changes
+    hint: (e.g. 'git pull ...') before pushing again.
+    hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+
+Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian, same on local and remote)
+
+And yes, I did a pull on the master branch first.  Afraid to do anything
+with the git-annex branch without explicit instruction.
+
+"""]]
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment
new file mode 100644
index 000000000..7539e9b1f
--- /dev/null
+++ b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4"
+ nickname="Andreas"
+ subject="comment 8"
+ date="2015-02-16T17:32:32Z"
+ content="""
+Sorry, missed the link. The recent version from the tarball fixes the issue for me.
+"""]]
diff --git a/doc/bugs/weird_entry_in_process_list.mdwn b/doc/bugs/weird_entry_in_process_list.mdwn
new file mode 100644
index 000000000..e09ad8140
--- /dev/null
+++ b/doc/bugs/weird_entry_in_process_list.mdwn
@@ -0,0 +1,39 @@
+### Please describe the problem.
+
+The standalone linux binaries do not show up as `git-annex` in the process list, but as `ld-linux-x86-64` - it's pretty confusing!
+
+### What steps will reproduce the problem?
+
+Install the standalone binaries from downloads.kitenet.net, run git-annex.
+
+### What version of git-annex are you using? On what operating system?
+
+Today's snapshot from downloads.k.n.
+
+### 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
+root@koumbit-mp-test:/var/isuma/media/video# top -b  -n 1 | head -10
+top - 14:00:09 up 15 days, 23:25,  4 users,  load average: 1.18, 1.26, 1.34
+Tasks: 216 total,   1 running, 213 sleeping,   0 stopped,   2 zombie
+Cpu(s):  0.4%us,  0.1%sy,  0.0%ni, 99.3%id,  0.2%wa,  0.0%hi,  0.0%si,  0.0%st
+Mem:   6122044k total,  5469364k used,   652680k free,   321080k buffers
+Swap:  2928632k total,        0k used,  2928632k free,  4009592k cached
+
+  PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
+28261 root      20   0  4528  652  528 D   79  0.0   0:01.28 ld-linux-x86-64
+ 1381 root      20   0  126m  13m 4060 S    2  0.2 190:25.64 Xorg
+    1 root      20   0  8356  812  684 S    0  0.0   0:05.50 init
+root@koumbit-mp-test:/var/isuma/media/video# ps axf | grep annex
+ 9861 pts/2    S+     0:00                  |   \_ git annex add hd high high~ ipod ipod~ large low mp4_sd raw small wc xlarge
+ 9862 pts/2    Sl+    3:50                  |       \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git-annex/git-annex add hd high high~ ipod ipod~ large low mp4_sd raw small wc xlarge
+ 9878 pts/2    S+     0:00                  |           \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. check-attr -z --stdin annex.backend annex.numcopies --
+ 9881 pts/2    S+     0:01                  |           \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. cat-file --batch
+ 9882 pts/2    S+     0:00                  |           \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. cat-file --batch
+28293 pts/2    R+     0:00                  |           \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/sha256sum/sha256sum .git/annex/misctmp/videonew9862
+# End of transcript or log.
+"""]]
+
+couldn't it alter its process name to make this a little more intuitive? This is especially problematic because i am trying to hook git-annex into Puppet and Facter, which require me to guess where the various git-annex repos are on the server. The way i was doing that so far was with `lsof -c 'git-annex' -F0tn`, which is obviously failing under those circumstances.... Unless there's a better way to find those repos across the system? I assume there's a git-annex assistant running here... --[[anarcat]]
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index 3c9de2b02..03646c5fd 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
 Help me prioritize my work: What special remote would you most like
 to use with the git-annex assistant?
 
-[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 35 "Google Drive"]]
+[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 36 "Google Drive"]]
 
 This poll is ordered with the options I consider easiest to build
 listed first. Mostly because git-annex already supports them and they
diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn
index bd0cb81a0..d22c2ba5e 100644
--- a/doc/direct_mode.mdwn
+++ b/doc/direct_mode.mdwn
@@ -104,6 +104,14 @@ command run on that work tree, and then updating the real work
 tree to reflect any changes staged or committed by the git command,
 with appropriate handling of the direct mode files.
 
+## undoing changes in direct mode
+
+There is also the `undo` command to do the equivalent of the above revert in a simpler way. Say you made a change in direct mode, the assistant dutifully committed it and you realise your mistake, you can try:
+
+    git annex undo file
+
+to revert the last change to `file`. Note that you can use the `--depth` flag to revert earlier versions of the file.
+
 ## forcing git to use the work tree in direct mode
 
 This is for experts only. You can lose data doing this, or check enormous
diff --git a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn b/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn
new file mode 100644
index 000000000..f191503e3
--- /dev/null
+++ b/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn
@@ -0,0 +1,33 @@
+My copy of *git-annex* refuses to sync all, namely when I try it I get the following error
+
+    $ git annex sync --content --all
+    git-annex: unrecognized option `--all'
+
+    Usage: git-annex sync [REMOTE ...] [option ...]
+        --content  also transfer file contents
+
+    To see additional options common to all commands, run: git annex help options
+
+This contradicts the advice on [preferred content](http://git-annex.branchable.com/preferred_content/) set out under **difference: unused**, 
+and I cannot see any other options in my man page that would address the lack of this option.
+
+The problem I am trying to solve is that I wish to preserve all history on the backup drives.  Namely, if I do the following
+
+    touch test-of-annex-backup.txt
+    git annex add test-of-annex-backup.txt
+    git commit --message='test: Create empty test-of-annex-backup.txt file'
+    git annex edit test-of-annex-backup.txt
+    echo "This line creates version 2 of this file" > test-of-annex-backup.txt
+    git annex add test-of-annex-backup.txt
+    git commit --message='test: Create version 2 of test-of-annex-backup.txt'
+    git annex sync --content --all
+
+I expect to see 2 copies of `test-of-annex-backup.txt` be copied to each accessible annex repository in the `backup` group
+
+I tried googling for `"git annex sync --content --all"`, but I only find pages telling me that this is what I should use, and none saying the option has been deprecated.
+
+I am very confused, as this seems to me an almost stereotypical use of *git-annex*, and yet I cannot see how to do it
+
+thanks
+
+Andrew
diff --git a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn
new file mode 100644
index 000000000..8bcc1dc78
--- /dev/null
+++ b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn
@@ -0,0 +1,77 @@
+Step by step:
+
+git annex add ./hugePictureFolder<br>
+// no it's to big and taking to long, let's not do this<br>
+CRTL+D<br>
+git annex --force drop ./hugePictureFolder<br>
+git status<br>
+fatal: bad default revision 'HEAD'<br>
+git reset --hard git-annex<br>
+git status // ok<br>
+ls <br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 000<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 001<br>
+drwxr-xr-x 11 rolas rolas      4096 Vas 16 11:40 002<br>
+drwxr-xr-x 12 rolas rolas      4096 Vas 16 11:40 003<br>
+drwxr-xr-x  6 rolas rolas      4096 Vas 16 11:40 004<br>
+drwxr-xr-x 12 rolas rolas      4096 Vas 16 11:40 005<br>
+drwxr-xr-x 11 rolas rolas      4096 Vas 16 11:40 006<br>
+drwxr-xr-x 13 rolas rolas      4096 Vas 16 11:40 007<br>
+drwxr-xr-x  6 rolas rolas      4096 Vas 16 11:40 008<br>
+drwxr-xr-x 13 rolas rolas      4096 Vas 16 11:40 009<br>
+drwxr-xr-x 14 rolas rolas      4096 Vas 16 11:40 00a<br>
+drwxr-xr-x 16 rolas rolas      4096 Vas 16 11:40 00b<br>
+drwxr-xr-x 11 rolas rolas      4096 Vas 16 11:40 00c<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 00d<br>
+drwxr-xr-x 20 rolas rolas      4096 Vas 16 11:40 00e<br>
+drwxr-xr-x 18 rolas rolas      4096 Vas 16 11:40 00f<br>
+drwxr-xr-x 14 rolas rolas      4096 Vas 16 11:40 010<br>
+drwxr-xr-x 11 rolas rolas      4096 Vas 16 11:40 011<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 012<br>
+drwxr-xr-x 12 rolas rolas      4096 Vas 16 11:40 013<br>
+drwxr-xr-x  7 rolas rolas      4096 Vas 16 11:40 014<br>
+drwxr-xr-x 16 rolas rolas      4096 Vas 16 11:40 015<br>
+drwxr-xr-x  7 rolas rolas      4096 Vas 16 11:40 016<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 017<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 018<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 019<br>
+drwxr-xr-x  8 rolas rolas      4096 Vas 16 11:40 01a<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 01b<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 01c<br>
+drwxr-xr-x  8 rolas rolas      4096 Vas 16 11:40 01d<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 01e<br>
+drwxr-xr-x 11 rolas rolas      4096 Vas 16 11:40 01f<br>
+drwxr-xr-x 15 rolas rolas      4096 Vas 16 11:40 020<br>
+drwxr-xr-x 13 rolas rolas      4096 Vas 16 11:40 021<br>
+drwxr-xr-x  5 rolas rolas      4096 Vas 16 11:40 022<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 023<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 024<br>
+drwxr-xr-x 12 rolas rolas      4096 Vas 16 11:40 025<br>
+drwxr-xr-x  8 rolas rolas      4096 Vas 16 11:40 026<br>
+drwxr-xr-x 12 rolas rolas      4096 Vas 16 11:40 027<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 028<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 029<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 02a<br>
+drwxr-xr-x  9 rolas rolas      4096 Vas 16 11:40 02b<br>
+drwxr-xr-x  6 rolas rolas      4096 Vas 16 11:40 02c<br>
+drwxr-xr-x  7 rolas rolas      4096 Vas 16 11:40 02d<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 02e<br>
+drwxr-xr-x  5 rolas rolas      4096 Vas 16 11:40 02f<br>
+drwxr-xr-x 13 rolas rolas      4096 Vas 16 11:40 030<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 031<br>
+drwxr-xr-x 10 rolas rolas      4096 Vas 16 11:40 032<br>
+...<br>
+...<br>
+<br>
+What did I Do? Can I do CTRL+D? If yes, what should I do to recover?<br>
+<br>
+Thanks<br>
+Rolandas<br>
+ <br>
+$ git --version<br>
+git version 2.3.0<br>
+<br>
+$ git annex version<br>
+git-annex version: 5.20140412ubuntu1<br>
+<br>
+
diff --git a/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment b/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment
new file mode 100644
index 000000000..f333c2bc0
--- /dev/null
+++ b/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkMTPqZZWoz396ABpx6nh3osxKQCFaSW6M"
+ nickname="Mark"
+ subject="comment 8"
+ date="2015-02-13T13:55:21Z"
+ content="""
+Ah, ok. So it doesn't cause any issues that the host/* remote branches will also keep getting swapped from one repository to another? The operation of `git annex sync` is sufficiently (and happily) opaque to me, so I was concerned that this might break some of its basic assumptions.
+"""]]
diff --git a/doc/forum/optimising_lookupkey.mdwn b/doc/forum/optimising_lookupkey.mdwn
new file mode 100644
index 000000000..5a7da7383
--- /dev/null
+++ b/doc/forum/optimising_lookupkey.mdwn
@@ -0,0 +1,13 @@
+to work around [[forum/original_filename_on_s3/]], i need to get the key from a file, and i'm not within the git-annex process. i know there's `git annex lookupkey $FILE`, but that incurs significant overhead because the whole git annex runtime needs to fire up. in my tests, this takes around 25ms on average.
+
+could i optimise this by simply doing a `readlink` call on the git checkout? it sure looks like `readlink | basename` is all I really need, and that can probably be done below 10ms (4ms in my tests). how reliable are those links anyways, and is that what lookupkey does?
+
+similarly, i wonder if it's safe to bypass git-annex and talk straight with git to extract location tracking? i can jump from 90ms to below 10ms for such requests if I turn `git annex find <file>` into the convoluted:
+
+<pre>
+git annex lookupkey $file
+printf $key | md5sum
+git cat-file -p refs/heads/git-annex:$hash/${key}.log
+</pre>
+
+thanks. --[[anarcat]]
diff --git a/doc/forum/root_assistant__63__.mdwn b/doc/forum/root_assistant__63__.mdwn
new file mode 100644
index 000000000..54b872944
--- /dev/null
+++ b/doc/forum/root_assistant__63__.mdwn
@@ -0,0 +1,3 @@
+How safe (or not) is it to run the assistant as root?
+
+If not safe, what would be a good way to sync directories like /usr/local ?
diff --git a/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment b/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment
new file mode 100644
index 000000000..80db7abcc
--- /dev/null
+++ b/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="why md5sum?"
+ date="2015-02-13T15:59:46Z"
+ content="""
+why the extra processing to generate the hashing directories?
+
+we already have a hash here, for example, `SHA256E-s8242375--5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3.ogg` has a loon `5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3` hash. Why not use the first characters of that? This is will not change for a give file, and has a higher chance of generating collisions (which is a good thing here, because we can reuse directories).
+
+In other words, why aren't the hashes of `SHA256E-s8242375--5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3.ogg` simply `5f8/249`? --[[anarcat]]
+"""]]
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn
index 59af40e0b..1b816599e 100644
--- a/doc/special_remotes/S3.mdwn
+++ b/doc/special_remotes/S3.mdwn
@@ -68,4 +68,4 @@ the S3 remote.
   then use the same bucket.
 
 * `x-amz-meta-*` are passed through as http headers when storing keys
-  in S3.
+  in S3. see [the Internet Archive S3 interface documentation](https://archive.org/help/abouts3.txt) for example headers.
diff --git a/doc/special_remotes/directory.mdwn b/doc/special_remotes/directory.mdwn
index 6279024ec..5584f31f3 100644
--- a/doc/special_remotes/directory.mdwn
+++ b/doc/special_remotes/directory.mdwn
@@ -6,7 +6,7 @@ you want to use to sneakernet files between systems (possibly with
 the drive's mountpoint as a directory remote.
 
 Note that directory remotes have a special directory structure
-(by design, the same as the \[[rsync|rsync]] remote).
+(by design, the same as the [[rsync|rsync]] remote).
 If you just want two copies of your repository with the files "visible"
 in the tree in both, the directory special remote is not what you want.
 Instead, you should use a regular `git clone` of your git-annex repository.
diff --git a/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment b/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment
new file mode 100644
index 000000000..7636b7702
--- /dev/null
+++ b/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="spurious changes in metadata.db"
+ date="2015-02-15T05:03:20Z"
+ content="""
+note that metadata.db seems to change even though no change was performed on the library. i filed a [bug report upstream](https://bugs.launchpad.net/calibre/+bug/1422058) to try and figure out what is going on here. -- [[anarcat]]
+"""]]
diff --git a/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment b/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment
new file mode 100644
index 000000000..de485fb73
--- /dev/null
+++ b/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="undo to the rescue"
+ date="2015-02-15T05:52:58Z"
+ content="""
+note: to avoid having too many such changes, i end up using [[todo/direct_mode_undo]] quite often.
+"""]]
diff --git a/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment b/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment
new file mode 100644
index 000000000..9cca4e2fa
--- /dev/null
+++ b/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="BojanNikolic"
+ subject="Publishing using rsync/directory layout"
+ date="2015-02-16T10:04:41Z"
+ content="""
+Is it possible to easily do the same with rsync/directory layout of the special remote? These have prefixes which are not shown when doing git annex lookupkey
+"""]]
diff --git a/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn b/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn
new file mode 100644
index 000000000..146b0622b
--- /dev/null
+++ b/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn
@@ -0,0 +1,14 @@
+ I'm using git-annex 5.20150205-gbf9058a and just used the WebApp to create a new remote SSH repo, and thought I'd try the encrypted option.
+
+It give me three GPG keys to choose from (all valid keys) but only displayed the email addresses which were all identical so I couldn't tell which was which.
+
+I then clicked the first key selection button, hoping it would display more info but it seemed to start doing things immediately. It requested the GPG passphrase which I cancelled but it was still doing things, and worse it wasn't clear what state the repo was in (encrypted or not), so I deleted it and started again (it's fine now).
+
+The passphrase dialog box does display the key fingerprint, but it's then too late to alter the key selection.
+
+Request: Could the WebApp always display the fingerprint after the email address?
+
+Some clarity on what happens when you cancel would be nice too.
+
+Thanks
+Giovanni
diff --git a/doc/todo/direct_mode_undo.mdwn b/doc/todo/direct_mode_undo.mdwn
index 926222d97..82c2e4ab8 100644
--- a/doc/todo/direct_mode_undo.mdwn
+++ b/doc/todo/direct_mode_undo.mdwn
@@ -84,3 +84,5 @@ that touched files in that directory, and undo the changes to those files.
 
 Also, --depth could make undo look for an older commit than the most
 recent one to affect the specified file.
+
+See [[direct_mode]] for documentation about this feature.
diff --git a/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment
new file mode 100644
index 000000000..35e1b90b0
--- /dev/null
+++ b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="comment 1"
+ date="2015-02-15T05:46:01Z"
+ content="""
+> This way, if a file has a staged change, it gets committed, and then that commit is reverted, resulting in another commit. Which a later run of undo can in turn revert. If it didn't commit, the history about the staged change that was reverted would be lost.
+
+so far, my experience with this is that unstaged changes get dropped and the change that gets undoed is the last committed change. In other words, if i have:
+
+    $ git annex status
+    M file
+
+`git annex undo` is going to drop that modification and `git revert HEAD`. but maybe i got confused, in which care some of the documentation i just did in [[direct mode]] needs to be corrected. --[[anarcat]]
+"""]]
diff --git a/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment b/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment
new file mode 100644
index 000000000..1f300b881
--- /dev/null
+++ b/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ subject="sigh... nevermind"
+ date="2015-02-15T05:52:02Z"
+ content="""
+seems like i was wrong. i could have sworn i saw a committed file get unstaged. what i saw was:
+
+    $ git annex status
+    M file
+    $ git annex undo file
+    $ git annex status
+    ? file
+
+the thing is: the file was *removed* in a previous version, so i thought this was what it reverted to. i'm unsure as to why the file was marked as missing there - i ended up reverting from a backup (from another remote, by hand). after trying to reproduce this, i failed, so there may have been some PEBKAC in action again.
+
+this feature is so useful though, thanks for this. --[[anarcat]]
+"""]]