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

4 files changed, 26 insertions, 10 deletions

diff --git a/doc/bugs/git_annex_fork_bombs_on_gpg_file/comment_10_6e29b60cd77f3288e33ad270f95f410e._comment b/doc/bugs/git_annex_fork_bombs_on_gpg_file/comment_10_6e29b60cd77f3288e33ad270f95f410e._comment
new file mode 100644
index 000000000..0338219ac
--- /dev/null
+++ b/doc/bugs/git_annex_fork_bombs_on_gpg_file/comment_10_6e29b60cd77f3288e33ad270f95f410e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://me.tinco.nl/"
+ nickname="Tinco"
+ subject="comment 10"
+ date="2013-05-19T20:45:53Z"
+ content="""
+Alright! So first the issue was that gpg was asking for a passphrase. I fixed that by installing gpgtools for mac, but that one doesn't have a gpg executable, instead it has gpg2. I hadn't noticed that, so that's why it was saying 'resource vanished' without a proper error message, it simply couldn't find the gpg executable. I did ln -s /usr/local/bin/gpg2 /usr/local/bin/gpg, and now it's happily copying files. Thanks for helping me find out what was wrong!
+"""]]
diff --git a/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_3_eed7792f6142f3fc74d3c384bb16559b._comment b/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_3_eed7792f6142f3fc74d3c384bb16559b._comment
new file mode 100644
index 000000000..245ae7a06
--- /dev/null
+++ b/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_3_eed7792f6142f3fc74d3c384bb16559b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-05-19T20:56:25Z"
+ content="""
+For the record, there was a bug with XMPP and SRV records. This got fixed in time for the last release.
+"""]]
diff --git a/doc/forum/nntp__47__usenet_special_remote/comment_1_171a0b95b1f95cfd82073e88bdefaab9._comment b/doc/forum/nntp__47__usenet_special_remote/comment_1_171a0b95b1f95cfd82073e88bdefaab9._comment
new file mode 100644
index 000000000..ff14f6f2e
--- /dev/null
+++ b/doc/forum/nntp__47__usenet_special_remote/comment_1_171a0b95b1f95cfd82073e88bdefaab9._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-05-19T20:49:06Z"
+ content="""
+I think it's a neat idea. I can't see using it for my own data due to retention, but if I had a use case where I wanted to spread data around and didn't care if it vanished after X months, I can see using it.
+
+I think you should publish the details, if getting it to a state others can use is not too much work,
+"""]]
diff --git a/doc/special_remotes/bup/comment_5_61b32f9ee00e6016443a1cf10273959c._comment b/doc/special_remotes/bup/comment_5_61b32f9ee00e6016443a1cf10273959c._comment
deleted file mode 100644
index 66a43965a..000000000
--- a/doc/special_remotes/bup/comment_5_61b32f9ee00e6016443a1cf10273959c._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 5"
- date="2013-03-13T16:05:57Z"
- content="""
-I don't plan to support creating bup spefial remotes in the assistant, currently. Of course the assistant can use bup special remotes you set up.
-
-Your two bup repos would be synced using bup-split.
-"""]]