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

doc/bugs/Resource_exhausted/comment_12_1943ff77f3bccf885229ecc10c82399d._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg"
+ nickname="Tim"
+ subject="Having "too many open files" message show up"
+ date="2014-01-13T14:57:11Z"
+ content="""
+This is happening to me now about twice per day.  I've got a repo that is completely synced already and I'm working on a project in IntelliJ.  When I check git-annex I often see this message when it is doing a startup scan or consistency check.
+
+The message can be seen here: http://imgur.com/Xb4LA73
+
+Are there logs somewhere that I can gather and supply to you to help track this down?  I'm using the 2014-01-07 release of git-annex for Mac OS.
+"""]]

doc/forum/Advice_needed:_git-annex_slows_down_my_macbook.mdwn

@@ -0,0 +1,21 @@
+I need some advice from more experienced users. 
+
+I've created four repositories on my macbook and paired them with repos on my ubuntu desktop. They are all created with the webapp so they might have some configurations that are not optimal for me.
+
+In fact, when I start my macbook it is unusual for more than an hour because git-annex is reading and writing to and from the disk in the background. 
+
+I don't change much in three of the four repos, only one repo contains my daily work. 
+
+What configuration would enhance my situation?
+
+The four repos are called:
+
+- movies
+- pictures
+- music
+- documents (many changes each day)
+
+I have also problems to switch to the documents repo in the webapp.
+
+TIA
+juh