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

7 files changed, 78 insertions, 1 deletions

diff --git a/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable.mdwn b/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable.mdwn
new file mode 100644
index 000000000..45475f740
--- /dev/null
+++ b/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable.mdwn
@@ -0,0 +1,13 @@
+### Please describe the problem.
+
+In order to handle the fact that the directory where pictures are saved is not configurable on my phone, I set up a second git annex repository with the Repository group "file source".
+
+### What version of git-annex are you using? On what operating system?
+
+5.20140108-gce9652
+
+### Please provide any additional information below.
+
+In the log, there are many "too many open files" errors like these :
+
+git:createProcess: runInteractiveProcess: pipe: resource exhausted (Too many open files)
diff --git a/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour.mdwn b/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour.mdwn
new file mode 100644
index 000000000..74966415e
--- /dev/null
+++ b/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour.mdwn
@@ -0,0 +1,16 @@
+### Please describe the problem.
+
+trying to add a remote host using its avahi local name : nas.local (for example). 
+
+### What steps will reproduce the problem?
+
+add remote server, use nas.local > cannot resolve nas.local
+
+### What version of git-annex are you using? On what operating system?
+
+Version: 5.20140116-g2d9ec29
+Ubuntu
+
+### Please provide any additional information below.
+
+
diff --git a/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour/comment_1_71cfedf4328eab224c7fb797c420ad0a._comment b/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour/comment_1_71cfedf4328eab224c7fb797c420ad0a._comment
new file mode 100644
index 000000000..17fae5a3b
--- /dev/null
+++ b/doc/bugs/Resolve_.local_adresses_using_avahi_or_bonjour/comment_1_71cfedf4328eab224c7fb797c420ad0a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.68"
+ subject="comment 1"
+ date="2014-01-19T22:43:10Z"
+ content="""
+AFAIK, this will work fine if your OS is able to resolve those addresses using its regular resolver. Works fine here. Is `libnss-mdns` installed?
+"""]]
diff --git a/doc/devblog/day_99__catching_up_again.mdwn b/doc/devblog/day_99__catching_up_again.mdwn
index e82c436bf..118a21f8d 100644
--- a/doc/devblog/day_99__catching_up_again.mdwn
+++ b/doc/devblog/day_99__catching_up_again.mdwn
@@ -7,7 +7,7 @@ fixes to make it build on all architectures again, and then the
 backport can be updated again too.
 
 I have been struggling with a problem with the OSX builds, which fail with
-a SIGILL on some machines. It seems that homebrew likes to agressively
+a SIGKILL on some machines. It seems that homebrew likes to agressively
 optimise things it builds, and while I have had some success with its
 `--build-bottle` option, something in the gnutls stack used for XMPP is
 still over-optimised. Waiting to hear back from Kevin on cleaning up some
diff --git a/doc/devblog/day_99__catching_up_again/comment_1_b871bf0606dc29be9b8c2e5dc150f708._comment b/doc/devblog/day_99__catching_up_again/comment_1_b871bf0606dc29be9b8c2e5dc150f708._comment
new file mode 100644
index 000000000..933de7873
--- /dev/null
+++ b/doc/devblog/day_99__catching_up_again/comment_1_b871bf0606dc29be9b8c2e5dc150f708._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkq2cjugiSvKWiWmcah3CPBqviQV_cin9I"
+ nickname="Yury"
+ subject="The world of Mac"
+ date="2014-01-19T14:13:55Z"
+ content="""
+I think that there is nothing fundamental about Mac OS X, which would prevent one from making a clean chroot that would work for non-root users. For instance, I believe that jailkit has been reported to work just fine. The problem is that you'll have to rebuild most of the stuff you need from scratch, which is very tedious. Might be easier to find instances where Homebrew has something like -march=native added to the $CFLAGS (not that I particularly fancy Homebrew of all 'missing' package managers on OS X).
+
+Anyways, it sounds like I'm going to get a Mac Mini donated sometime soon and I'm curious as to what would be the best way to make use of it for the CI system...
+"""]]
diff --git a/doc/forum/Can_not_drop_unused_file.mdwn b/doc/forum/Can_not_drop_unused_file.mdwn
new file mode 100644
index 000000000..8ec48eb14
--- /dev/null
+++ b/doc/forum/Can_not_drop_unused_file.mdwn
@@ -0,0 +1,14 @@
+I have encrypted directory remote on a usb drive over time it accumulated some unused files. I would like to drop them running,
+
+    git annex --unused --from external
+
+returns a list of unused files when I try to drop them with,
+
+
+    git annex dropunused --force --from external 1-XX
+
+I get,
+
+    dropunused XX (from external...) failed
+
+I can not seem to get rid of these files.
diff --git a/doc/forum/Can_not_drop_unused_file/comment_1_cea83dfdf4cdb4f6efb3f2b33a39a51f._comment b/doc/forum/Can_not_drop_unused_file/comment_1_cea83dfdf4cdb4f6efb3f2b33a39a51f._comment
new file mode 100644
index 000000000..4a6eacc51
--- /dev/null
+++ b/doc/forum/Can_not_drop_unused_file/comment_1_cea83dfdf4cdb4f6efb3f2b33a39a51f._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.68"
+ subject="comment 1"
+ date="2014-01-18T22:39:37Z"
+ content="""
+One reason it might fail (especially if it's not printing any useful message beyond \"(failed)\") is if it thought the file was present in the repositort, but something has happened to it.
+
+So, I suggest you try:
+
+git annex fsck --from external
+
+Followed by dropping again.
+
+If that doesn't help, I'd recommend stracing the dropping of one of the unused files, and see what's going wrong toward the end.
+"""]]