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

doc/Void.mdwn

@@ -0,0 +1 @@
+git-annex can be installed in Void Linux by running: `xbps-install git-annex`.

doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename.mdwn

@@ -0,0 +1,29 @@
+### Please describe the problem.
+
+Git annex assistant on Windows 7 won't handle files with 2 dots in the filename
+
+### What steps will reproduce the problem?
+
+Create a file like "3.2 Restriction et projection.mp4" which is in a directory synced by Assistant.
+
+The file is unmanaged.
+
+Renaming it to "3-2 Restriction et projection.mp4", and there it goes : synced with the remote repo.
+
+### What version of git-annex are you using? On what operating system?
+
+Latext git-annex on Win 7
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+

doc/bugs/annex.hardlink_no_longer_set_on_init_of_shared_repo.mdwn

@@ -0,0 +1,24 @@
+### Please describe the problem.
+
+In an earlier git-annex version (5.20141125, at least on debian), `git clone --shared` followed by `git annex init` used to set annex.hardlink to true and mark the repository as untrusted. It no longer does that.
+
+### What steps will reproduce the problem?
+
+(Assuming "foo" is a pre-existing repo with an annex)
+
+    git clone --shared foo foo.shared
+    cd foo.shared
+    git annex init
+    git config annex.hardlink
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150824, Debian Jessie. Tried both the debian unstable package and direct cabal build.
+
+### Please provide any additional information below.
+
+I haven't really debugged this, but it seems that `git annex init` nowadays does some syncing (i.e. commits, i.e. objects) that it didn't used to. The hard link check tests that the current repository has alternates, but doesn't have local objects. It might be that the newly created local objects prevent the hard link check from passing. Perhaps the hard link test should only check the presence of alternates?
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Sure, it's a great tool!

doc/forum/Can_Not_Sync_to_Git_Repo/comment_14_d2bb44a7607f3b2cddfd98cc2fa456d6._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://www.ryantm.com/"
+ subject="Possible workaround"
+ date="2015-09-08T14:46:03Z"
+ content="""
+The `git annex checkout annex/direct/master` workaround mentioned above did not work for me, but this did:
+
+git annex indirect
+git annex direct
+
+after that, my repo was on the annex/direct/master branch
+"""]]

doc/forum/How_to_define_a_balanced_prefered_content/comment_1_d4c94791a5fc7d2e618a7e11bc5db569._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="Only a design suggestion"
+ date="2015-09-07T17:24:41Z"
+ content="""
+I am pretty sure that balanced preferred content expressions are not implemented, but only a suggested model on how it could be done.
+"""]]

doc/install.mdwn

@@ -13,6 +13,7 @@ detailed instructions             | quick install
   [[ArchLinux]]         | `yaourt -Sy git-annex-bin`
   [[NixOS]]             | `nix-env -i git-annex`
   [[Gentoo]]            | `emerge git-annex`
+  [[Void]]            | `xbps-install git-annex`
   [[ScientificLinux5]]  |
   [[openSUSE]]          | 
   [[Docker]]            | 

doc/todo/patch:_Command__47__Unused.hs:_Change_--unused-refspec_back_to_--used-refspec.mdwn

@@ -0,0 +1,33 @@
+This patch is also available from the "used-refspec-fix" branch at <https://github.com/sunny256/git-annex/>.
+
+[[!format hs """
+
+From e47e743327e519eaa07817c610b08b0e6844ca8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= <sunny@sunbase.org>
+Date: Tue, 8 Sep 2015 14:29:25 +0200
+Subject: [PATCH] Command/Unused.hs: Change --unused-refspec back to
+ --used-refspec
+
+Fix typo in commit 160d4b9 ("convert Unused, and remove some dead code
+for old style option parsing", 2015-07-10), the "git-annex unused
+--used-refspec" option was incorrectly changed to --unused-refspec.
+---
+ Command/Unused.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Command/Unused.hs b/Command/Unused.hs
+index a383d56..4756cda 100644
+--- a/Command/Unused.hs
++++ b/Command/Unused.hs
+@@ -53,7 +53,7 @@ optParser _ = UnusedOptions
+ 		<> help "remote to check for unused content"
+ 		))
+ 	<*> optional (option (eitherReader parseRefSpec)
+-		( long "unused-refspec" <> metavar paramRefSpec
++		( long "used-refspec" <> metavar paramRefSpec
+ 		<> help "refs to consider used (default: all branches)"
+ 		))
+ 
+-- 
+2.6.0.rc0.24.gec371ff
+"""]]