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

doc/bugs/Empty_folders_don__39__t_get_remove.mdwn

@@ -0,0 +1,2 @@
+### Please describe the problem.
+When you rename, move or delete a folder (with files in it) the old folder doesn't get deleted in the other clients

doc/bugs/when_syncing_a_direct_repository__44___git_annex_delete_non_annexed_new_git_files/comment_3_f449f259f076ea1b11bd289bdbcc9339._comment

@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnpmMRq6lo2NBrlmoxZQljaU_IaWsWB7qw"
+ nickname="Lukas"
+ subject="direct mode and vanishing files"
+ date="2013-12-10T12:40:51Z"
+ content="""
+Hi
+
+I have the same problem with git-annex 4.20131106 on debian jessie (powerpc) in direct mode and 4.20131101 on mac osx 10.8.5 (self compiled from haskell) in indirect mode.
+Files directly added to git on the mac (indirect mode) are not created in the direct repository and are removed in the indirect repo after the next sync roundtrip.
+
+Thanks a lot for all your efforts and greetings, Lukas
+"""]]

doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__.mdwn

@@ -0,0 +1,18 @@
+I'm testing out git-annex between a few computers one being a mac (osx 10.9) and a laptop (linux mint 16).  With a vps running git annex as a transfer annex.
+
+Anyway sync is *almost* working...
+
+When I add files on my mac's annex they upload, and go to my laptop as they should.
+
+When I add files on my laptop's annex they upload, and the mac "downloads" them but only creates broken symlinks to the files.
+
+
+I looked in the log and nothing out of the ordinary is happening... is this a bug with the osx version or what?
+
+
+**more info**  
+
+* the symlink on the osx annex is symlinking to a file in .git/annex/objects  
+* the osx annex changes the aliases to real files every time I restart the git annex daemon  
+
+Thanks!