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

7 files changed, 58 insertions, 8 deletions

diff --git a/doc/bugs/Corrupted_.git__47__annex__47__index_when_running_assistant/comment_3_fa94d1b008a6c1663e40854edcd5504d._comment b/doc/bugs/Corrupted_.git__47__annex__47__index_when_running_assistant/comment_3_fa94d1b008a6c1663e40854edcd5504d._comment
new file mode 100644
index 000000000..6fbc820f8
--- /dev/null
+++ b/doc/bugs/Corrupted_.git__47__annex__47__index_when_running_assistant/comment_3_fa94d1b008a6c1663e40854edcd5504d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="eigengrau"
+ subject="comment 3"
+ date="2015-06-11T15:12:23Z"
+ content="""
+Thanks! FWIW I didn’t have any hard kernel lockups recently. I figure git replaces the index file atomically, and only after all objects have been written to the store? I guess a userland crash couldn’t be the cause either, in that case?
+
+What happens when you manually run git gc at an inopportune moment, seeing that it probably doesn’t know about the secondary index? In the logs, I saw mention of locks on individual refs. Is the whole repository also locked down when git-annex commits something, or could it happen that a manual git gc prunes away objects added by git-annex before it had a chance to write the tree and commit it to a ref?
+"""]]
diff --git a/doc/bugs/import_leaves_empty_directories_behind.mdwn b/doc/bugs/import_leaves_empty_directories_behind.mdwn
new file mode 100644
index 000000000..a95930dfb
--- /dev/null
+++ b/doc/bugs/import_leaves_empty_directories_behind.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+
+git annex import leaves empties directories behind.
+
+now maybe that's desired, but in this case, why are the *files* gone and not the directories?
+
+### What steps will reproduce the problem?
+
+<pre>
+mkdir -p /tmp/foo/bar
+touch /tmp/foo/bar/file
+git annex import /tmp/foo
+[ -d /tmp/foo/bar ] && echo 'fail: directory still there!'
+</pre>
+
+### What version of git-annex are you using? On what operating system?
+
+5.20141125
diff --git a/doc/bugs/wishlist:_git_annex_grep.mdwn b/doc/bugs/wishlist:_git_annex_grep.mdwn
deleted file mode 100644
index 78f41d990..000000000
--- a/doc/bugs/wishlist:_git_annex_grep.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-### Please describe the problem.
-
-inability to quickly grep locally present files
-
-### What steps will reproduce the problem?
-
-run "git annex grep"
-
diff --git a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment b/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment
new file mode 100644
index 000000000..ff649fe60
--- /dev/null
+++ b/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="juh"
+ subject="Thanks"
+ date="2015-06-11T15:51:53Z"
+ content="""
+Thanks for your comments. I am very interested in things people build on top of git-annex. I am looking forward to read more about these projects. 
+
+Interesting that both of you don't use the webapp or the assistant. It was the first thing I used and it was disappointing, so now I try out the commandline. 
+
+I understand that managing an amount of files way too big for ones notebook or desktop is one of the main use cases. And this is a use case I definitely will cover in the book, if I write it at all. 
+
+Still evaluating... 
+
+
+"""]]
diff --git a/doc/forum/s3_bandwidth_limitations_and_next_release.mdwn b/doc/forum/s3_bandwidth_limitations_and_next_release.mdwn
new file mode 100644
index 000000000..c1e67a8c0
--- /dev/null
+++ b/doc/forum/s3_bandwidth_limitations_and_next_release.mdwn
@@ -0,0 +1,7 @@
+Is there a way to set bandwidth limits for [[special_remotes/s3]]?
+
+From what i can see in the [[todo/credentials-less_access_to_s3]] patch, the `downloadUrl` function is used, does that mean that the `annex.web-download-command` is used? If that's the case, it's great because it means we can use the `--bwlimit` parameter in `wget` to limit transfers.
+
+But what about uploads? Are there limits there as well?
+
+I'll also abuse this forum to see if/when it will be possible to have a shiny new release to ship that amazing new feature? There seems to be sufficient stuff piled up in the unreleased changelog to warrant a release, no? :) --[[anarcat]]
diff --git a/doc/todo/git_annex_grep.mdwn b/doc/todo/git_annex_grep.mdwn
new file mode 100644
index 000000000..783654a78
--- /dev/null
+++ b/doc/todo/git_annex_grep.mdwn
@@ -0,0 +1,9 @@
+### Please describe the problem.
+
+inability to quickly grep locally present files
+
+### What steps will reproduce the problem?
+
+run "git annex grep"
+
+> i don't understand this request. just running `grep` will grep all the locally present files: sure there will be warnings, but you can use `2>/dev/null` to silence those. as for the suggested solution in comment, that greps for the filenames. please clarify the feature request here or this is [[invalid|done]]. --[[anarcat]]
diff --git a/doc/bugs/wishlist:_git_annex_grep/comment_1_890b3ecb679b941f9c0075ed360b203e._comment b/doc/todo/git_annex_grep/comment_1_890b3ecb679b941f9c0075ed360b203e._comment
index 30351c2ed..30351c2ed 100644
--- a/doc/bugs/wishlist:_git_annex_grep/comment_1_890b3ecb679b941f9c0075ed360b203e._comment
+++ b/doc/todo/git_annex_grep/comment_1_890b3ecb679b941f9c0075ed360b203e._comment