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

3 files changed, 24 insertions, 0 deletions

diff --git a/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_a6c8200184dab2ff3658843d412e5e1b._comment b/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_a6c8200184dab2ff3658843d412e5e1b._comment
new file mode 100644
index 000000000..f2d7196ef
--- /dev/null
+++ b/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_a6c8200184dab2ff3658843d412e5e1b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ subject="comment 2"
+ date="2015-09-21T21:22:22Z"
+ content="""
+I am not aware of any problems other than the noise, but I think it's significant noise because it's marked with 'WARNING' in block capitals and this makes the user worry that something might have gone wrong with their precious git-annex data, and there's no indication it can be automatically recovered from.
+
+Would you accept a patch to your fork of git-remote-gcrypt, since the original author is inactive?
+"""]]
diff --git a/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_4_e457acce4d9f56ad4682c6746a1c4cdb._comment b/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_4_e457acce4d9f56ad4682c6746a1c4cdb._comment
new file mode 100644
index 000000000..660db6505
--- /dev/null
+++ b/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_4_e457acce4d9f56ad4682c6746a1c4cdb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://mathstuf.id.fedoraproject.org/"
+ nickname="mathstuf"
+ subject="comment 4"
+ date="2015-09-21T21:24:26Z"
+ content="""
+Ah, indeed. ssh_config(5) basically says that \"*\" should be used to have the meaning I intended. Looking at the history of the file in my dotfiles repo has it coming from almost 4 years ago. I either copied some bogus stanza from online or misread the docs at that time. Feel free to close :) .
+"""]]
diff --git a/doc/tips/using_the_web_as_a_special_remote/comment_12_1704dcd7fc94432af5aa18459495c9ab._comment b/doc/tips/using_the_web_as_a_special_remote/comment_12_1704dcd7fc94432af5aa18459495c9ab._comment
new file mode 100644
index 000000000..522f8c63f
--- /dev/null
+++ b/doc/tips/using_the_web_as_a_special_remote/comment_12_1704dcd7fc94432af5aa18459495c9ab._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="how to get access to urls needing authentication without private info in the url"
+ date="2015-09-22T14:05:45Z"
+ content="""
+wget by default consults ~/.netrc where you could specify your account information (man netrc for more detail)
+"""]]