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

4 files changed, 39 insertions, 0 deletions

diff --git a/doc/bugs/More_build_oddities_under_OpenBSD/comment_18_f7a85b46bf7afaaf431d6771219c66b0._comment b/doc/bugs/More_build_oddities_under_OpenBSD/comment_18_f7a85b46bf7afaaf431d6771219c66b0._comment
new file mode 100644
index 000000000..d8d73a0b7
--- /dev/null
+++ b/doc/bugs/More_build_oddities_under_OpenBSD/comment_18_f7a85b46bf7afaaf431d6771219c66b0._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
+ nickname="dxtrish"
+ subject="comment 18"
+ date="2014-02-08T23:25:29Z"
+ content="""
+I applied your patch and rebuilt. I even tried doing it from scratch just to get it right.
+
+I have three news:
+
+1) I got it completely working in a virtual machine
+
+2) On my actual (physical) openbsd machine it still isn't working, even though they're almost identical. The only difference is that the physical one also has IPv6 connectivity, while the virtual machine doesn't. Could that be it? I don't know yet, although I'm about to try it.
+
+3) Your patch did not help. It still didn't print out anything more useful, suggesting that it in fact isn't that function that is throwing the error. [This](http://i.imgur.com/tmBiseE.png) is what the actual error looks like and shows up after I enter the jabber account details.
+"""]]
diff --git a/doc/bugs/More_build_oddities_under_OpenBSD/comment_19_217be2000e423e844241d405ba9f64c8._comment b/doc/bugs/More_build_oddities_under_OpenBSD/comment_19_217be2000e423e844241d405ba9f64c8._comment
new file mode 100644
index 000000000..7ea52c150
--- /dev/null
+++ b/doc/bugs/More_build_oddities_under_OpenBSD/comment_19_217be2000e423e844241d405ba9f64c8._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.172"
+ subject="comment 19"
+ date="2014-02-09T02:13:20Z"
+ content="""
+I'll bet you didn't rebuild all the libraries that depend on network. (Which all that static linking makes necessary...)
+
+IPv6 was my first guess; see http://git-annex.branchable.com/bugs/More_build_oddities_under_OpenBSD/#comment-84ee81cd162d22283fcccc1a41c8f8b3
+"""]]
diff --git a/doc/forum/alternativeto.net___34__Like__34__.mdwn b/doc/forum/alternativeto.net___34__Like__34__.mdwn
new file mode 100644
index 000000000..e72595021
--- /dev/null
+++ b/doc/forum/alternativeto.net___34__Like__34__.mdwn
@@ -0,0 +1,3 @@
+When I went to alternativeto.net I noticed that SpiderOak is a featured application. I decided to search git-annex and see how "Like"-ed it is in comparison... there were 0 "Like"-s.
+
+I suggest going to http://alternativeto.net/software/git-annex/ and "Like" git-annex.
diff --git a/doc/how_it_works/comment_2_2a8ce5859040d815e6234fc18f5f1961._comment b/doc/how_it_works/comment_2_2a8ce5859040d815e6234fc18f5f1961._comment
new file mode 100644
index 000000000..cc16f465d
--- /dev/null
+++ b/doc/how_it_works/comment_2_2a8ce5859040d815e6234fc18f5f1961._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm4cjowB3PaZP00vEr255d1GdUBikE9Qdg"
+ nickname="Matthew"
+ subject="clarification about what is moved / stored and where"
+ date="2014-02-10T12:53:44Z"
+ content="""
+Just to support Nigel's comment; it's good to be precise and clear about what happens to the files from the start.
+I've sent a similar suggestion to the mailing list.
+
+"""]]