Merge branch 'master' into adjustedbranch

858 files changed, 1137 insertions, 162 deletions

diff --git a/Annex.hs b/Annex.hs
index 6a3d0cebb..fe6802776 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -42,6 +42,7 @@ import qualified Git
 import qualified Git.Config
 import Annex.Fixup
 import Git.CatFile
+import Git.HashObject
 import Git.CheckAttr
 import Git.CheckIgnore
 import qualified Git.Hook
@@ -106,6 +107,7 @@ data AnnexState = AnnexState
 	, branchstate :: BranchState
 	, repoqueue :: Maybe Git.Queue.Queue
 	, catfilehandles :: M.Map FilePath CatFileHandle
+	, hashobjecthandle :: Maybe HashObjectHandle
 	, checkattrhandle :: Maybe CheckAttrHandle
 	, checkignorehandle :: Maybe (Maybe CheckIgnoreHandle)
 	, forcebackend :: Maybe String
@@ -151,6 +153,7 @@ newState c r = AnnexState
 	, branchstate = startBranchState
 	, repoqueue = Nothing
 	, catfilehandles = M.empty
+	, hashobjecthandle = Nothing
 	, checkattrhandle = Nothing
 	, checkignorehandle = Nothing
 	, forcebackend = Nothing
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 6ef778801..32aef28a9 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -45,7 +45,8 @@ import qualified Git.Branch
 import qualified Git.UnionMerge
 import qualified Git.UpdateIndex
 import Git.LsTree (lsTreeParams)
-import Git.HashObject
+import qualified Git.HashObject
+import Annex.HashObject
 import Git.Types
 import Git.FilePath
 import Annex.CatFile
@@ -342,8 +343,9 @@ genIndex g = Git.UpdateIndex.streamUpdateIndex g
 mergeIndex :: JournalLocked -> [Git.Ref] -> Annex ()
 mergeIndex jl branches = do
 	prepareModifyIndex jl
-	h <- catFileHandle
-	inRepo $ \g -> Git.UnionMerge.mergeIndex h g branches
+	hashhandle <- hashObjectHandle
+	ch <- catFileHandle
+	inRepo $ \g -> Git.UnionMerge.mergeIndex hashhandle ch g branches
 
 {- Removes any stale git lock file, to avoid git falling over when
  - updating the index.
@@ -423,11 +425,10 @@ stageJournal jl = withIndex $ do
 	let dir = gitAnnexJournalDir g
 	(jlogf, jlogh) <- openjlog
 	liftIO $ fileEncoding jlogh
-	withJournalHandle $ \jh -> do
-		h <- hashObjectStart g
+	h <- hashObjectHandle
+	withJournalHandle $ \jh ->
 		Git.UpdateIndex.streamUpdateIndex g
 			[genstream dir h jh jlogh]
-		hashObjectStop h
 	return $ cleanup dir jlogh jlogf
   where
 	genstream dir h jh jlogh streamer = do
@@ -437,7 +438,7 @@ stageJournal jl = withIndex $ do
 			Just file -> do
 				unless (dirCruft file) $ do
 					let path = dir </> file
-					sha <- hashFile h path
+					sha <- Git.HashObject.hashFile h path
 					hPutStrLn jlogh file
 					streamer $ Git.UpdateIndex.updateIndexLine
 						sha FileBlob (asTopFilePath $ fileJournal file)
@@ -549,13 +550,11 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
 	run changers = do
 		trustmap <- calcTrustMap <$> getRaw trustLog
 		fs <- branchFiles
-		hasher <- inRepo hashObjectStart
 		forM_ fs $ \f -> do
 			content <- getRaw f
-			apply changers hasher f content trustmap
-		liftIO $ hashObjectStop hasher
-	apply [] _ _ _ _ = return ()
-	apply (changer:rest) hasher file content trustmap =
+			apply changers f content trustmap
+	apply [] _ _ _ = return ()
+	apply (changer:rest) file content trustmap =
 		case changer file content trustmap of
 			RemoveFile -> do
 				Annex.Queue.addUpdateIndex
@@ -564,12 +563,12 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
 				-- transitions on it.
 				return ()
 			ChangeFile content' -> do
-				sha <- inRepo $ hashObject BlobObject content'
+				sha <- hashBlob content'
 				Annex.Queue.addUpdateIndex $ Git.UpdateIndex.pureStreamer $
 					Git.UpdateIndex.updateIndexLine sha FileBlob (asTopFilePath file)
-				apply rest hasher file content' trustmap
+				apply rest file content' trustmap
 			PreserveFile ->
-				apply rest hasher file content trustmap
+				apply rest file content trustmap
 
 checkBranchDifferences :: Git.Ref -> Annex ()
 checkBranchDifferences ref = do
diff --git a/Annex/Concurrent.hs b/Annex/Concurrent.hs
index d5809df45..ee19d4766 100644
--- a/Annex/Concurrent.hs
+++ b/Annex/Concurrent.hs
@@ -11,6 +11,7 @@ import Annex.Common
 import Annex
 import Annex.CatFile
 import Annex.CheckAttr
+import Annex.HashObject
 import Annex.CheckIgnore
 import qualified Annex.Queue
 
@@ -64,4 +65,5 @@ mergeState st = do
 	closehandles = do
 		catFileStop
 		checkAttrStop
+		hashObjectStop
 		checkIgnoreStop
diff --git a/Annex/HashObject.hs b/Annex/HashObject.hs
new file mode 100644
index 000000000..16f741407
--- /dev/null
+++ b/Annex/HashObject.hs
@@ -0,0 +1,47 @@
+{- git hash-object interface, with handle automatically stored in the Annex monad
+ -
+ - Copyright 2016 Joey Hess <id@joeyh.name>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Annex.HashObject (
+	hashFile,
+	hashBlob,
+	hashObjectHandle,
+	hashObjectStop,
+) where
+
+import Annex.Common
+import qualified Git.HashObject
+import qualified Annex
+import Git.Types
+
+hashObjectHandle :: Annex Git.HashObject.HashObjectHandle
+hashObjectHandle = maybe startup return =<< Annex.getState Annex.hashobjecthandle
+  where
+	startup = do
+		h <- inRepo $ Git.HashObject.hashObjectStart
+		Annex.changeState $ \s -> s { Annex.hashobjecthandle = Just h }
+		return h
+
+hashObjectStop :: Annex ()
+hashObjectStop = maybe noop stop =<< Annex.getState Annex.hashobjecthandle
+  where
+	stop h = do
+		liftIO $ Git.HashObject.hashObjectStop h
+		Annex.changeState $ \s -> s { Annex.hashobjecthandle = Nothing }
+		return ()
+
+hashFile :: FilePath -> Annex Sha
+hashFile f = do
+	h <- hashObjectHandle
+	liftIO $ Git.HashObject.hashFile h f
+
+{- Note that the content will be written to a temp file.
+ - So it may be faster to use Git.HashObject.hashObject for large
+ - blob contents. -}
+hashBlob :: String -> Annex Sha
+hashBlob content = do
+	h <- hashObjectHandle
+	liftIO $ Git.HashObject.hashBlob h content
diff --git a/Annex/Link.hs b/Annex/Link.hs
index 1f2830c40..4ee85aac9 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -18,11 +18,11 @@ module Annex.Link where
 
 import Annex.Common
 import qualified Annex
-import qualified Git.HashObject
 import qualified Git.UpdateIndex
 import qualified Annex.Queue
 import Git.Types
 import Git.FilePath
+import Annex.HashObject
 
 import qualified Data.ByteString.Lazy as L
 import Data.Int
@@ -105,12 +105,7 @@ addAnnexLink linktarget file = do
 
 {- Injects a symlink target into git, returning its Sha. -}
 hashSymlink :: LinkTarget -> Annex Sha
-hashSymlink linktarget = inRepo $ Git.HashObject.hashObject BlobObject $ 
-	toInternalGitPath linktarget
-
-hashSymlink' :: Git.HashObject.HashObjectHandle -> LinkTarget -> Annex Sha
-hashSymlink' h linktarget = liftIO $ Git.HashObject.hashBlob h $
-	toInternalGitPath linktarget
+hashSymlink linktarget = hashBlob (toInternalGitPath linktarget)
 
 {- Stages a symlink to an annexed object, using a Sha of its target. -}
 stageSymlink :: FilePath -> Sha -> Annex ()
@@ -120,8 +115,7 @@ stageSymlink file sha =
 
 {- Injects a pointer file content into git, returning its Sha. -}
 hashPointerFile :: Key -> Annex Sha
-hashPointerFile key = inRepo $ Git.HashObject.hashObject BlobObject $
-	formatPointer key
+hashPointerFile key = hashBlob (formatPointer key)
 
 hashPointerFile' :: Git.HashObject.HashObjectHandle -> Key -> Annex Sha
 hashPointerFile' h = liftIO . Git.HashObject.hashBlob h . formatPointer
@@ -162,7 +156,9 @@ formatPointer :: Key -> String
 formatPointer k = 
 	toInternalGitPath (pathSeparator:objectDir </> keyFile k) ++ "\n"
 
-{- Checks if a file is a pointer to a key. -}
+{- Checks if a worktree file is a pointer to a key.
+ -
+ - Unlocked files whose content is present are not detected by this. -}
 isPointerFile :: FilePath -> IO (Maybe Key)
 isPointerFile f = catchDefaultIO Nothing $ do
 	b <- L.take maxPointerSz <$> L.readFile f
diff --git a/Annex/View.hs b/Annex/View.hs
index 14c3eccad..0078c2cad 100644
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -19,7 +19,7 @@ import qualified Git.LsFiles
 import qualified Git.Ref
 import Git.UpdateIndex
 import Git.Sha
-import Git.HashObject
+import Annex.HashObject
 import Git.Types
 import Git.FilePath
 import Annex.WorkTree
@@ -340,38 +340,36 @@ applyView' mkviewedfile getfilemetadata view = do
 	(l, clean) <- inRepo $ Git.LsFiles.inRepo [top]
 	liftIO . nukeFile =<< fromRepo gitAnnexViewIndex
 	uh <- withViewIndex $ inRepo Git.UpdateIndex.startUpdateIndex
-	hasher <- inRepo hashObjectStart
 	forM_ l $ \f -> do
 		relf <- getTopFilePath <$> inRepo (toTopFilePath f)
-		go uh hasher relf =<< lookupFile f
+		go uh relf =<< lookupFile f
 	liftIO $ do
-		hashObjectStop hasher
 		void $ stopUpdateIndex uh
 		void clean
 	genViewBranch view
   where
 	genviewedfiles = viewedFiles view mkviewedfile -- enables memoization
-	go uh hasher f (Just k) = do
+	go uh f (Just k) = do
 		metadata <- getCurrentMetaData k
 		let metadata' = getfilemetadata f `unionMetaData` metadata
 		forM_ (genviewedfiles f metadata') $ \fv -> do
 			f' <- fromRepo $ fromTopFilePath $ asTopFilePath fv
-			stagesymlink uh hasher f' =<< calcRepo (gitAnnexLink f' k)
-	go uh hasher f Nothing
+			stagesymlink uh f' =<< calcRepo (gitAnnexLink f' k)
+	go uh f Nothing
 		| "." `isPrefixOf` f = do
 			s <- liftIO $ getSymbolicLinkStatus f
 			if isSymbolicLink s
-				then stagesymlink uh hasher f =<< liftIO (readSymbolicLink f)
+				then stagesymlink uh f =<< liftIO (readSymbolicLink f)
 				else do
-					sha <- liftIO $ Git.HashObject.hashFile hasher f
+					sha <- hashFile f
 					let blobtype = if isExecutable (fileMode s)
 						then ExecutableBlob
 						else FileBlob
 					liftIO . Git.UpdateIndex.streamUpdateIndex' uh
 						=<< inRepo (Git.UpdateIndex.stageFile sha blobtype f)
 		| otherwise = noop
-	stagesymlink uh hasher f linktarget = do
-		sha <- hashSymlink' hasher linktarget
+	stagesymlink uh f linktarget = do
+		sha <- hashSymlink linktarget
 		liftIO . Git.UpdateIndex.streamUpdateIndex' uh
 			=<< inRepo (Git.UpdateIndex.stageSymlink f sha)
 
diff --git a/Command/Unused.hs b/Command/Unused.hs
index b6f3e93b6..8040dc21a 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -27,6 +27,7 @@ import qualified Remote
 import qualified Annex.Branch
 import Annex.Link
 import Annex.CatFile
+import Annex.WorkTree
 import Types.RefSpec
 import Git.Types
 import Git.Sha
@@ -215,10 +216,7 @@ withKeysReferenced' mdir initial a = do
 		Just dir -> inRepo $ LsFiles.inRepo [dir]
 	go v [] = return v
 	go v (f:fs) = do
-		mk <- getM id
-			[ isAnnexLink f
-			, liftIO (isPointerFile f)
-			]
+		mk <- lookupFile f
 		case mk of
 			Nothing -> go v fs
 			Just k -> do
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index bb42e7cc5..9ae8295ae 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -30,12 +30,14 @@ import Git.FilePath
  -}
 merge :: Ref -> Ref -> Repo -> IO ()
 merge x y repo = do
-	h <- catFileStart repo
+	hashhandle <- hashObjectStart repo
+	ch <- catFileStart repo
 	streamUpdateIndex repo
 		[ lsTree x repo
-		, mergeTrees x y h repo
+		, mergeTrees x y hashhandle ch repo
 		]
-	catFileStop h
+	catFileStop ch
+	hashObjectStop hashhandle
 
 {- Merges a list of branches into the index. Previously staged changes in
  - the index are preserved (and participate in the merge).
@@ -45,17 +47,18 @@ merge x y repo = do
  - harder to calculate a single union merge involving all the refs, as well
  - as the index.
  -}
-mergeIndex :: CatFileHandle -> Repo -> [Ref] -> IO ()
-mergeIndex h repo bs = forM_ bs $ \b ->
-	streamUpdateIndex repo [mergeTreeIndex b h repo]
+mergeIndex :: HashObjectHandle -> CatFileHandle -> Repo -> [Ref] -> IO ()
+mergeIndex hashhandle ch repo bs = forM_ bs $ \b ->
+	streamUpdateIndex repo [mergeTreeIndex b hashhandle ch repo]
 
 {- For merging two trees. -}
-mergeTrees :: Ref -> Ref -> CatFileHandle -> Repo -> Streamer
-mergeTrees (Ref x) (Ref y) h = doMerge h $ "diff-tree":diffOpts ++ [x, y, "--"]
+mergeTrees :: Ref -> Ref -> HashObjectHandle -> CatFileHandle -> Repo -> Streamer
+mergeTrees (Ref x) (Ref y) hashhandle ch = doMerge hashhandle ch
+	("diff-tree":diffOpts ++ [x, y, "--"])
 
 {- For merging a single tree into the index. -}
-mergeTreeIndex :: Ref -> CatFileHandle -> Repo -> Streamer
-mergeTreeIndex (Ref r) h = doMerge h $
+mergeTreeIndex :: Ref -> HashObjectHandle -> CatFileHandle -> Repo -> Streamer
+mergeTreeIndex (Ref r) hashhandle ch = doMerge hashhandle ch $
 	"diff-index" : diffOpts ++ ["--cached", r, "--"]
 
 diffOpts :: [String]
@@ -63,26 +66,26 @@ diffOpts = ["--raw", "-z", "-r", "--no-renames", "-l0"]
 
 {- Streams update-index changes to perform a merge,
  - using git to get a raw diff. -}
-doMerge :: CatFileHandle -> [String] -> Repo -> Streamer
-doMerge ch differ repo streamer = do
+doMerge :: HashObjectHandle -> CatFileHandle -> [String] -> Repo -> Streamer
+doMerge hashhandle ch differ repo streamer = do
 	(diff, cleanup) <- pipeNullSplit (map Param differ) repo
 	go diff
 	void $ cleanup
   where
 	go [] = noop
-	go (info:file:rest) = mergeFile info file ch repo >>=
+	go (info:file:rest) = mergeFile info file hashhandle ch >>=
 		maybe (go rest) (\l -> streamer l >> go rest)
 	go (_:[]) = error $ "parse error " ++ show differ
 
 {- Given an info line from a git raw diff, and the filename, generates
  - a line suitable for update-index that union merges the two sides of the
  - diff. -}
-mergeFile :: String -> FilePath -> CatFileHandle -> Repo -> IO (Maybe String)
-mergeFile info file h repo = case filter (/= nullSha) [Ref asha, Ref bsha] of
+mergeFile :: String -> FilePath -> HashObjectHandle -> CatFileHandle -> IO (Maybe String)
+mergeFile info file hashhandle h = case filter (/= nullSha) [Ref asha, Ref bsha] of
 	[] -> return Nothing
 	(sha:[]) -> use sha
 	shas -> use
-		=<< either return (\s -> hashObject BlobObject (unlines s) repo)
+		=<< either return (\s -> hashBlob hashhandle (unlines s))
 		=<< calcMerge . zip shas <$> mapM getcontents shas
   where
 	[_colonmode, _bmode, asha, bsha, _status] = words info
diff --git a/Remote/Ddar.hs b/Remote/Ddar.hs
index 4a46fe15c..8758949c9 100644
--- a/Remote/Ddar.hs
+++ b/Remote/Ddar.hs
@@ -122,8 +122,8 @@ ddarRemoteCall :: DdarRepo -> Char -> [CommandParam] -> Annex (String, [CommandP
 ddarRemoteCall ddarrepo cmd params
 	| ddarLocal ddarrepo = return ("ddar", localParams)
 	| otherwise = do
-		os <- sshOptions (host, Nothing) (ddarRepoConfig ddarrepo) remoteParams
-		return ("ssh", os)
+		os <- sshOptions (host, Nothing) (ddarRepoConfig ddarrepo) []
+		return ("ssh", os ++ remoteParams)
   where
 	(host, ddarrepo') = splitRemoteDdarRepo ddarrepo
 	localParams = Param [cmd] : Param (ddarRepoLocation ddarrepo) : params
@@ -158,8 +158,8 @@ ddarDirectoryExists ddarrepo
 			Left _ -> Right False
 			Right status -> Right $ isDirectory status
 	| otherwise = do
-		ps <- sshOptions (host, Nothing) (ddarRepoConfig ddarrepo) params
-		exitCode <- liftIO $ safeSystem "ssh" ps
+		ps <- sshOptions (host, Nothing) (ddarRepoConfig ddarrepo) []
+		exitCode <- liftIO $ safeSystem "ssh" (ps ++ params)
 		case exitCode of
 			ExitSuccess -> return $ Right True
 			ExitFailure 1 -> return $ Right False
diff --git a/debian/changelog b/debian/changelog
index fc01dbdaf..eed11e4f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-git-annex (6.20160230) UNRELEASED; urgency=medium
+git-annex (6.20160319) UNRELEASED; urgency=medium
+
+  * ddar remote: fix ssh calls
+    Thanks, Robie Basak
+
+ -- Joey Hess <id@joeyh.name>  Wed, 23 Mar 2016 11:42:36 -0400
+
+git-annex (6.20160318) unstable; urgency=medium
 
   * metadata: Added -r to remove all current values of a field.
   * Fix data loss that can occur when annex.pidlock is set in a repository.
@@ -12,8 +19,12 @@ git-annex (6.20160230) UNRELEASED; urgency=medium
   * Fix OSX dmg to include libraries needed by bundled gpg,
     lost in last release.
   * Always try to thaw content, even when annex.crippledfilesystem is set.
+  * Correct git-annex info to include unlocked files in v6 repository.
+  * Sped up git-annex add in direct mode and v6 by using
+    git hash-object --stdin-paths.
+  * Sped up git-annex merge by using git hash-object --stdin-paths.
 
- -- Joey Hess <id@joeyh.name>  Mon, 29 Feb 2016 13:00:30 -0400
+ -- Joey Hess <id@joeyh.name>  Fri, 18 Mar 2016 11:30:36 -0400
 
 git-annex (6.20160229) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 21c7a8bce..e144f78d8 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
 	libghc-stm-dev (>= 2.3),
 	libghc-dbus-dev (>= 0.10.7) [linux-any],
 	libghc-fdo-notify-dev (>= 0.3) [linux-any],
-	libghc-yesod-dev (>= 1.2.6.1)       [i386 amd64 arm64 armhf kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x]
+	libghc-yesod-dev (>= 1.2.6.1)       [i386 amd64 arm64 armhf kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x],
 	libghc-yesod-core-dev (>= 1.2.19)   [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
 	libghc-yesod-form-dev (>= 1.3.15)   [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
 	libghc-yesod-static-dev (>= 1.2.4)  [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
@@ -42,7 +42,7 @@ Build-Depends:
 	libghc-warp-tls-dev                 [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
 	libghc-wai-dev                      [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
 	libghc-wai-extra-dev                [i386 amd64 arm64 armhf kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x],
-	libghc-dav-dev (>= 1.0)
+	libghc-dav-dev (>= 1.0),
 	libghc-persistent-dev,
 	libghc-persistent-template-dev,
 	libghc-persistent-sqlite-dev,
@@ -85,7 +85,7 @@ Build-Depends:
 	openssh-client,
 	git-remote-gcrypt (>= 0.20130908-6),
 Maintainer: Richard Hartmann <richih@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Git: git://git.kitenet.net/git-annex
 Homepage: http://git-annex.branchable.com/
 XS-Testsuite: autopkgtest
diff --git a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist.mdwn
index 4b88656a2..4b88656a2 100644
--- a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist.mdwn
+++ b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist.mdwn
diff --git a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_1_d4f22335d5b6cb178c77579a1b450f9c._comment b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_1_d4f22335d5b6cb178c77579a1b450f9c._comment
index 95583cdf7..95583cdf7 100644
--- a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_1_d4f22335d5b6cb178c77579a1b450f9c._comment
+++ b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_1_d4f22335d5b6cb178c77579a1b450f9c._comment
diff --git a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_2_19dd9ebfebbece9d3654825492ebd5b9._comment b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_2_19dd9ebfebbece9d3654825492ebd5b9._comment
index 79554ee50..79554ee50 100644
--- a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_2_19dd9ebfebbece9d3654825492ebd5b9._comment
+++ b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_2_19dd9ebfebbece9d3654825492ebd5b9._comment
diff --git a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_3_4a85c4c45768f96bdc6619c193de55ab._comment b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_3_4a85c4c45768f96bdc6619c193de55ab._comment
index 0bfe15340..0bfe15340 100644
--- a/doc/bugs/Android:_500___47__etc__47__resolv.conf_does_not_exist/comment_3_4a85c4c45768f96bdc6619c193de55ab._comment
+++ b/doc/bugs/Android__58___500___47__etc__47__resolv.conf_does_not_exist/comment_3_4a85c4c45768f96bdc6619c193de55ab._comment
diff --git a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn
index ed0eb1469..ed0eb1469 100644
--- a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn
+++ b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn
diff --git a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_1_414adc1bee73711e3133c7fe8811aae2._comment b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_1_414adc1bee73711e3133c7fe8811aae2._comment
index d1a5bf0c1..d1a5bf0c1 100644
--- a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_1_414adc1bee73711e3133c7fe8811aae2._comment
+++ b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_1_414adc1bee73711e3133c7fe8811aae2._comment
diff --git a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment
index 55a368cc3..55a368cc3 100644
--- a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment
+++ b/doc/bugs/Android__58___Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__/comment_2_977a529f488ce0c167035675f76ebabf._comment
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings.mdwn b/doc/bugs/Android__58___Several_error_messages___47___warnings.mdwn
index c6085c21a..c6085c21a 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings.mdwn
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings.mdwn
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_1_85da61d3dfb528fef17366effe123ff5._comment b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_1_85da61d3dfb528fef17366effe123ff5._comment
index 92a19534a..92a19534a 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_1_85da61d3dfb528fef17366effe123ff5._comment
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_1_85da61d3dfb528fef17366effe123ff5._comment
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment
index 22aacf306..22aacf306 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_2_97ddaba23e91a903f69cf00931627444._comment
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_3_b4ea7ff7deb9626a02dfd0eb459f22a2._comment b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_3_b4ea7ff7deb9626a02dfd0eb459f22a2._comment
index f63f93d14..f63f93d14 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_3_b4ea7ff7deb9626a02dfd0eb459f22a2._comment
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_3_b4ea7ff7deb9626a02dfd0eb459f22a2._comment
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment
index 976ead689..976ead689 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_4_5edddd7e90b8f11c52a44abfb891ce25._comment
diff --git a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_b38b675a2862d527fad28b7477f7ddde._comment b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_4_b38b675a2862d527fad28b7477f7ddde._comment
index 81e0c0fa0..81e0c0fa0 100644
--- a/doc/bugs/Android:_Several_error_messages___47___warnings/comment_4_b38b675a2862d527fad28b7477f7ddde._comment
+++ b/doc/bugs/Android__58___Several_error_messages___47___warnings/comment_4_b38b675a2862d527fad28b7477f7ddde._comment
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
index 35e751cce..35e751cce 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_1_3f0e3fed240252207020d31ab96d0666._comment b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_1_3f0e3fed240252207020d31ab96d0666._comment
index 60ac15781..60ac15781 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_1_3f0e3fed240252207020d31ab96d0666._comment
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_1_3f0e3fed240252207020d31ab96d0666._comment
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_2_87746f4fd0b404db7070c0b2346e8e2b._comment b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_2_87746f4fd0b404db7070c0b2346e8e2b._comment
index 4711c2d1c..4711c2d1c 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_2_87746f4fd0b404db7070c0b2346e8e2b._comment
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_2_87746f4fd0b404db7070c0b2346e8e2b._comment
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_3_72c9e9f6bb5ca23ddfd513fcc8bff48c._comment b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_3_72c9e9f6bb5ca23ddfd513fcc8bff48c._comment
index b920df4a9..b920df4a9 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_3_72c9e9f6bb5ca23ddfd513fcc8bff48c._comment
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_3_72c9e9f6bb5ca23ddfd513fcc8bff48c._comment
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_4_b54c169a96e263e12495690fe14d8b4a._comment b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_4_b54c169a96e263e12495690fe14d8b4a._comment
index 7453e7cea..7453e7cea 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_4_b54c169a96e263e12495690fe14d8b4a._comment
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_4_b54c169a96e263e12495690fe14d8b4a._comment
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_5_56ef816d3d4f3d85d31ccaf806133073._comment b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_5_56ef816d3d4f3d85d31ccaf806133073._comment
index a96ebd551..a96ebd551 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_5_56ef816d3d4f3d85d31ccaf806133073._comment
+++ b/doc/bugs/Android__58___does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__/comment_5_56ef816d3d4f3d85d31ccaf806133073._comment
diff --git a/doc/bugs/Android:_use___47__data__47____8230___for_git-annex.home__63__.mdwn b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__.mdwn
index 674bfdc16..674bfdc16 100644
--- a/doc/bugs/Android:_use___47__data__47____8230___for_git-annex.home__63__.mdwn
+++ b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__.mdwn
diff --git a/doc/bugs/Android:_use___47__data__47____8230___for_git-annex.home__63__/comment_1_95481b150f43fd3db311fbcf6d1e48aa._comment b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__/comment_1_95481b150f43fd3db311fbcf6d1e48aa._comment
index cdfb49833..cdfb49833 100644
--- a/doc/bugs/Android:_use___47__data__47____8230___for_git-annex.home__63__/comment_1_95481b150f43fd3db311fbcf6d1e48aa._comment
+++ b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__/comment_1_95481b150f43fd3db311fbcf6d1e48aa._comment
diff --git a/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__/comment_2_041fe2a545b48acd2c9d15eb2ac2b34f._comment b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__/comment_2_041fe2a545b48acd2c9d15eb2ac2b34f._comment
new file mode 100644
index 000000000..486d1843f
--- /dev/null
+++ b/doc/bugs/Android__58___use___47__data__47____8230___for_git-annex.home__63__/comment_2_041fe2a545b48acd2c9d15eb2ac2b34f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899"
+ nickname="divergentdave"
+ subject="comment 2"
+ date="2016-03-21T04:13:15Z"
+ content="""
+Each app has one subfolder inside /data that is private to that app (and user) alone. Generally, you can't read or enumerate /data itself. There is a function in the Java API to get the current app's internal storage folder, see https://developer.android.com/reference/android/content/Context.html#getFilesDir%28%29.
+"""]]
diff --git a/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable.mdwn b/doc/bugs/Android___58___handling_DCIM__47__Camera_not_being_configurable.mdwn
index a52857d1f..a52857d1f 100644
--- a/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable.mdwn
+++ b/doc/bugs/Android___58___handling_DCIM__47__Camera_not_being_configurable.mdwn
diff --git a/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable/comment_1_1fe5f8c68a430b2436649cf4ba8f4987._comment b/doc/bugs/Android___58___handling_DCIM__47__Camera_not_being_configurable/comment_1_1fe5f8c68a430b2436649cf4ba8f4987._comment
index eea1f2094..eea1f2094 100644
--- a/doc/bugs/Android_:_handling_DCIM__47__Camera_not_being_configurable/comment_1_1fe5f8c68a430b2436649cf4ba8f4987._comment
+++ b/doc/bugs/Android___58___handling_DCIM__47__Camera_not_being_configurable/comment_1_1fe5f8c68a430b2436649cf4ba8f4987._comment
diff --git a/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn b/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn
new file mode 100644
index 000000000..1587d4a66
--- /dev/null
+++ b/doc/bugs/Android_chroot_stuck_in_Cabal_hell.mdwn
@@ -0,0 +1,20 @@
+### Please describe the problem.
+I'm trying to get an Android development environment set up, but I am running into conflicting library versions inside of the chroot. The package installation script now finishes, but I run into a link-time error during `cabal configure` because it is pulling in two different versions of the unix package for some reason. Please let me know if there is any information I can get from my build environment that would help diagnosing the issue.
+
+### What steps will reproduce the problem?
+Run `buildchroot`, `install-haskell-packages`, `make android`
+
+### What version of git-annex are you using? On what operating system?
+Attempting to build from source, cross-compiling for Android on Debian Jessie.
+
+### Please provide any additional information below.
+
+[[!format sh """
+Linking ./dist/setup/setup ...
+/usr/lib/ghc/unix-2.6.0.1/libHSunix-2.6.0.1.a(execvpe.o): In function `pPrPr_disableITimers':
+(.text+0x300): multiple definition of `pPrPr_disableITimers'
+/home/builder/.cabal/lib/i386-linux-ghc-7.6.3/unix-2.7.1.0/libHSunix-2.7.1.0.a(ghcrts.o):ghcrts.c:(.text+0x0): first defined here
+collect2: error: ld returned 1 exit status
+Makefile:225: recipe for target 'android' failed
+make: *** [android] Error 1
+"""]]
diff --git a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_.mdwn b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_.mdwn
index cc63ac138..cc63ac138 100644
--- a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_.mdwn
+++ b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_.mdwn
diff --git a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
index 3750d1a28..3750d1a28 100644
--- a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
+++ b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_1_36d1207818c8db747dbf94d9a48e3e98._comment
diff --git a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment
index 457c288dd..457c288dd 100644
--- a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment
+++ b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_2_82f1c3c6aaeb488582ee08518b193f99._comment
diff --git a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_3_db50cbdc302480c4b1fe0f364aa769d9._comment b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_3_db50cbdc302480c4b1fe0f364aa769d9._comment
index 515ad0b7b..515ad0b7b 100644
--- a/doc/bugs/Assistant:_synchronisation_between_two_regular_repositories_hangs_/comment_3_db50cbdc302480c4b1fe0f364aa769d9._comment
+++ b/doc/bugs/Assistant__58___synchronisation_between_two_regular_repositories_hangs_/comment_3_db50cbdc302480c4b1fe0f364aa769d9._comment
diff --git a/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn b/doc/bugs/Building_fails__58___Not_in_scope__58_____96__myHomeDir__39___.mdwn
index e1d2da4ce..e1d2da4ce 100644
--- a/doc/bugs/Building_fails:_Not_in_scope:___96__myHomeDir__39___.mdwn
+++ b/doc/bugs/Building_fails__58___Not_in_scope__58_____96__myHomeDir__39___.mdwn
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X.mdwn b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X.mdwn
index 6c7444afd..6c7444afd 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X.mdwn
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X.mdwn
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_10_2c8e8a4f35b392b1cb4dc8104786312d._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_10_2c8e8a4f35b392b1cb4dc8104786312d._comment
index b95b3ed68..b95b3ed68 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_10_2c8e8a4f35b392b1cb4dc8104786312d._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_10_2c8e8a4f35b392b1cb4dc8104786312d._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_11_b0bd8c98b5a4d67f66f8d64665569490._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_11_b0bd8c98b5a4d67f66f8d64665569490._comment
index d5cfd7416..d5cfd7416 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_11_b0bd8c98b5a4d67f66f8d64665569490._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_11_b0bd8c98b5a4d67f66f8d64665569490._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_12_1a0337d1df87898db3d3dadc911bdb38._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_12_1a0337d1df87898db3d3dadc911bdb38._comment
index 46ab89f21..46ab89f21 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_12_1a0337d1df87898db3d3dadc911bdb38._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_12_1a0337d1df87898db3d3dadc911bdb38._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_13_4aad55df0c48767e7a0156ad3b38be7b._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_13_4aad55df0c48767e7a0156ad3b38be7b._comment
index 4877fc5eb..4877fc5eb 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_13_4aad55df0c48767e7a0156ad3b38be7b._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_13_4aad55df0c48767e7a0156ad3b38be7b._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_14_44a912174bfbe128ae40bef2a5b351c7._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_14_44a912174bfbe128ae40bef2a5b351c7._comment
index 3b3dafbbf..3b3dafbbf 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_14_44a912174bfbe128ae40bef2a5b351c7._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_14_44a912174bfbe128ae40bef2a5b351c7._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_15_3a82ba46d172972c046f7e4238d9d109._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_15_3a82ba46d172972c046f7e4238d9d109._comment
index 770cf54eb..770cf54eb 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_15_3a82ba46d172972c046f7e4238d9d109._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_15_3a82ba46d172972c046f7e4238d9d109._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_16_befb4f82ba2d812766b57cec475b52b5._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_16_befb4f82ba2d812766b57cec475b52b5._comment
index cfda4f65d..cfda4f65d 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_16_befb4f82ba2d812766b57cec475b52b5._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_16_befb4f82ba2d812766b57cec475b52b5._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_17_0511e8fa74ec3244879a8e5dc05472b3._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_17_0511e8fa74ec3244879a8e5dc05472b3._comment
index a358c3212..a358c3212 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_17_0511e8fa74ec3244879a8e5dc05472b3._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_17_0511e8fa74ec3244879a8e5dc05472b3._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_18_bfc63bcae4724a5a437c3aee51822f7e._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_18_bfc63bcae4724a5a437c3aee51822f7e._comment
index 3cbee238c..3cbee238c 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_18_bfc63bcae4724a5a437c3aee51822f7e._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_18_bfc63bcae4724a5a437c3aee51822f7e._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment
index 45eebe10f..45eebe10f 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_1_7f54e24c8e721d69bdb1e5a4181641b8._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_2_6e91bc254f79ccf80d385ba7d35ffa9c._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_2_6e91bc254f79ccf80d385ba7d35ffa9c._comment
index c3be9b722..c3be9b722 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_2_6e91bc254f79ccf80d385ba7d35ffa9c._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_2_6e91bc254f79ccf80d385ba7d35ffa9c._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_3_4cf34da6050dd96f94ffc3652aa39715._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_3_4cf34da6050dd96f94ffc3652aa39715._comment
index f7b07d3b6..f7b07d3b6 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_3_4cf34da6050dd96f94ffc3652aa39715._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_3_4cf34da6050dd96f94ffc3652aa39715._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_4_cafcc24e98a89f10adaed5e09f75b659._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_4_cafcc24e98a89f10adaed5e09f75b659._comment
index 6b7c9f33b..6b7c9f33b 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_4_cafcc24e98a89f10adaed5e09f75b659._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_4_cafcc24e98a89f10adaed5e09f75b659._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_5_118d61dea9ef0faa2960da6f2f62ec8b._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_5_118d61dea9ef0faa2960da6f2f62ec8b._comment
index 28299c372..28299c372 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_5_118d61dea9ef0faa2960da6f2f62ec8b._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_5_118d61dea9ef0faa2960da6f2f62ec8b._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_6_3978557c6e85608243e5b4eb698ac5a5._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_6_3978557c6e85608243e5b4eb698ac5a5._comment
index da52be691..da52be691 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_6_3978557c6e85608243e5b4eb698ac5a5._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_6_3978557c6e85608243e5b4eb698ac5a5._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_7_e6dfc41d2042402b40efb6f6139d5662._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_7_e6dfc41d2042402b40efb6f6139d5662._comment
index 374d193c0..374d193c0 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_7_e6dfc41d2042402b40efb6f6139d5662._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_7_e6dfc41d2042402b40efb6f6139d5662._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_8_33a84937c87dd2406bc090a0d2969683._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_8_33a84937c87dd2406bc090a0d2969683._comment
index df97625f7..df97625f7 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_8_33a84937c87dd2406bc090a0d2969683._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_8_33a84937c87dd2406bc090a0d2969683._comment
diff --git a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_9_28bb02572d453db3b30824ec7604d91a._comment b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_9_28bb02572d453db3b30824ec7604d91a._comment
index 36993859a..36993859a 100644
--- a/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_9_28bb02572d453db3b30824ec7604d91a._comment
+++ b/doc/bugs/Can__39__t_add_a_git_repo_to_git_annex__58_____34__Invalid_path_repo__47__.git__47__X__34___for_many_X/comment_9_28bb02572d453db3b30824ec7604d91a._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too.mdwn b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too.mdwn
index 595b86c29..595b86c29 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too.mdwn
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too.mdwn
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_1_80ca50f5305eda71fe32f2b0bc922c34._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_1_80ca50f5305eda71fe32f2b0bc922c34._comment
index e47cbd327..e47cbd327 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_1_80ca50f5305eda71fe32f2b0bc922c34._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_1_80ca50f5305eda71fe32f2b0bc922c34._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_2_e6bc6d1c0eb8c469e9e00b37bbcc9b86._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_2_e6bc6d1c0eb8c469e9e00b37bbcc9b86._comment
index 18959ed68..18959ed68 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_2_e6bc6d1c0eb8c469e9e00b37bbcc9b86._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_2_e6bc6d1c0eb8c469e9e00b37bbcc9b86._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_0d0f6b6b46d0153433fead2bbd1bbe64._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_0d0f6b6b46d0153433fead2bbd1bbe64._comment
index a254b31a8..a254b31a8 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_0d0f6b6b46d0153433fead2bbd1bbe64._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_0d0f6b6b46d0153433fead2bbd1bbe64._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_6058a22b733cb02126286af950074ed4._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_6058a22b733cb02126286af950074ed4._comment
index 33e85c772..33e85c772 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_6058a22b733cb02126286af950074ed4._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_5_6058a22b733cb02126286af950074ed4._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_593a49669e2fadfb91773f8c84fbb031._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_593a49669e2fadfb91773f8c84fbb031._comment
index af31edcf8..af31edcf8 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_593a49669e2fadfb91773f8c84fbb031._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_593a49669e2fadfb91773f8c84fbb031._comment
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment
index 7e611cebd..7e611cebd 100644
--- a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment
+++ b/doc/bugs/Corrupted_drive__58___Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications.mdwn
index d4dcc26e3..d4dcc26e3 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications.mdwn
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications.mdwn
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_10_13a35801805ea3d2d4428b1539f96b16._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_10_13a35801805ea3d2d4428b1539f96b16._comment
index fdd123103..fdd123103 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_10_13a35801805ea3d2d4428b1539f96b16._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_10_13a35801805ea3d2d4428b1539f96b16._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_11_632456a0a1d399ee2bbac76b7d63a5f1._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_11_632456a0a1d399ee2bbac76b7d63a5f1._comment
index 2605d69ab..2605d69ab 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_11_632456a0a1d399ee2bbac76b7d63a5f1._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_11_632456a0a1d399ee2bbac76b7d63a5f1._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_12_e4d268f269cc1701736cc5a39719ac20._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_12_e4d268f269cc1701736cc5a39719ac20._comment
index 8d06ee857..8d06ee857 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_12_e4d268f269cc1701736cc5a39719ac20._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_12_e4d268f269cc1701736cc5a39719ac20._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_13_962cd8d7280cbc1d61778d69f3a393f0._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_13_962cd8d7280cbc1d61778d69f3a393f0._comment
index 0428fadbd..0428fadbd 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_13_962cd8d7280cbc1d61778d69f3a393f0._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_13_962cd8d7280cbc1d61778d69f3a393f0._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_14_5b3bb068b62b12c7cc7504836a8acf32._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_14_5b3bb068b62b12c7cc7504836a8acf32._comment
index e3efdb6d0..e3efdb6d0 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_14_5b3bb068b62b12c7cc7504836a8acf32._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_14_5b3bb068b62b12c7cc7504836a8acf32._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_15_5271ba4eed013adec8391ddfcc11eda8._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_15_5271ba4eed013adec8391ddfcc11eda8._comment
index cace00555..cace00555 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_15_5271ba4eed013adec8391ddfcc11eda8._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_15_5271ba4eed013adec8391ddfcc11eda8._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_1_7a536b79bae7d8f897f014d17dbb90b6._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_1_7a536b79bae7d8f897f014d17dbb90b6._comment
index 0f23da162..0f23da162 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_1_7a536b79bae7d8f897f014d17dbb90b6._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_1_7a536b79bae7d8f897f014d17dbb90b6._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_2_349959a6daa722c8350f73feb0b27162._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_2_349959a6daa722c8350f73feb0b27162._comment
index 7a78362a3..7a78362a3 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_2_349959a6daa722c8350f73feb0b27162._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_2_349959a6daa722c8350f73feb0b27162._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_3_923fc470727ecf21f0bb368b0486b15d._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_3_923fc470727ecf21f0bb368b0486b15d._comment
index 599927cd2..599927cd2 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_3_923fc470727ecf21f0bb368b0486b15d._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_3_923fc470727ecf21f0bb368b0486b15d._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_4_68a8434018430a0d2671c4e23e9a3b12._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_4_68a8434018430a0d2671c4e23e9a3b12._comment
index 32abc28c2..32abc28c2 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_4_68a8434018430a0d2671c4e23e9a3b12._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_4_68a8434018430a0d2671c4e23e9a3b12._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_5_0b7d69489b9f10bb5ed617b5b62ae063._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_5_0b7d69489b9f10bb5ed617b5b62ae063._comment
index dc27808bb..dc27808bb 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_5_0b7d69489b9f10bb5ed617b5b62ae063._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_5_0b7d69489b9f10bb5ed617b5b62ae063._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_6_650d950da065eeac966c2498418c668d._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_6_650d950da065eeac966c2498418c668d._comment
index 94cbad0e6..94cbad0e6 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_6_650d950da065eeac966c2498418c668d._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_6_650d950da065eeac966c2498418c668d._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_7_834c512e32ad5a157d8fa9fd472831b4._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_7_834c512e32ad5a157d8fa9fd472831b4._comment
index 7a98be0a2..7a98be0a2 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_7_834c512e32ad5a157d8fa9fd472831b4._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_7_834c512e32ad5a157d8fa9fd472831b4._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_8_2500e6f9545b916dfa41549140c053fd._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_8_2500e6f9545b916dfa41549140c053fd._comment
index 193038472..193038472 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_8_2500e6f9545b916dfa41549140c053fd._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_8_2500e6f9545b916dfa41549140c053fd._comment
diff --git a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_9_e2dc3ff80bbd66837f00975b16e17126._comment b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_9_e2dc3ff80bbd66837f00975b16e17126._comment
index 44ac459c0..44ac459c0 100644
--- a/doc/bugs/FAT:_Date_resolution_for_mtime_2s--__62___implications/comment_9_e2dc3ff80bbd66837f00975b16e17126._comment
+++ b/doc/bugs/FAT__58___Date_resolution_for_mtime_2s--__62___implications/comment_9_e2dc3ff80bbd66837f00975b16e17126._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__.mdwn b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__.mdwn
index d66196acd..d66196acd 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__.mdwn
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__.mdwn
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_1_6441dd04adc158df22589c81746108a9._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_1_6441dd04adc158df22589c81746108a9._comment
index 6080e88e4..6080e88e4 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_1_6441dd04adc158df22589c81746108a9._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_1_6441dd04adc158df22589c81746108a9._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_2_d1c5d7642284a375f9c455dbf76efa5c._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_2_d1c5d7642284a375f9c455dbf76efa5c._comment
index 50bff5f41..50bff5f41 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_2_d1c5d7642284a375f9c455dbf76efa5c._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_2_d1c5d7642284a375f9c455dbf76efa5c._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_3_4b863da1c8ba73ad54da20f7d2ec6e5c._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_3_4b863da1c8ba73ad54da20f7d2ec6e5c._comment
index 7acab1c37..7acab1c37 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_3_4b863da1c8ba73ad54da20f7d2ec6e5c._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_3_4b863da1c8ba73ad54da20f7d2ec6e5c._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_4_8e0f489305ce30ad578b9f8526e86416._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_4_8e0f489305ce30ad578b9f8526e86416._comment
index c020fc3a8..c020fc3a8 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_4_8e0f489305ce30ad578b9f8526e86416._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_4_8e0f489305ce30ad578b9f8526e86416._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_5_c699034c8e02b2354516414d0ab73aab._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_5_c699034c8e02b2354516414d0ab73aab._comment
index a323d7835..a323d7835 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_5_c699034c8e02b2354516414d0ab73aab._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_5_c699034c8e02b2354516414d0ab73aab._comment
diff --git a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_6_786cb7e643811dfd2496ceeff8f34f44._comment b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_6_786cb7e643811dfd2496ceeff8f34f44._comment
index ea3e97e8e..ea3e97e8e 100644
--- a/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted:_uuid.log__34__/comment_6_786cb7e643811dfd2496ceeff8f34f44._comment
+++ b/doc/bugs/Freshly_initialized_repo_has_staged_change___34__deleted__58___uuid.log__34__/comment_6_786cb7e643811dfd2496ceeff8f34f44._comment
diff --git a/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks.mdwn b/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks.mdwn
new file mode 100644
index 000000000..5704bf1cc
--- /dev/null
+++ b/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks.mdwn
@@ -0,0 +1,12 @@
+### Please describe the problem.
+
+git-annex version: 6.20160126
+
+Problem happens on Mavericks, not on Yosemite with same version.
+
+Can do a relative or absolute path on a git annex add.
+
+But on the git annex copy to an S3 remote, if I use an absolute path for the file descriptor (e.g. /Users/name/git_directory/test.txt) it will not report an error, but will also not print the "copied..." string. A subsequent call with a relative path (e.g. test.txt) will work, show the copied message and indeed show up on S3.
+
+
+Good news: It's working great on Yosemite!
diff --git a/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks/comment_1_2f0c74aba502533b85b922ea81ded70d._comment b/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks/comment_1_2f0c74aba502533b85b922ea81ded70d._comment
new file mode 100644
index 000000000..e538a75c6
--- /dev/null
+++ b/doc/bugs/Git_copy_fails_with_absolute_path_on_mavericks/comment_1_2f0c74aba502533b85b922ea81ded70d._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T17:34:21Z"
+ content="""
+Using absolute paths to files is an unusual thing to do with git in my
+experience. But, git does seem to support it, at least some of the time.
+
+I think that git-annex's support for it comes down to what `git ls-files`
+does. For example:
+
+	joey@darkstar:~/tmp/me> git ls-files ~/tmp/me/foo
+	foo
+
+Since git-annex uses git ls-files, it sees a relative file and so
+all or most all git-annex commands can work with the absolute file input.
+
+Does git ls-files convert the absolute path to a relative path
+when you run it on the Mavericks system?
+
+What version of git is installed on the Mavericks system? Is
+git-annex installed from the git-annex app, or from homebrew, or how?
+"""]]
diff --git a/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn b/doc/bugs/Installation_fails__58_____34__Duplicate_instance_declarations__34__.mdwn
index db02036f4..db02036f4 100644
--- a/doc/bugs/Installation_fails:___34__Duplicate_instance_declarations__34__.mdwn
+++ b/doc/bugs/Installation_fails__58_____34__Duplicate_instance_declarations__34__.mdwn
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID.mdwn b/doc/bugs/Internal_Server_Error__58___Unknown_UUID.mdwn
index e8e802455..e8e802455 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID.mdwn
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID.mdwn
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_1_f42f703a5d267557abf5e932f0890d4a._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_1_f42f703a5d267557abf5e932f0890d4a._comment
index e8494ab17..e8494ab17 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_1_f42f703a5d267557abf5e932f0890d4a._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_1_f42f703a5d267557abf5e932f0890d4a._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_2_eb1999f99c5babf3fcb1ff5d72ea6db6._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_2_eb1999f99c5babf3fcb1ff5d72ea6db6._comment
index 46fcc0898..46fcc0898 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_2_eb1999f99c5babf3fcb1ff5d72ea6db6._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_2_eb1999f99c5babf3fcb1ff5d72ea6db6._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_3_bda72b0d615843d18d6ef21f833432a8._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_3_bda72b0d615843d18d6ef21f833432a8._comment
index 3bdba306d..3bdba306d 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_3_bda72b0d615843d18d6ef21f833432a8._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_3_bda72b0d615843d18d6ef21f833432a8._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment
index 87da8dc31..87da8dc31 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_4_651440cda405ad40a04479f5d87d581e._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_5_21fa189b631c246ac5df16a49c3c0178._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_5_21fa189b631c246ac5df16a49c3c0178._comment
index 1f42daf5f..1f42daf5f 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_5_21fa189b631c246ac5df16a49c3c0178._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_5_21fa189b631c246ac5df16a49c3c0178._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment
index 9e28682b4..9e28682b4 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_6_1f712693d2ded5abceb869fdb7f47ef3._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment
index 136bca8f4..136bca8f4 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_7_7a5ead0ce5c9429d4723ccce4f6a6d6c._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_8_a4683fd73ae452a9cd7f61d9930f6266._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_8_a4683fd73ae452a9cd7f61d9930f6266._comment
index 54bd855cf..54bd855cf 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_8_a4683fd73ae452a9cd7f61d9930f6266._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_8_a4683fd73ae452a9cd7f61d9930f6266._comment
diff --git a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_9_ced3516c3e7161e4d7e599232f62a511._comment b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_9_ced3516c3e7161e4d7e599232f62a511._comment
index 4a99ee3ad..4a99ee3ad 100644
--- a/doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_9_ced3516c3e7161e4d7e599232f62a511._comment
+++ b/doc/bugs/Internal_Server_Error__58___Unknown_UUID/comment_9_ced3516c3e7161e4d7e599232f62a511._comment
diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn b/doc/bugs/Local_pairing_fails__58___PairListener_crashed.mdwn
index 371b923cf..371b923cf 100644
--- a/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn
+++ b/doc/bugs/Local_pairing_fails__58___PairListener_crashed.mdwn
diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment b/doc/bugs/Local_pairing_fails__58___PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment
index 4dd77f04d..4dd77f04d 100644
--- a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment
+++ b/doc/bugs/Local_pairing_fails__58___PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment
diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment b/doc/bugs/Local_pairing_fails__58___PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment
index 851dfe9f8..851dfe9f8 100644
--- a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment
+++ b/doc/bugs/Local_pairing_fails__58___PairListener_crashed/comment_2_60a21105145ac228f486bc4beb2ea54d._comment
diff --git a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected.mdwn b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected.mdwn
index 4b45cafd2..4b45cafd2 100644
--- a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected.mdwn
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected.mdwn
diff --git a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected/comment_1_c8ce2a1978fc1bfa5f31cff9f48690f6._comment b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_1_c8ce2a1978fc1bfa5f31cff9f48690f6._comment
index d1380f1c5..d1380f1c5 100644
--- a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected/comment_1_c8ce2a1978fc1bfa5f31cff9f48690f6._comment
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_1_c8ce2a1978fc1bfa5f31cff9f48690f6._comment
diff --git a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected/comment_2_cf9a679c7e6ec5cae4109e748b20b8f9._comment b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_2_cf9a679c7e6ec5cae4109e748b20b8f9._comment
index 8398805be..8398805be 100644
--- a/doc/bugs/MacOSX:_archive_folders_not_working_as_expected/comment_2_cf9a679c7e6ec5cae4109e748b20b8f9._comment
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_2_cf9a679c7e6ec5cae4109e748b20b8f9._comment
diff --git a/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment
new file mode 100644
index 000000000..ae32c9788
--- /dev/null
+++ b/doc/bugs/MacOSX__58___archive_folders_not_working_as_expected/comment_3_4026607087a9da2759f841e59aadfcdc._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="nanotech"
+ subject="comment 3"
+ date="2016-03-17T08:39:36Z"
+ content="""
+I think this is the same bug as [Moved files are not picked up by the assistant on OS X](https://git-annex.branchable.com/bugs/Moved_files_are_not_picked_up_by_the_assistant_on_OS_X/). To reproduce, run the first transcript there but drop the file before moving it.
+
+FSEvents fails to produce add events for dangling symlinks (<https://github.com/facebook/watchman/issues/172>), although it does produce removal events. Recompiling and using Kqueue with git-annex instead seems to detect dangling symlinks and add them correctly.
+"""]]
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state.mdwn b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state.mdwn
index c7231cd1b..c7231cd1b 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state.mdwn
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state.mdwn
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_1_0dfd9eedccb48f1f3d7939677dc96446._comment b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_1_0dfd9eedccb48f1f3d7939677dc96446._comment
index be48ca87f..be48ca87f 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_1_0dfd9eedccb48f1f3d7939677dc96446._comment
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_1_0dfd9eedccb48f1f3d7939677dc96446._comment
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_2_5c5e7356cae8ddf8d2c8964fb69000f5._comment b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_2_5c5e7356cae8ddf8d2c8964fb69000f5._comment
index 5d39e8ac2..5d39e8ac2 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_2_5c5e7356cae8ddf8d2c8964fb69000f5._comment
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_2_5c5e7356cae8ddf8d2c8964fb69000f5._comment
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment
index 319b001f8..319b001f8 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_3_1e0841d71c33fd3919310f1711b6e0b4._comment
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_4_eb5b0f8259d861000510fcfd58f66617._comment b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_4_eb5b0f8259d861000510fcfd58f66617._comment
index 395c31b94..395c31b94 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_4_eb5b0f8259d861000510fcfd58f66617._comment
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_4_eb5b0f8259d861000510fcfd58f66617._comment
diff --git a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment
index 0ec137081..0ec137081 100644
--- a/doc/bugs/OSX:_Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment
+++ b/doc/bugs/OSX__58___Assistant_leaves_repo_in_inconsistent_state/comment_5_4343ee35e4091fc50268f9fc611f5148._comment
diff --git a/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn b/doc/bugs/OSX__58___addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn
index 5c72b0095..5c72b0095 100644
--- a/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn
+++ b/doc/bugs/OSX__58___addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4.mdwn
diff --git a/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4/comment_1_36e75e72a1257db3cf8a48a025d42122._comment b/doc/bugs/OSX__58___addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4/comment_1_36e75e72a1257db3cf8a48a025d42122._comment
index 774381d00..774381d00 100644
--- a/doc/bugs/OSX:_addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4/comment_1_36e75e72a1257db3cf8a48a025d42122._comment
+++ b/doc/bugs/OSX__58___addurl_--batch_--json_spits_out_shortened_output_string__dies_off_with_4/comment_1_36e75e72a1257db3cf8a48a025d42122._comment
diff --git a/doc/bugs/Pairing_locally_shows:___34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn b/doc/bugs/Pairing_locally_shows__58_____34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn
index 6999d714c..6999d714c 100644
--- a/doc/bugs/Pairing_locally_shows:___34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn
+++ b/doc/bugs/Pairing_locally_shows__58_____34__bad_comment_in_ssh_public_key_ssh-rsa__34__.mdwn
diff --git a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path.mdwn b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path.mdwn
index 20a92fea5..20a92fea5 100644
--- a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path.mdwn
+++ b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path.mdwn
diff --git a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path/comment_1_c949934a5fc8889f7cbeac9e789116f4._comment b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path/comment_1_c949934a5fc8889f7cbeac9e789116f4._comment
index cda18c4a4..cda18c4a4 100644
--- a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path/comment_1_c949934a5fc8889f7cbeac9e789116f4._comment
+++ b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path/comment_1_c949934a5fc8889f7cbeac9e789116f4._comment
diff --git a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path/comment_2_5087aa261b897090031ad32bdc1434f9._comment b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path/comment_2_5087aa261b897090031ad32bdc1434f9._comment
index 4d0ca3634..4d0ca3634 100644
--- a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit.0_wrong_path/comment_2_5087aa261b897090031ad32bdc1434f9._comment
+++ b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit.0_wrong_path/comment_2_5087aa261b897090031ad32bdc1434f9._comment
diff --git a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit/comment_1_720dbf9d959a0050a159713cd1386913._comment b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit/comment_1_720dbf9d959a0050a159713cd1386913._comment
index da503f413..da503f413 100644
--- a/doc/bugs/Problem_with_windows_version:_1.9.5.msysgit/comment_1_720dbf9d959a0050a159713cd1386913._comment
+++ b/doc/bugs/Problem_with_windows_version__58___1.9.5.msysgit/comment_1_720dbf9d959a0050a159713cd1386913._comment
diff --git a/doc/bugs/R__47__O_permissions_are_stalking_me_somehow.mdwn b/doc/bugs/R__47__O_permissions_are_stalking_me_somehow.mdwn
new file mode 100644
index 000000000..df480901d
--- /dev/null
+++ b/doc/bugs/R__47__O_permissions_are_stalking_me_somehow.mdwn
@@ -0,0 +1,55 @@
+### Please describe the problem.
+
+I have got data which I was trying to add to an existing annex.  Unfortunately I have missed first that some files were not having write permissions so initial 'annex add' failed with similar to below messages, so I have pruned misctmp, adjusted permissions and have tried to add again -- but the same error keeps coming back
+
+[[!format sh """
+% chmod +w -R S1/DDA-Freeviewing/surf2anat
+
+% ls -l S1/DDA-Freeviewing/surf2anat/S1_run1_lh*
+-rw-r----- 2 yoh retino 241147956 Feb 28 21:46 S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz
+
+% rm -rf .git/annex/misctmp/*
+zsh: sure you want to delete all the files in /mnt/datasets/mikemp/data-annex/.git/annex/misctmp [yn]? y
+
+% git annex add S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz
+add S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz
+git-annex: .git/annex/misctmp/S1_run1_lh1804289383846930886: rename: permission denied (Permission denied)
+failed
+git-annex: add: 1 failed
+
+% ls -l S1/DDA-Freeviewing/surf2anat/S1_run1_lh*
+-r--r----- 2 yoh retino 241147956 Feb 28 21:46 S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz
+
+% git annex version
+git-annex version: 6.20160307+gitgb095561-1~ndall+1
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository versions: 5 6
+upgrade supported from repository versions: 0 1 2 4 5
+
+
+% rm -rf .git/annex/misctmp/*
+zsh: sure you want to delete all the files in /mnt/datasets/mikemp/data-annex/.git/annex/misctmp [yn]? y
+
+% chmod +w -R S1/DDA-Freeviewing/surf2anat
+
+% git annex add --debug S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz
+[2016-03-10 10:15:22.578786] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","ls-files","--others","--exclude-standard","-z","--","S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz"]
+[2016-03-10 10:15:22.583854] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","check-attr","-z","--stdin","annex.backend","annex.numcopies","annex.largefiles","--"]
+[2016-03-10 10:15:22.584443] read: git ["--version"]
+[2016-03-10 10:15:22.588703] process done ExitSuccess
+add S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz [2016-03-10 10:15:23.186056] read: sha256sum [".git/annex/misctmp/S1_run1_lh1804289383846930886"]
+[2016-03-10 10:15:24.611133] process done ExitSuccess
+
+git-annex: .git/annex/misctmp/S1_run1_lh1804289383846930886: rename: permission denied (Permission denied)
+failed
+[2016-03-10 10:15:24.648808] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","diff","--name-only","--diff-filter=T","-z","--","S1/DDA-Freeviewing/surf2anat/S1_run1_lh_process_surf.nii.gz"]
+git-annex: add: 1 failed
+% ls -l .git/annex/misctmp/S1_run1_lh1804289383846930886
+-r--r----- 2 yoh retino 241147956 Feb 28 21:46 .git/annex/misctmp/S1_run1_lh1804289383846930886
+
+"""]]
+
+[[!meta author=yoh]]
diff --git a/doc/bugs/R__47__O_permissions_are_stalking_me_somehow/comment_1_9e4ba1e03a89c219c5e62280757311ba._comment b/doc/bugs/R__47__O_permissions_are_stalking_me_somehow/comment_1_9e4ba1e03a89c219c5e62280757311ba._comment
new file mode 100644
index 000000000..6e7749529
--- /dev/null
+++ b/doc/bugs/R__47__O_permissions_are_stalking_me_somehow/comment_1_9e4ba1e03a89c219c5e62280757311ba._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T17:53:32Z"
+ content="""
+A file's permissions cannot prevent it being renamed; so I diagnose some
+kind of directory permission problem.
+
+(Also AFAICS git-annex add deals with files whose permissions don't allow
+being read by turning on the read bit. And it should never need the write
+bit. I can `chmod 000 foo; git annex add foo` and it succeeds..)
+"""]]
diff --git a/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn b/doc/bugs/Req__58___Upgrade_to_Yesod_1.4__63___https__58____47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn
index 6e0117202..6e0117202 100644
--- a/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn
+++ b/doc/bugs/Req__58___Upgrade_to_Yesod_1.4__63___https__58____47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5.mdwn b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5.mdwn
index f2ff38702..f2ff38702 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5.mdwn
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5.mdwn
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_1_625268287fe55e6f2254a6f31c637164._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_1_625268287fe55e6f2254a6f31c637164._comment
index b59365274..b59365274 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_1_625268287fe55e6f2254a6f31c637164._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_1_625268287fe55e6f2254a6f31c637164._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_2_3ed7589687fe251066677ad5a01bbbb0._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_2_3ed7589687fe251066677ad5a01bbbb0._comment
index 01f83a095..01f83a095 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_2_3ed7589687fe251066677ad5a01bbbb0._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_2_3ed7589687fe251066677ad5a01bbbb0._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_2_557d428d2aa6bf8e5d435e7f5350f5c6._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_2_557d428d2aa6bf8e5d435e7f5350f5c6._comment
index 179c70f58..179c70f58 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_2_557d428d2aa6bf8e5d435e7f5350f5c6._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_2_557d428d2aa6bf8e5d435e7f5350f5c6._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_4_641389c7c52fa4f624ae74b5d32a6b1c._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_4_641389c7c52fa4f624ae74b5d32a6b1c._comment
index 83a01311c..83a01311c 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_4_641389c7c52fa4f624ae74b5d32a6b1c._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_4_641389c7c52fa4f624ae74b5d32a6b1c._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_5_8d5e7b7aa25a82e14611e0b852512adf._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_5_8d5e7b7aa25a82e14611e0b852512adf._comment
index d3662569c..d3662569c 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_5_8d5e7b7aa25a82e14611e0b852512adf._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_5_8d5e7b7aa25a82e14611e0b852512adf._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_6_391d0ba1cbe59de8e0cca2c29085d9fd._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_6_391d0ba1cbe59de8e0cca2c29085d9fd._comment
index 70f53ea04..70f53ea04 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_6_391d0ba1cbe59de8e0cca2c29085d9fd._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_6_391d0ba1cbe59de8e0cca2c29085d9fd._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_7_a72bed153e91e32ebd8944e5ee17c186._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_7_a72bed153e91e32ebd8944e5ee17c186._comment
index 86043c49f..86043c49f 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_7_a72bed153e91e32ebd8944e5ee17c186._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_7_a72bed153e91e32ebd8944e5ee17c186._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment
index 218126f25..218126f25 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_8_be1d950835ee47774063e1335dd043e3._comment
diff --git a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment
index c1d9a876e..c1d9a876e 100644
--- a/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds:_no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment
+++ b/doc/bugs/Set_some_reasonable_requirements_lower-bound_for_linux_standalone_builds__58___no_longer_usable_on_CentOS_6.5/comment_9_805c0e3d4f3d0f3d4c1d4e6e9a5cf032._comment
diff --git a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file.mdwn b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file.mdwn
index 40cd3ebb9..40cd3ebb9 100644
--- a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file.mdwn
+++ b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file.mdwn
diff --git a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file/comment_1_a1392b92efdff82783a4b0cc2c3c7f2f._comment b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file/comment_1_a1392b92efdff82783a4b0cc2c3c7f2f._comment
index 101b23404..101b23404 100644
--- a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file/comment_1_a1392b92efdff82783a4b0cc2c3c7f2f._comment
+++ b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file/comment_1_a1392b92efdff82783a4b0cc2c3c7f2f._comment
diff --git a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file/comment_2_5e153b7c59c474988fe551a505e545bc._comment b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file/comment_2_5e153b7c59c474988fe551a505e545bc._comment
index c8d4a988a..c8d4a988a 100644
--- a/doc/bugs/TransferScanner_crashed:_fd:59:_hGetLine:_end_of_file/comment_2_5e153b7c59c474988fe551a505e545bc._comment
+++ b/doc/bugs/TransferScanner_crashed__58___fd__58__59__58___hGetLine__58___end_of_file/comment_2_5e153b7c59c474988fe551a505e545bc._comment
diff --git a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist.mdwn b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist.mdwn
index 347f8b3d5..347f8b3d5 100644
--- a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist.mdwn
+++ b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist.mdwn
diff --git a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_1_9892f6b80597f0b637aeb96d212164d9._comment b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_1_9892f6b80597f0b637aeb96d212164d9._comment
index a4715c793..a4715c793 100644
--- a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_1_9892f6b80597f0b637aeb96d212164d9._comment
+++ b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_1_9892f6b80597f0b637aeb96d212164d9._comment
diff --git a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_2_687a9fd1c0b760dd2bef9647cd16175c._comment b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_2_687a9fd1c0b760dd2bef9647cd16175c._comment
index 23ea64bd3..23ea64bd3 100644
--- a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_2_687a9fd1c0b760dd2bef9647cd16175c._comment
+++ b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_2_687a9fd1c0b760dd2bef9647cd16175c._comment
diff --git a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_3_1ef917c10f944e6c874aa40affae7602._comment b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_3_1ef917c10f944e6c874aa40affae7602._comment
index 9830d3dce..9830d3dce 100644
--- a/doc/bugs/Watcher_crashed:_.git__92__annex__92__objects__92__...sha256....pdf__92__:_openTempFile:_does_not_exist/comment_3_1ef917c10f944e6c874aa40affae7602._comment
+++ b/doc/bugs/Watcher_crashed__58___.git__92__annex__92__objects__92__...sha256....pdf__92____58___openTempFile__58___does_not_exist/comment_3_1ef917c10f944e6c874aa40affae7602._comment
diff --git a/doc/bugs/WebDAV_error_when_connecting_to_box.com:_The_resource_you_tried_to_create_already_exists.mdwn b/doc/bugs/WebDAV_error_when_connecting_to_box.com__58___The_resource_you_tried_to_create_already_exists.mdwn
index 857ca333a..857ca333a 100644
--- a/doc/bugs/WebDAV_error_when_connecting_to_box.com:_The_resource_you_tried_to_create_already_exists.mdwn
+++ b/doc/bugs/WebDAV_error_when_connecting_to_box.com__58___The_resource_you_tried_to_create_already_exists.mdwn
diff --git a/doc/bugs/WebDAV_error_when_connecting_to_box.com:_The_resource_you_tried_to_create_already_exists/comment_1_ac40ddc26bff27dafdbc457837695a92._comment b/doc/bugs/WebDAV_error_when_connecting_to_box.com__58___The_resource_you_tried_to_create_already_exists/comment_1_ac40ddc26bff27dafdbc457837695a92._comment
index 89ab74c69..89ab74c69 100644
--- a/doc/bugs/WebDAV_error_when_connecting_to_box.com:_The_resource_you_tried_to_create_already_exists/comment_1_ac40ddc26bff27dafdbc457837695a92._comment
+++ b/doc/bugs/WebDAV_error_when_connecting_to_box.com__58___The_resource_you_tried_to_create_already_exists/comment_1_ac40ddc26bff27dafdbc457837695a92._comment
diff --git a/doc/bugs/Windows:_Annex_can_not_get_files.mdwn b/doc/bugs/Windows__58___Annex_can_not_get_files.mdwn
index f23624032..f23624032 100644
--- a/doc/bugs/Windows:_Annex_can_not_get_files.mdwn
+++ b/doc/bugs/Windows__58___Annex_can_not_get_files.mdwn
diff --git a/doc/bugs/Windows:_Annex_can_not_get_files/comment_1_0d13792a92dc4cde6db73123eeb88218._comment b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_1_0d13792a92dc4cde6db73123eeb88218._comment
index baf8bed8e..baf8bed8e 100644
--- a/doc/bugs/Windows:_Annex_can_not_get_files/comment_1_0d13792a92dc4cde6db73123eeb88218._comment
+++ b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_1_0d13792a92dc4cde6db73123eeb88218._comment
diff --git a/doc/bugs/Windows:_Annex_can_not_get_files/comment_2_66aff09094d593f1c95213b9f8cbf26e._comment b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_2_66aff09094d593f1c95213b9f8cbf26e._comment
index f16e09c0d..f16e09c0d 100644
--- a/doc/bugs/Windows:_Annex_can_not_get_files/comment_2_66aff09094d593f1c95213b9f8cbf26e._comment
+++ b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_2_66aff09094d593f1c95213b9f8cbf26e._comment
diff --git a/doc/bugs/Windows:_Annex_can_not_get_files/comment_3_5039702d7676b4712bb2bf586a83e591._comment b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_3_5039702d7676b4712bb2bf586a83e591._comment
index f5878a2ed..f5878a2ed 100644
--- a/doc/bugs/Windows:_Annex_can_not_get_files/comment_3_5039702d7676b4712bb2bf586a83e591._comment
+++ b/doc/bugs/Windows__58___Annex_can_not_get_files/comment_3_5039702d7676b4712bb2bf586a83e591._comment
diff --git a/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename.mdwn b/doc/bugs/Windows__58___Doesn__39__t_want_to_handle_files_with_2_dots_in_filename.mdwn
index 3a0da6b1d..3a0da6b1d 100644
--- a/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename.mdwn
+++ b/doc/bugs/Windows__58___Doesn__39__t_want_to_handle_files_with_2_dots_in_filename.mdwn
diff --git a/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment b/doc/bugs/Windows__58___Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment
index 1012cc729..1012cc729 100644
--- a/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment
+++ b/doc/bugs/Windows__58___Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment
diff --git a/doc/bugs/Windows:_can__39__t_clone_repository.mdwn b/doc/bugs/Windows__58___can__39__t_clone_repository.mdwn
index 6a99f8474..6a99f8474 100644
--- a/doc/bugs/Windows:_can__39__t_clone_repository.mdwn
+++ b/doc/bugs/Windows__58___can__39__t_clone_repository.mdwn
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh.mdwn b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh.mdwn
index d269f09ae..d269f09ae 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh.mdwn
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh.mdwn
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_1_f8b55d954784346f2e97d1d3ec36bedb._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_1_f8b55d954784346f2e97d1d3ec36bedb._comment
index 59282f6e8..59282f6e8 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_1_f8b55d954784346f2e97d1d3ec36bedb._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_1_f8b55d954784346f2e97d1d3ec36bedb._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_2_fddfc4c5a7428f924ec2ebbc7175a520._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_2_fddfc4c5a7428f924ec2ebbc7175a520._comment
index 77d28f010..77d28f010 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_2_fddfc4c5a7428f924ec2ebbc7175a520._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_2_fddfc4c5a7428f924ec2ebbc7175a520._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_3_15bccb8c66a1a2fb5e13c10902e25866._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_3_15bccb8c66a1a2fb5e13c10902e25866._comment
index 67ab59323..67ab59323 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_3_15bccb8c66a1a2fb5e13c10902e25866._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_3_15bccb8c66a1a2fb5e13c10902e25866._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_4_3d946c88a14929ffcb6f79eae6921e6c._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_4_3d946c88a14929ffcb6f79eae6921e6c._comment
index 7da961c3e..7da961c3e 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_4_3d946c88a14929ffcb6f79eae6921e6c._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_4_3d946c88a14929ffcb6f79eae6921e6c._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_5_5d218a565af8548a29bb6b1447d38ecd._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_5_5d218a565af8548a29bb6b1447d38ecd._comment
index b4743b1d3..b4743b1d3 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_5_5d218a565af8548a29bb6b1447d38ecd._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_5_5d218a565af8548a29bb6b1447d38ecd._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment
index 41668a087..41668a087 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment
index 2762a7702..2762a7702 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment
diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment
index f7e13da8f..f7e13da8f 100644
--- a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment
+++ b/doc/bugs/Windows__58___git_annex_get_fails_with_rsync__58___Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment
diff --git a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable.mdwn b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable.mdwn
index 070191a63..070191a63 100644
--- a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable.mdwn
+++ b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable.mdwn
diff --git a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_1_1c1a8a9171ddd10afea4d639f2aa7af7._comment b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_1_1c1a8a9171ddd10afea4d639f2aa7af7._comment
index 86c55006a..86c55006a 100644
--- a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_1_1c1a8a9171ddd10afea4d639f2aa7af7._comment
+++ b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_1_1c1a8a9171ddd10afea4d639f2aa7af7._comment
diff --git a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_2_56832a2c87030b9b7a4c3946cdaf1b76._comment b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_2_56832a2c87030b9b7a4c3946cdaf1b76._comment
index b23824234..b23824234 100644
--- a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_2_56832a2c87030b9b7a4c3946cdaf1b76._comment
+++ b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_2_56832a2c87030b9b7a4c3946cdaf1b76._comment
diff --git a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_3_418a94a7257c2c5eaa7e0febe93c33ab._comment b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_3_418a94a7257c2c5eaa7e0febe93c33ab._comment
index 6641bb75d..6641bb75d 100644
--- a/doc/bugs/Windows:_repo_located_on_different_drive_letter_unavailable/comment_3_418a94a7257c2c5eaa7e0febe93c33ab._comment
+++ b/doc/bugs/Windows__58___repo_located_on_different_drive_letter_unavailable/comment_3_418a94a7257c2c5eaa7e0febe93c33ab._comment
diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree.mdwn b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree.mdwn
index 57f95d992..57f95d992 100644
--- a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree.mdwn
+++ b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree.mdwn
diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_1_5829b551f5e1413ee236055eb3345760._comment b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_1_5829b551f5e1413ee236055eb3345760._comment
index 3ed4e1886..3ed4e1886 100644
--- a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_1_5829b551f5e1413ee236055eb3345760._comment
+++ b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_1_5829b551f5e1413ee236055eb3345760._comment
diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_2_535016130f3307c8104168e6bb8a583d._comment b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_2_535016130f3307c8104168e6bb8a583d._comment
index bda2a400d..bda2a400d 100644
--- a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_2_535016130f3307c8104168e6bb8a583d._comment
+++ b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_2_535016130f3307c8104168e6bb8a583d._comment
diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_3_79c66569c22a1280b807a3c21c2cdc4f._comment b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_3_79c66569c22a1280b807a3c21c2cdc4f._comment
index c95034fdf..c95034fdf 100644
--- a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_3_79c66569c22a1280b807a3c21c2cdc4f._comment
+++ b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_3_79c66569c22a1280b807a3c21c2cdc4f._comment
diff --git a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_4_2e5791aa8f568f86d0185a553227afa8._comment b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_4_2e5791aa8f568f86d0185a553227afa8._comment
index 31a51db95..31a51db95 100644
--- a/doc/bugs/Windows_:_git-annex:_failed_to_read_sha_from_git_write-tree/comment_4_2e5791aa8f568f86d0185a553227afa8._comment
+++ b/doc/bugs/Windows___58___git-annex__58___failed_to_read_sha_from_git_write-tree/comment_4_2e5791aa8f568f86d0185a553227afa8._comment
diff --git a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known.mdwn b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known.mdwn
index 69732a743..69732a743 100644
--- a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known.mdwn
+++ b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known.mdwn
diff --git a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known/comment_1_4d1b96911e3e227c7433ccea543872c1._comment b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known/comment_1_4d1b96911e3e227c7433ccea543872c1._comment
index 5808c5644..5808c5644 100644
--- a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known/comment_1_4d1b96911e3e227c7433ccea543872c1._comment
+++ b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known/comment_1_4d1b96911e3e227c7433ccea543872c1._comment
diff --git a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known/comment_2_7be98a630e1deb655a4d1675bf622d05._comment b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known/comment_2_7be98a630e1deb655a4d1675bf622d05._comment
index 2dd988501..2dd988501 100644
--- a/doc/bugs/_WebApp_crashed:_getAddrInfo:_does_not_exist___40__Name_or_service_not_known/comment_2_7be98a630e1deb655a4d1675bf622d05._comment
+++ b/doc/bugs/_WebApp_crashed__58___getAddrInfo__58___does_not_exist___40__Name_or_service_not_known/comment_2_7be98a630e1deb655a4d1675bf622d05._comment
diff --git a/doc/bugs/__171__uninit__187___on_direct_mode_repo_gives___171__removeLink:_permission_denied___40__Permission_denied__41____187__.mdwn b/doc/bugs/__171__uninit__187___on_direct_mode_repo_gives___171__removeLink__58___permission_denied___40__Permission_denied__41____187__.mdwn
index b7dcf29b7..b7dcf29b7 100644
--- a/doc/bugs/__171__uninit__187___on_direct_mode_repo_gives___171__removeLink:_permission_denied___40__Permission_denied__41____187__.mdwn
+++ b/doc/bugs/__171__uninit__187___on_direct_mode_repo_gives___171__removeLink__58___permission_denied___40__Permission_denied__41____187__.mdwn
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit.mdwn b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit.mdwn
index f6265f05a..f6265f05a 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit.mdwn
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit.mdwn
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_10_8abfe7417167df54b686960319465a65._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_10_8abfe7417167df54b686960319465a65._comment
index a8d501682..a8d501682 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_10_8abfe7417167df54b686960319465a65._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_10_8abfe7417167df54b686960319465a65._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_11_7776659e257a97c9a3855c8ad008207a._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_11_7776659e257a97c9a3855c8ad008207a._comment
index 4632a5df3..4632a5df3 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_11_7776659e257a97c9a3855c8ad008207a._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_11_7776659e257a97c9a3855c8ad008207a._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_12_e8bbfb4eb26dae31f90a5fa53b4dc948._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_12_e8bbfb4eb26dae31f90a5fa53b4dc948._comment
index dd6b5c196..dd6b5c196 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_12_e8bbfb4eb26dae31f90a5fa53b4dc948._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_12_e8bbfb4eb26dae31f90a5fa53b4dc948._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_13_aee32c53d2198ba1e82acd0c617d517c._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_13_aee32c53d2198ba1e82acd0c617d517c._comment
index d0ca7f554..d0ca7f554 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_13_aee32c53d2198ba1e82acd0c617d517c._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_13_aee32c53d2198ba1e82acd0c617d517c._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_1_2a64a2da445a64149da7335f35142a08._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_1_2a64a2da445a64149da7335f35142a08._comment
index af980d1bc..af980d1bc 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_1_2a64a2da445a64149da7335f35142a08._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_1_2a64a2da445a64149da7335f35142a08._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_2_decb1689b8cc2541077e2d0ae273b5e7._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_2_decb1689b8cc2541077e2d0ae273b5e7._comment
index b4feb654f..b4feb654f 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_2_decb1689b8cc2541077e2d0ae273b5e7._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_2_decb1689b8cc2541077e2d0ae273b5e7._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_3_1f6443e495cc16a13e2e4175e73dc8f1._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_3_1f6443e495cc16a13e2e4175e73dc8f1._comment
index 78e7f4138..78e7f4138 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_3_1f6443e495cc16a13e2e4175e73dc8f1._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_3_1f6443e495cc16a13e2e4175e73dc8f1._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_4_522020e71393434834def6c80b82e39e._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_4_522020e71393434834def6c80b82e39e._comment
index bfab0d1be..bfab0d1be 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_4_522020e71393434834def6c80b82e39e._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_4_522020e71393434834def6c80b82e39e._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_5_cc4cba022869b32d298cdafed9545a34._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_5_cc4cba022869b32d298cdafed9545a34._comment
index 0be1eb958..0be1eb958 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_5_cc4cba022869b32d298cdafed9545a34._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_5_cc4cba022869b32d298cdafed9545a34._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_6_e71b251db2ff1f52a40fec40303cdefc._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_6_e71b251db2ff1f52a40fec40303cdefc._comment
index 3fcbf200b..3fcbf200b 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_6_e71b251db2ff1f52a40fec40303cdefc._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_6_e71b251db2ff1f52a40fec40303cdefc._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_7_0b6413f9ca403be3d83bb3306d1e7f8f._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_7_0b6413f9ca403be3d83bb3306d1e7f8f._comment
index eb2dea956..eb2dea956 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_7_0b6413f9ca403be3d83bb3306d1e7f8f._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_7_0b6413f9ca403be3d83bb3306d1e7f8f._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_8_f951981f0bf8cbaecfc46e7b9c903d70._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_8_f951981f0bf8cbaecfc46e7b9c903d70._comment
index ec876d2ea..ec876d2ea 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_8_f951981f0bf8cbaecfc46e7b9c903d70._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_8_f951981f0bf8cbaecfc46e7b9c903d70._comment
diff --git a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_9_7c98c8b291fdf28a09ccb6c7e4001d5a._comment b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_9_7c98c8b291fdf28a09ccb6c7e4001d5a._comment
index 1a49e449f..1a49e449f 100644
--- a/doc/bugs/__34__error:_invalid_object__34____44___after_add__59___cannot_commit/comment_9_7c98c8b291fdf28a09ccb6c7e4001d5a._comment
+++ b/doc/bugs/__34__error__58___invalid_object__34____44___after_add__59___cannot_commit/comment_9_7c98c8b291fdf28a09ccb6c7e4001d5a._comment
diff --git a/doc/bugs/__34__fatal:_bad_config_file__34__.mdwn b/doc/bugs/__34__fatal__58___bad_config_file__34__.mdwn
index baaa796db..baaa796db 100644
--- a/doc/bugs/__34__fatal:_bad_config_file__34__.mdwn
+++ b/doc/bugs/__34__fatal__58___bad_config_file__34__.mdwn
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows.mdwn b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows.mdwn
index d127934fa..d127934fa 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows.mdwn
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows.mdwn
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_1_ce2355485f2610b6a7a79914dcd365be._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_1_ce2355485f2610b6a7a79914dcd365be._comment
index 127d0603f..127d0603f 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_1_ce2355485f2610b6a7a79914dcd365be._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_1_ce2355485f2610b6a7a79914dcd365be._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_2_dfc398002e2ffbe0b63ce422a1e16d67._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_2_dfc398002e2ffbe0b63ce422a1e16d67._comment
index 89af53b41..89af53b41 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_2_dfc398002e2ffbe0b63ce422a1e16d67._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_2_dfc398002e2ffbe0b63ce422a1e16d67._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_3_1d23e9760782a8d6d2ea2dd5a4c6253a._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_3_1d23e9760782a8d6d2ea2dd5a4c6253a._comment
index 153c48db2..153c48db2 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_3_1d23e9760782a8d6d2ea2dd5a4c6253a._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_3_1d23e9760782a8d6d2ea2dd5a4c6253a._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_4_108f3e4449fc9591bcdeb490b486357f._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_4_108f3e4449fc9591bcdeb490b486357f._comment
index 3aa56f004..3aa56f004 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_4_108f3e4449fc9591bcdeb490b486357f._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_4_108f3e4449fc9591bcdeb490b486357f._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_5_a1c8ac1d7884d676f05db588b2894603._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_5_a1c8ac1d7884d676f05db588b2894603._comment
index 54c29af3b..54c29af3b 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_5_a1c8ac1d7884d676f05db588b2894603._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_5_a1c8ac1d7884d676f05db588b2894603._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_6_739b4fd2156de7570ec71417f41eb188._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_6_739b4fd2156de7570ec71417f41eb188._comment
index b20fe2ab9..b20fe2ab9 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_6_739b4fd2156de7570ec71417f41eb188._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_6_739b4fd2156de7570ec71417f41eb188._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_7_c561d2eb75a2579db620bf7877c98502._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_7_c561d2eb75a2579db620bf7877c98502._comment
index 6243b9129..6243b9129 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_7_c561d2eb75a2579db620bf7877c98502._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_7_c561d2eb75a2579db620bf7877c98502._comment
diff --git a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_8_169423dd4f3292e503b285f088f6701f._comment b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_8_169423dd4f3292e503b285f088f6701f._comment
index c88e3b1b5..c88e3b1b5 100644
--- a/doc/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/comment_8_169423dd4f3292e503b285f088f6701f._comment
+++ b/doc/bugs/__34__git-annex__58___direct__58___1_failed__34___on_Windows/comment_8_169423dd4f3292e503b285f088f6701f._comment
diff --git a/doc/bugs/__39__add__39___results_in_max_cpu__44___long_run_and_huge_repo/comment_1_3233c29405da296360d57af7d5eb418d._comment b/doc/bugs/__39__add__39___results_in_max_cpu__44___long_run_and_huge_repo/comment_1_3233c29405da296360d57af7d5eb418d._comment
new file mode 100644
index 000000000..4bd283aa2
--- /dev/null
+++ b/doc/bugs/__39__add__39___results_in_max_cpu__44___long_run_and_huge_repo/comment_1_3233c29405da296360d57af7d5eb418d._comment
@@ -0,0 +1,46 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T17:59:08Z"
+ content="""
+If I've done the math right, 5 files per second over 3 hours is only 2000 files.
+The size of the files does matter, since git-annex has to read them all.
+You said the repo grew to 28 gb; does that mean you added 2000 files
+totalling 28 gb in size?
+
+I can add 2000 tiny files (5 bytes each) in 2 seconds on a SSD on Linux.
+
+By using a FAT filesystem, you've forced git-annex to use direct mode.
+Direct mode can be a little slower, but not a great deal. Adding 2000 files
+to a direct mode repo takes around 11 seconds here. (I did a little
+optimisation and sped that up to 7 seconds.)
+
+Doing the same benchmark on a removable USB stick with a FAT filesystem
+was still not slow; 7 seconds again.
+
+But then I had linux mount that FAT filesystem sync (so, it flushes each
+file write to disk, not buffering them), and I start getting closer to your
+slow speed; benchmark took 53 minutes.
+
+So, I think the slow speed you're seeing is quite likely due to a
+combination of, in order from most to least important:
+
+1. Synchronous writes to your disk drive. Fixable in linux by eg, running
+   "mount -o remount,async /path/to/repo" and there's probably something
+   similar for OSX.
+2. External drive being slow to access. (And if a spinning disk, slow to
+   seek.)
+3. git-annex using direct mode on FAT
+
+Also there is a fair amount of faff that git-annex does when adding a file
+around calling rename, stat, mkdir, etc multiple times. It may be possible
+to optimize some of that to get at some speedup on synchronous disks.
+But, I'd not expect more than a few percentage points speedup from such
+optimisation.
+
+One other possiblity is you could be hitting an edge case where direct mode's
+performace is bad. One known such edge case is if you have a lot of files
+that all have the same content. For example, I made 2000 files that were
+all empty; adding them to a direct mode repository gets slower and slower
+to the point it's spending 10 or more seconds per file. 
+"""]]
diff --git a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git.mdwn b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git.mdwn
index 74e9235dd..74e9235dd 100644
--- a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git.mdwn
+++ b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git.mdwn
diff --git a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_1_60db0d6bfc71a62b3c1021527a8d2d60._comment b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_1_60db0d6bfc71a62b3c1021527a8d2d60._comment
index 4b7b0e90a..4b7b0e90a 100644
--- a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_1_60db0d6bfc71a62b3c1021527a8d2d60._comment
+++ b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_1_60db0d6bfc71a62b3c1021527a8d2d60._comment
diff --git a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_2_49682a91147990a578929678880bd226._comment b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_2_49682a91147990a578929678880bd226._comment
index e93708644..e93708644 100644
--- a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_2_49682a91147990a578929678880bd226._comment
+++ b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_2_49682a91147990a578929678880bd226._comment
diff --git a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_3_bf0fa06596338444a3772d1865b17e26._comment b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_3_bf0fa06596338444a3772d1865b17e26._comment
index 0d7fb9c2d..0d7fb9c2d 100644
--- a/doc/bugs/_git-annex:_bad_url_ssh:__47____47__git__64__gitlab.com:__126____47__gitlabname__47__reponame.git/comment_3_bf0fa06596338444a3772d1865b17e26._comment
+++ b/doc/bugs/_git-annex__58___bad_url_ssh__58____47____47__git__64__gitlab.com__58____126____47__gitlabname__47__reponame.git/comment_3_bf0fa06596338444a3772d1865b17e26._comment
diff --git a/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn b/doc/bugs/addurl__58_____34__rename__58___does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
index 3383dd52a..3383dd52a 100644
--- a/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
+++ b/doc/bugs/addurl__58_____34__rename__58___does_not_exist__34___and_reports_fail__44___but_succeeds.mdwn
diff --git a/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds/comment_1_1f5e0bc93631baf0f8c1bec2e68493c5._comment b/doc/bugs/addurl__58_____34__rename__58___does_not_exist__34___and_reports_fail__44___but_succeeds/comment_1_1f5e0bc93631baf0f8c1bec2e68493c5._comment
index 6ea844f2e..6ea844f2e 100644
--- a/doc/bugs/addurl:___34__rename:_does_not_exist__34___and_reports_fail__44___but_succeeds/comment_1_1f5e0bc93631baf0f8c1bec2e68493c5._comment
+++ b/doc/bugs/addurl__58_____34__rename__58___does_not_exist__34___and_reports_fail__44___but_succeeds/comment_1_1f5e0bc93631baf0f8c1bec2e68493c5._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies.mdwn b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies.mdwn
index 0d7804a43..0d7804a43 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies.mdwn
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies.mdwn
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment
index c059040e1..c059040e1 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_2_e379c25d18ee1ae4ea7e0a5a33e1c75e._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_2_e379c25d18ee1ae4ea7e0a5a33e1c75e._comment
index c9e046aa6..c9e046aa6 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_2_e379c25d18ee1ae4ea7e0a5a33e1c75e._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_2_e379c25d18ee1ae4ea7e0a5a33e1c75e._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_3_063e27ec1f2dd23fbf914a08213316df._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_3_063e27ec1f2dd23fbf914a08213316df._comment
index 6146fad5c..6146fad5c 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_3_063e27ec1f2dd23fbf914a08213316df._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_3_063e27ec1f2dd23fbf914a08213316df._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment
index 1fa409f9c..1fa409f9c 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_4_8688477bb694dbc9e6c7768f5f375f3f._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment
index 785d6c7b7..785d6c7b7 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_5_a256583bd9b3815a23cd1ca40d6c19ca._comment
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_6_0999f9ec9c3d6f51889141344d4cfcb6._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_6_0999f9ec9c3d6f51889141344d4cfcb6._comment
index a2e678c1b..a2e678c1b 100644
--- a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_6_0999f9ec9c3d6f51889141344d4cfcb6._comment
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails__58___no_known_copies/comment_6_0999f9ec9c3d6f51889141344d4cfcb6._comment
diff --git a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1.mdwn
index dd544d7c7..dd544d7c7 100644
--- a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1.mdwn
+++ b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1.mdwn
diff --git a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1/comment_1_ccc2c90d05862edda9ce1ac92efab516._comment b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1/comment_1_ccc2c90d05862edda9ce1ac92efab516._comment
index 3691b8a8a..3691b8a8a 100644
--- a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1/comment_1_ccc2c90d05862edda9ce1ac92efab516._comment
+++ b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1/comment_1_ccc2c90d05862edda9ce1ac92efab516._comment
diff --git a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1/comment_2_1cdf6de88c7f121c604177593915e626._comment b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1/comment_2_1cdf6de88c7f121c604177593915e626._comment
index 55e48f0e7..55e48f0e7 100644
--- a/doc/bugs/arm_build:_ssh:_error_while_loading_shared_libraries:_libselinux.so.1/comment_2_1cdf6de88c7f121c604177593915e626._comment
+++ b/doc/bugs/arm_build__58___ssh__58___error_while_loading_shared_libraries__58___libselinux.so.1/comment_2_1cdf6de88c7f121c604177593915e626._comment
diff --git a/doc/bugs/armel_standalone:_git-upload-pack_and_-receive-pack_not_shimmed.mdwn b/doc/bugs/armel_standalone__58___git-upload-pack_and_-receive-pack_not_shimmed.mdwn
index 317b9fcda..317b9fcda 100644
--- a/doc/bugs/armel_standalone:_git-upload-pack_and_-receive-pack_not_shimmed.mdwn
+++ b/doc/bugs/armel_standalone__58___git-upload-pack_and_-receive-pack_not_shimmed.mdwn
diff --git a/doc/bugs/armel_standalone:_git-upload-pack_and_-receive-pack_not_shimmed/comment_1_403f1058c3eab5c95fefab5a96aa3f51._comment b/doc/bugs/armel_standalone__58___git-upload-pack_and_-receive-pack_not_shimmed/comment_1_403f1058c3eab5c95fefab5a96aa3f51._comment
index 65d8d0667..65d8d0667 100644
--- a/doc/bugs/armel_standalone:_git-upload-pack_and_-receive-pack_not_shimmed/comment_1_403f1058c3eab5c95fefab5a96aa3f51._comment
+++ b/doc/bugs/armel_standalone__58___git-upload-pack_and_-receive-pack_not_shimmed/comment_1_403f1058c3eab5c95fefab5a96aa3f51._comment
diff --git a/doc/bugs/awkward_error_from_annex_whenever_operating_on_a_clone_with_submodules.mdwn b/doc/bugs/awkward_error_from_annex_whenever_operating_on_a_clone_with_submodules.mdwn
new file mode 100644
index 000000000..720b0c069
--- /dev/null
+++ b/doc/bugs/awkward_error_from_annex_whenever_operating_on_a_clone_with_submodules.mdwn
@@ -0,0 +1,60 @@
+### Please describe the problem.
+
+git annex init  fails on a clone of a sub sub module from a git repo
+
+### What steps will reproduce the problem?
+
+This is the archive with sample repo which is used in example below
+[http://www.onerussian.com/tmp/repl_submodule.tgz]
+
+
+### What version of git-annex are you using? On what operating system?
+
+6.20160307+gitgb095561-1~ndall+1
+
+[[!format sh """
+> tar -xzf repl_submodule.tgz        
+
+> ls -ld datalad_temp_testrepo_Lb8lMD
+drwx------ 5 yoh yoh 180 Mar 29 09:06 datalad_temp_testrepo_Lb8lMD/
+
+> git clone datalad_temp_testrepo_Lb8lMD/sub1/sub1
+Cloning into 'sub1'...
+done.
+
+> cd sub1
+INFO.txt  sub1/  sub2/  test-annex.dat@  test.dat
+
+> git annex init
+init  fatal: Could not switch to '/sub1/': No such file or directory
+ok
+(recording state in git...)
+
+> cat .git/config 
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[remote "origin"]
+	url = /tmp/datalad_temp_testrepo_Lb8lMD/sub1/sub1
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[annex]
+	uuid = 7293cd84-98c5-4f8c-b1ff-1c4fadd90ba3
+	version = 5
+
+> git annex --debug init 2>&1 | grep -3 "Could not"
+[2016-03-29 09:22:21.786669] read: git ["config","--null","--list"]
+[2016-03-29 09:22:21.792047] process done ExitSuccess
+[2016-03-29 09:22:21.792158] read: git ["--git-dir=../datalad_temp_testrepo_Lb8lMD/sub1/sub1/.git","--work-tree=/sub1/sub1","--literal-pathspecs","show-ref","git-annex"]
+fatal: Could not switch to '/sub1/': No such file or directory
+[2016-03-29 09:22:21.797597] process done ExitFailure 128
+ok
+[2016-03-29 09:22:21.800514] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","hash-object","-w","--stdin-paths","--no-filters"]
+
+"""]]
+
+[[!meta author=yoh]]
diff --git a/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn b/doc/bugs/cabal_install_fails__58___Could_not_find_module___8216__Network.URI__8217__.mdwn
index 2f9b5de3e..2f9b5de3e 100644
--- a/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn
+++ b/doc/bugs/cabal_install_fails__58___Could_not_find_module___8216__Network.URI__8217__.mdwn
diff --git a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__.mdwn b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__.mdwn
index 027d22431..027d22431 100644
--- a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__.mdwn
+++ b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__.mdwn
diff --git a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__2.mdwn b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__2.mdwn
index 1be88f4a1..1be88f4a1 100644
--- a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__2.mdwn
+++ b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__2.mdwn
diff --git a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__2/comment_1_b56c847c5eda432a4330b4d853a25519._comment b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__2/comment_1_b56c847c5eda432a4330b4d853a25519._comment
index 43e6a390b..43e6a390b 100644
--- a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__2/comment_1_b56c847c5eda432a4330b4d853a25519._comment
+++ b/doc/bugs/commitBuffer__58___invalid_argument___40__invalid_character__41__2/comment_1_b56c847c5eda432a4330b4d853a25519._comment
diff --git a/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_1_396b436e5fec8fc492d9595afa5f6a85._comment b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_1_396b436e5fec8fc492d9595afa5f6a85._comment
new file mode 100644
index 000000000..567c494ad
--- /dev/null
+++ b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_1_396b436e5fec8fc492d9595afa5f6a85._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T20:40:45Z"
+ content="""
+Is this git-annex built with the ConcurrentOutput flag?
+
+It kind of looks like it; if so the only thing that looks wrong
+is there are for some reason two copies of each progress line for each
+file.
+
+I don't see this in my testing..
+"""]]
diff --git a/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_2_1c348653d630e40e2ff87b7f6c159b35._comment b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_2_1c348653d630e40e2ff87b7f6c159b35._comment
new file mode 100644
index 000000000..6e326e59e
--- /dev/null
+++ b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_2_1c348653d630e40e2ff87b7f6c159b35._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="comment 2"
+ date="2016-03-14T21:05:06Z"
+ content="""
+FWIW it was \"stock\" debian/neurodebian build so whatever default or flags you impose in debian/rules -- they were it ;)
+
+[[!format sh \"\"\"
+neurodebian@smaug ..annex/6.20160213+gitg9597a21-1~ndall+1 % grep Concur git-annex_6.20160213+gitg9597a21-1~ndall+1_amd64.build
+[178 of 534] Compiling Messages.Concurrent ( Messages/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Messages/Concurrent.o )
+[239 of 534] Compiling Annex.Concurrent ( Annex/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Annex/Concurrent.o )
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+
+\"\"\"]]
+"""]]
diff --git a/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_3_4600a48aa4c00102b2974c1ae18f6db7._comment b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_3_4600a48aa4c00102b2974c1ae18f6db7._comment
new file mode 100644
index 000000000..4acf1465b
--- /dev/null
+++ b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__/comment_3_4600a48aa4c00102b2974c1ae18f6db7._comment
@@ -0,0 +1,52 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="comment 3"
+ date="2016-03-14T21:10:56Z"
+ content="""
+just rechecked with freshier version:
+
+[[!format sh \"\"\"
+% git clone https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/repo/freesurfer.git
+Cloning into 'freesurfer'...
+Checking connectivity... done.
+% cd freesurfer
+% git annex get -J 5 .
+(merging origin/git-annex origin/synced/git-annex into git-annex...)
+get BrainstemSS/AtlasDump.mgz (from origin...) (checksum...) ok
+get BrainstemSS/AtlasMesh.gz (from origin...) 
+get GEMS/data/CurrentMeshCollection30.gz 
+  not enough free space, need 2.94 MB more (use --force to override this check or adjust annex.diskreserve)
+
+  Unable to access these remotes: origin
+
+  Try making some of these repositories available:
+  	14311777-6106-4ba8-8356-2bfb0d198b64 -- zkaufman@sand:/autofs/space/sand_001/users/zkaufman/temp/stable.sync/dev.git
+   	58892d74-dae0-4bd1-a160-011e82d201f2 -- sand trunk
+   	6d0bc2d9-c184-445c-82d0-b5c56c5bf5d9 -- zkaufman@gust.nmr.mgh.harvard.edu:/autofs/space/sand_001/users/zkaufman/freesurfer_lion/trunk/dev
+   	739a31b2-febf-43ee-be59-713bdaa01a06 -- sand-sync
+   	9240fb38-adbe-4bfe-847a-bdd98d570f75 -- [origin]
+   	ba0b9401-2821-41d2-b9fc-f3319dc053e3 -- sand stable6
+   	d018cb1b-c841-48b8-ba50-11b686a5c6ad
+failed
+get BrainstemSS/mac_osx/segmentSubject.app/Contents/Resources/membrane.icns (from origin...) (checksum...) ok
+get BrainstemSS/AtlasMesh.gz (from origin...) 
+....
+get BrainstemSS/AtlasMesh.gz (from origin...) 
+19%         336.0KB/s 4s
+19%         336.0KB/s 4s
+get BrainstemSS/linux_x86_64/SegmentSubject.bin (from origin...) 
+10%         640.0KB/s 9s
+10%         640.0KB/s 9s
+get BrainstemSS/mac_osx/segmentSubject.app/Contents/MacOS/segmentSubject (from origin...) 
+18%         864.0KB/s 4s
+18%         864.0KB/s 4s
+get distribution/average/Buckner_JNeurophysiol11_MNI152/Buckner2011_7Networks_MNI152_FreeSurferConformed1mm_LooseMask.nii.gz (from origin
+...) 
+get distribution/average/Buckner_JNeurophysiol11_MNI152/Buckner2011_7Networks_MNI152_FreeSurferConformed1mm_TightMask.nii.gz (from origin
+...) 
+^C
+% git annex version
+git-annex version: 6.20160307+gitgb095561-1~ndall+1
+...
+\"\"\"]]
+"""]]
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build.mdwn b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build.mdwn
index f21bb2664..f21bb2664 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build.mdwn
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build.mdwn
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_1_557c9147078e04f7b62a873bf94f7b6a._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_1_557c9147078e04f7b62a873bf94f7b6a._comment
index 7a6d6831e..7a6d6831e 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_1_557c9147078e04f7b62a873bf94f7b6a._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_1_557c9147078e04f7b62a873bf94f7b6a._comment
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_2_3750368dfb19c90724670345c1b58f13._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_2_3750368dfb19c90724670345c1b58f13._comment
index 2e9081f9e..2e9081f9e 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_2_3750368dfb19c90724670345c1b58f13._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_2_3750368dfb19c90724670345c1b58f13._comment
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_2_44e295cb49cbce486577129d90ee6bb9._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_2_44e295cb49cbce486577129d90ee6bb9._comment
index 82b5ce17a..82b5ce17a 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_2_44e295cb49cbce486577129d90ee6bb9._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_2_44e295cb49cbce486577129d90ee6bb9._comment
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_4_367447b316e08d833f38349b9c86fd49._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_4_367447b316e08d833f38349b9c86fd49._comment
index a22a49999..a22a49999 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_4_367447b316e08d833f38349b9c86fd49._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_4_367447b316e08d833f38349b9c86fd49._comment
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_5_cdd169574e50951bbb9d8fdd310f8bcc._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_5_cdd169574e50951bbb9d8fdd310f8bcc._comment
index f90c685a7..f90c685a7 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_5_cdd169574e50951bbb9d8fdd310f8bcc._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_5_cdd169574e50951bbb9d8fdd310f8bcc._comment
diff --git a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_6_76a5e57d178ed85e5e075a22ac521eca._comment b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_6_76a5e57d178ed85e5e075a22ac521eca._comment
index f5807c2e7..f5807c2e7 100644
--- a/doc/bugs/fails_to_addurl_to_file:__47____47____47___in_the_most_recent_snapshot_build/comment_6_76a5e57d178ed85e5e075a22ac521eca._comment
+++ b/doc/bugs/fails_to_addurl_to_file__58____47____47____47___in_the_most_recent_snapshot_build/comment_6_76a5e57d178ed85e5e075a22ac521eca._comment
diff --git a/doc/bugs/fatal:_Cannot_handle_files_this_big.mdwn b/doc/bugs/fatal__58___Cannot_handle_files_this_big.mdwn
index 7272bfc29..7272bfc29 100644
--- a/doc/bugs/fatal:_Cannot_handle_files_this_big.mdwn
+++ b/doc/bugs/fatal__58___Cannot_handle_files_this_big.mdwn
diff --git a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_1_e4f03a86a7adc6c5421d1e70c37659e0._comment b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_1_e4f03a86a7adc6c5421d1e70c37659e0._comment
index b580cdbe6..b580cdbe6 100644
--- a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_1_e4f03a86a7adc6c5421d1e70c37659e0._comment
+++ b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_1_e4f03a86a7adc6c5421d1e70c37659e0._comment
diff --git a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_2_546782c644230741470f9a9de23bd019._comment b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_2_546782c644230741470f9a9de23bd019._comment
index 0ea9dc4d1..0ea9dc4d1 100644
--- a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_2_546782c644230741470f9a9de23bd019._comment
+++ b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_2_546782c644230741470f9a9de23bd019._comment
diff --git a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_3_151e7cf96c7d168e1397d111aa47f279._comment b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_3_151e7cf96c7d168e1397d111aa47f279._comment
index e6ad551e4..e6ad551e4 100644
--- a/doc/bugs/fatal:_Cannot_handle_files_this_big/comment_3_151e7cf96c7d168e1397d111aa47f279._comment
+++ b/doc/bugs/fatal__58___Cannot_handle_files_this_big/comment_3_151e7cf96c7d168e1397d111aa47f279._comment
diff --git a/doc/bugs/fatal:_git-write-tree:_error_building_trees.mdwn b/doc/bugs/fatal__58___git-write-tree__58___error_building_trees.mdwn
index b8967eca5..b8967eca5 100644
--- a/doc/bugs/fatal:_git-write-tree:_error_building_trees.mdwn
+++ b/doc/bugs/fatal__58___git-write-tree__58___error_building_trees.mdwn
diff --git a/doc/bugs/fatal:_git-write-tree:_error_building_trees/comment_2_77295c0b749e984a6fb200d3b73b5765._comment b/doc/bugs/fatal__58___git-write-tree__58___error_building_trees/comment_2_77295c0b749e984a6fb200d3b73b5765._comment
index dabc1d4f3..dabc1d4f3 100644
--- a/doc/bugs/fatal:_git-write-tree:_error_building_trees/comment_2_77295c0b749e984a6fb200d3b73b5765._comment
+++ b/doc/bugs/fatal__58___git-write-tree__58___error_building_trees/comment_2_77295c0b749e984a6fb200d3b73b5765._comment
diff --git a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47.mdwn b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47.mdwn
index dae654d13..dae654d13 100644
--- a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47.mdwn
+++ b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47.mdwn
diff --git a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_1_e6f39b2ef55b0daa491f4b6329a906bc._comment b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_1_e6f39b2ef55b0daa491f4b6329a906bc._comment
index cc616aae9..cc616aae9 100644
--- a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_1_e6f39b2ef55b0daa491f4b6329a906bc._comment
+++ b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_1_e6f39b2ef55b0daa491f4b6329a906bc._comment
diff --git a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment
index a40e9cbe5..a40e9cbe5 100644
--- a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment
+++ b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment
diff --git a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_4_b533b1de535a057b7ebf99afc92691ed._comment b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_4_b533b1de535a057b7ebf99afc92691ed._comment
index ac4a9e91a..ac4a9e91a 100644
--- a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47/comment_4_b533b1de535a057b7ebf99afc92691ed._comment
+++ b/doc/bugs/fatal__58___unable_to_access___39__..__47__..__47__..__47/comment_4_b533b1de535a057b7ebf99afc92691ed._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied.mdwn b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied.mdwn
index 260ab9981..260ab9981 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied.mdwn
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied.mdwn
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_1_f4584158b35b80ece1060308883e2dc4._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_1_f4584158b35b80ece1060308883e2dc4._comment
index 6312a58a5..6312a58a5 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_1_f4584158b35b80ece1060308883e2dc4._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_1_f4584158b35b80ece1060308883e2dc4._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_2_a4d7aae848340771a9b8e2c87abeea42._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_2_a4d7aae848340771a9b8e2c87abeea42._comment
index f2fb4f14f..f2fb4f14f 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_2_a4d7aae848340771a9b8e2c87abeea42._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_2_a4d7aae848340771a9b8e2c87abeea42._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_3_06bda101ad584b4b882de8b2e202d679._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_3_06bda101ad584b4b882de8b2e202d679._comment
index 863f401ce..863f401ce 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_3_06bda101ad584b4b882de8b2e202d679._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_3_06bda101ad584b4b882de8b2e202d679._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_4_4fc6b25401b645cabc04b510bdfa6863._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_4_4fc6b25401b645cabc04b510bdfa6863._comment
index e1049ce60..e1049ce60 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_4_4fc6b25401b645cabc04b510bdfa6863._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_4_4fc6b25401b645cabc04b510bdfa6863._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_5_4e193306801680bba433e75eb4dcba05._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_5_4e193306801680bba433e75eb4dcba05._comment
index 137638aa5..137638aa5 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_5_4e193306801680bba433e75eb4dcba05._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_5_4e193306801680bba433e75eb4dcba05._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_6_76ccdf0542e76e4dbd61f3b3228d40ba._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_6_76ccdf0542e76e4dbd61f3b3228d40ba._comment
index 0ad9768f6..0ad9768f6 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_6_76ccdf0542e76e4dbd61f3b3228d40ba._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_6_76ccdf0542e76e4dbd61f3b3228d40ba._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_7_cd964d0a375c5cba299bf2bbbbb86acb._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_7_cd964d0a375c5cba299bf2bbbbb86acb._comment
index 3a24f4349..3a24f4349 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_7_cd964d0a375c5cba299bf2bbbbb86acb._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_7_cd964d0a375c5cba299bf2bbbbb86acb._comment
diff --git a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_8_9bac87c85deb5bb15795df28533d0cde._comment b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_8_9bac87c85deb5bb15795df28533d0cde._comment
index da2fef585..da2fef585 100644
--- a/doc/bugs/git-annex-shell:_gcryptsetup_permission_denied/comment_8_9bac87c85deb5bb15795df28533d0cde._comment
+++ b/doc/bugs/git-annex-shell__58___gcryptsetup_permission_denied/comment_8_9bac87c85deb5bb15795df28533d0cde._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__.mdwn b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__.mdwn
index 6374844a1..6374844a1 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__.mdwn
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__.mdwn
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_1_e962317a939bf76097ae1a3b53b146e6._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_1_e962317a939bf76097ae1a3b53b146e6._comment
index 3300f17b9..3300f17b9 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_1_e962317a939bf76097ae1a3b53b146e6._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_1_e962317a939bf76097ae1a3b53b146e6._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_2_b32472b4c9b61e7a33dca802ecafb05b._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_2_b32472b4c9b61e7a33dca802ecafb05b._comment
index b575ce977..b575ce977 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_2_b32472b4c9b61e7a33dca802ecafb05b._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_2_b32472b4c9b61e7a33dca802ecafb05b._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_3_fcfea3216831df9afbd855fbd842c27e._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_3_fcfea3216831df9afbd855fbd842c27e._comment
index bccfae0d9..bccfae0d9 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_3_fcfea3216831df9afbd855fbd842c27e._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_3_fcfea3216831df9afbd855fbd842c27e._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_4_30d0b40efa59eeecb8a4be6d1baa1520._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_4_30d0b40efa59eeecb8a4be6d1baa1520._comment
index aa3a2a307..aa3a2a307 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_4_30d0b40efa59eeecb8a4be6d1baa1520._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_4_30d0b40efa59eeecb8a4be6d1baa1520._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_5_4af107f3184bc2abd2c9693167018628._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_5_4af107f3184bc2abd2c9693167018628._comment
index 2288b1d84..2288b1d84 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_5_4af107f3184bc2abd2c9693167018628._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_5_4af107f3184bc2abd2c9693167018628._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_6_f96027f1e3c405809fae42ce8533c6d1._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_6_f96027f1e3c405809fae42ce8533c6d1._comment
index 447e9d80e..447e9d80e 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_6_f96027f1e3c405809fae42ce8533c6d1._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_6_f96027f1e3c405809fae42ce8533c6d1._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_7_b6fe89deb468a7e4f63f7faab147e3fb._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_7_b6fe89deb468a7e4f63f7faab147e3fb._comment
index 5d567ae8e..5d567ae8e 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_7_b6fe89deb468a7e4f63f7faab147e3fb._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_7_b6fe89deb468a7e4f63f7faab147e3fb._comment
diff --git a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_8_ebec5d9266604f03959dc16d933ff4a4._comment b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_8_ebec5d9266604f03959dc16d933ff4a4._comment
index b44164a89..b44164a89 100644
--- a/doc/bugs/git-annex:___60__socket:_16__62__:_hPutBuf:_resource_vanished___40__Broken_pipe__41__/comment_8_ebec5d9266604f03959dc16d933ff4a4._comment
+++ b/doc/bugs/git-annex__58_____60__socket__58___16__62____58___hPutBuf__58___resource_vanished___40__Broken_pipe__41__/comment_8_ebec5d9266604f03959dc16d933ff4a4._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock.mdwn b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock.mdwn
index d3d75e8c8..d3d75e8c8 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock.mdwn
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock.mdwn
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_10_d44de6a250694b25ce9c3169d62db8d1._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_10_d44de6a250694b25ce9c3169d62db8d1._comment
index f2ba4335c..f2ba4335c 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_10_d44de6a250694b25ce9c3169d62db8d1._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_10_d44de6a250694b25ce9c3169d62db8d1._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_11_56ae0f15bbdea2331df3b261b74d0b0b._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_11_56ae0f15bbdea2331df3b261b74d0b0b._comment
index 2ee2e6aa8..2ee2e6aa8 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_11_56ae0f15bbdea2331df3b261b74d0b0b._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_11_56ae0f15bbdea2331df3b261b74d0b0b._comment
diff --git a/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_12_d499a2f44e8ee2f39ee959f4d6373570._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_12_d499a2f44e8ee2f39ee959f4d6373570._comment
new file mode 100644
index 000000000..5ab7c9e11
--- /dev/null
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_12_d499a2f44e8ee2f39ee959f4d6373570._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
+ subject="comment 12"
+ date="2016-03-10T04:36:12Z"
+ content="""
+so -- shouldn't annex at least upon init sense if repo is under nfs?  if to be done platform independent way then it could do smth like
+
+[[!format sh \"\"\"
+python -c 'from glob import glob; import os; f=open(\".tmp-test\", \"w\"); os.unlink(\".tmp-test\"); assert(not glob(\".nfs*\"))'
+\"\"\"]]
+
+somewhere under .git/annex/tmp .. so if .nfs* file gets generated -- under nfs.  Seems to work for me in limited set of tests -- assertion fails all the time under NFS ;)
+"""]]
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_1_a98a54c04fa4e81f35fe958e746d61cb._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_1_a98a54c04fa4e81f35fe958e746d61cb._comment
index 21304e2e8..21304e2e8 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_1_a98a54c04fa4e81f35fe958e746d61cb._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_1_a98a54c04fa4e81f35fe958e746d61cb._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_2_18169e7bbd2caba5ee4bb0286961ac95._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_2_18169e7bbd2caba5ee4bb0286961ac95._comment
index 42b3265bd..42b3265bd 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_2_18169e7bbd2caba5ee4bb0286961ac95._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_2_18169e7bbd2caba5ee4bb0286961ac95._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_3_e3b623ff6714a9fe5fa0d332c72fe32f._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_3_e3b623ff6714a9fe5fa0d332c72fe32f._comment
index 51f71c7ac..51f71c7ac 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_3_e3b623ff6714a9fe5fa0d332c72fe32f._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_3_e3b623ff6714a9fe5fa0d332c72fe32f._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_4_58eebd8cfd664b32ef6fd0ddc34c5e86._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_4_58eebd8cfd664b32ef6fd0ddc34c5e86._comment
index 7a562f7ef..7a562f7ef 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_4_58eebd8cfd664b32ef6fd0ddc34c5e86._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_4_58eebd8cfd664b32ef6fd0ddc34c5e86._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_5_e5e24428ac02b78d38cd4f197ae3807b._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_5_e5e24428ac02b78d38cd4f197ae3807b._comment
index 75a45bdad..75a45bdad 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_5_e5e24428ac02b78d38cd4f197ae3807b._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_5_e5e24428ac02b78d38cd4f197ae3807b._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_6_01dc7a1ff67783ce672d72cefe7b4bb5._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_6_01dc7a1ff67783ce672d72cefe7b4bb5._comment
index 20eca2f62..20eca2f62 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_6_01dc7a1ff67783ce672d72cefe7b4bb5._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_6_01dc7a1ff67783ce672d72cefe7b4bb5._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_7_458518805b8d6613930b38b9ccc3c1bc._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_7_458518805b8d6613930b38b9ccc3c1bc._comment
index 756b64250..756b64250 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_7_458518805b8d6613930b38b9ccc3c1bc._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_7_458518805b8d6613930b38b9ccc3c1bc._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_8_853bc273b19bd6d84ca8f5da6c3dfb56._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_8_853bc273b19bd6d84ca8f5da6c3dfb56._comment
index d24d78d51..d24d78d51 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_8_853bc273b19bd6d84ca8f5da6c3dfb56._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_8_853bc273b19bd6d84ca8f5da6c3dfb56._comment
diff --git a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_9_86656a409ab25c7fa24de8ac3e68b254._comment b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_9_86656a409ab25c7fa24de8ac3e68b254._comment
index b862174b1..b862174b1 100644
--- a/doc/bugs/git-annex:_content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_9_86656a409ab25c7fa24de8ac3e68b254._comment
+++ b/doc/bugs/git-annex__58___content_is_locked__while_trying_to_move_under_NFS_and_pidlock/comment_9_86656a409ab25c7fa24de8ac3e68b254._comment
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__.mdwn
index 279ca3a3b..279ca3a3b 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__.mdwn
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_1_b7a327b668e2ca053713bec1dc4e6314._comment b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_1_b7a327b668e2ca053713bec1dc4e6314._comment
index abd79e0f7..abd79e0f7 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_1_b7a327b668e2ca053713bec1dc4e6314._comment
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_1_b7a327b668e2ca053713bec1dc4e6314._comment
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_2_8864149bd87f7956143109ab591afe4f._comment b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_2_8864149bd87f7956143109ab591afe4f._comment
index a4cdf367f..a4cdf367f 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_2_8864149bd87f7956143109ab591afe4f._comment
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_2_8864149bd87f7956143109ab591afe4f._comment
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_3_1229d5ea8799f0a744b3f03f620df1ec._comment b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_3_1229d5ea8799f0a744b3f03f620df1ec._comment
index 08e5d21e7..08e5d21e7 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_3_1229d5ea8799f0a744b3f03f620df1ec._comment
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_3_1229d5ea8799f0a744b3f03f620df1ec._comment
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_4_975d2631faa17d257a6fce40e24a6e3b._comment b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_4_975d2631faa17d257a6fce40e24a6e3b._comment
index 5048cad9b..5048cad9b 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_4_975d2631faa17d257a6fce40e24a6e3b._comment
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_4_975d2631faa17d257a6fce40e24a6e3b._comment
diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_5_013be36151fc710ec30756b0f68f43dc._comment b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_5_013be36151fc710ec30756b0f68f43dc._comment
index 358a820bf..358a820bf 100644
--- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__/comment_5_013be36151fc710ec30756b0f68f43dc._comment
+++ b/doc/bugs/git-annex__58___createSession__58___permission_denied___40__Operation_not_permitted__41__/comment_5_013be36151fc710ec30756b0f68f43dc._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content.mdwn b/doc/bugs/git-annex__58___failed_to_lock_content.mdwn
index f036f1353..f036f1353 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content.mdwn
+++ b/doc/bugs/git-annex__58___failed_to_lock_content.mdwn
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_1_cf9f4221695d620dfa768b0216171690._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_1_cf9f4221695d620dfa768b0216171690._comment
index a6fef26b2..a6fef26b2 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_1_cf9f4221695d620dfa768b0216171690._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_1_cf9f4221695d620dfa768b0216171690._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_2_a22011e4b68005c87c4bf9167c22a13f._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_2_a22011e4b68005c87c4bf9167c22a13f._comment
index b71f04a55..b71f04a55 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_2_a22011e4b68005c87c4bf9167c22a13f._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_2_a22011e4b68005c87c4bf9167c22a13f._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_3_4d58bfb2ba40e280cf9bcb8a054757f6._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_3_4d58bfb2ba40e280cf9bcb8a054757f6._comment
index fd50fb028..fd50fb028 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_3_4d58bfb2ba40e280cf9bcb8a054757f6._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_3_4d58bfb2ba40e280cf9bcb8a054757f6._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_4_431885c1487035415acbad59b021a548._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_4_431885c1487035415acbad59b021a548._comment
index 4c29c33e2..4c29c33e2 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_4_431885c1487035415acbad59b021a548._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_4_431885c1487035415acbad59b021a548._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_5_d8c8077e4dc1e0660d082482012b6594._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_5_d8c8077e4dc1e0660d082482012b6594._comment
index 2f3e560fa..2f3e560fa 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_5_d8c8077e4dc1e0660d082482012b6594._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_5_d8c8077e4dc1e0660d082482012b6594._comment
diff --git a/doc/bugs/git-annex:_failed_to_lock_content/comment_6_ced3c56607762562c1d21fd821d7c779._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_6_ced3c56607762562c1d21fd821d7c779._comment
index cebc1f0c1..cebc1f0c1 100644
--- a/doc/bugs/git-annex:_failed_to_lock_content/comment_6_ced3c56607762562c1d21fd821d7c779._comment
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_6_ced3c56607762562c1d21fd821d7c779._comment
diff --git a/doc/bugs/git-annex__58___failed_to_lock_content/comment_7_505d70bad4ebe33fedd9066bc96fa92d._comment b/doc/bugs/git-annex__58___failed_to_lock_content/comment_7_505d70bad4ebe33fedd9066bc96fa92d._comment
new file mode 100644
index 000000000..b90c1a624
--- /dev/null
+++ b/doc/bugs/git-annex__58___failed_to_lock_content/comment_7_505d70bad4ebe33fedd9066bc96fa92d._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="ellis"
+ subject="comment 7"
+ date="2016-03-09T19:15:10Z"
+ content="""
+Thanks, Joey, much appreciated!
+"""]]
diff --git a/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file.mdwn b/doc/bugs/git-annex__58___fd__58__14__58___hGetLine__58___end_of_file.mdwn
index 0d773b52c..0d773b52c 100644
--- a/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file.mdwn
+++ b/doc/bugs/git-annex__58___fd__58__14__58___hGetLine__58___end_of_file.mdwn
diff --git a/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment b/doc/bugs/git-annex__58___fd__58__14__58___hGetLine__58___end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment
index b7fc68ffd..b7fc68ffd 100644
--- a/doc/bugs/git-annex:_fd:14:_hGetLine:_end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment
+++ b/doc/bugs/git-annex__58___fd__58__14__58___hGetLine__58___end_of_file/comment_1_36756f5d9d591cc52113c5cc0c1eae91._comment
diff --git a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__.mdwn b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__.mdwn
index 976109c79..976109c79 100644
--- a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__.mdwn
+++ b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__.mdwn
diff --git a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_1_11a1615962325327466895d03e3d2379._comment b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_1_11a1615962325327466895d03e3d2379._comment
index ef8800c21..ef8800c21 100644
--- a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_1_11a1615962325327466895d03e3d2379._comment
+++ b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_1_11a1615962325327466895d03e3d2379._comment
diff --git a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_2_eac51c3299e9fc04025675360969d537._comment b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_2_eac51c3299e9fc04025675360969d537._comment
index dde7c0814..dde7c0814 100644
--- a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_2_eac51c3299e9fc04025675360969d537._comment
+++ b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_2_eac51c3299e9fc04025675360969d537._comment
diff --git a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_3_c23dc02c7487d63b0905f1b7f3ca59f5._comment b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_3_c23dc02c7487d63b0905f1b7f3ca59f5._comment
index 3b358b7ea..3b358b7ea 100644
--- a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_3_c23dc02c7487d63b0905f1b7f3ca59f5._comment
+++ b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_3_c23dc02c7487d63b0905f1b7f3ca59f5._comment
diff --git a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_4_0e8b28de5c173bc60ecc0126fb2209ca._comment b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_4_0e8b28de5c173bc60ecc0126fb2209ca._comment
index 63c3b474a..63c3b474a 100644
--- a/doc/bugs/git-annex:_getUserEntryForID:_failed___40__Success__41__/comment_4_0e8b28de5c173bc60ecc0126fb2209ca._comment
+++ b/doc/bugs/git-annex__58___getUserEntryForID__58___failed___40__Success__41__/comment_4_0e8b28de5c173bc60ecc0126fb2209ca._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__.mdwn b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__.mdwn
index 39cfb6b93..39cfb6b93 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__.mdwn
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__.mdwn
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_10_cdbd35ab0ba9c9157fd6530bebbc4650._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_10_cdbd35ab0ba9c9157fd6530bebbc4650._comment
index 0b91fe818..0b91fe818 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_10_cdbd35ab0ba9c9157fd6530bebbc4650._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_10_cdbd35ab0ba9c9157fd6530bebbc4650._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_11_9425cfd2739eca4a21c27d490192c31a._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_11_9425cfd2739eca4a21c27d490192c31a._comment
index 5608afa30..5608afa30 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_11_9425cfd2739eca4a21c27d490192c31a._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_11_9425cfd2739eca4a21c27d490192c31a._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_12_93e7e29ebcbffe8913a0dc216636ae47._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_12_93e7e29ebcbffe8913a0dc216636ae47._comment
index 930f99d3c..930f99d3c 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_12_93e7e29ebcbffe8913a0dc216636ae47._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_12_93e7e29ebcbffe8913a0dc216636ae47._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_13_5a1191042b32a85b4299cff3004d29de._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_13_5a1191042b32a85b4299cff3004d29de._comment
index ae9691cf9..ae9691cf9 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_13_5a1191042b32a85b4299cff3004d29de._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_13_5a1191042b32a85b4299cff3004d29de._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_14_4dea6eac389bbf5235a3d5d3378e6d04._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_14_4dea6eac389bbf5235a3d5d3378e6d04._comment
index bb58cbeeb..bb58cbeeb 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_14_4dea6eac389bbf5235a3d5d3378e6d04._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_14_4dea6eac389bbf5235a3d5d3378e6d04._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_1_5dc6b520381a7b26563c641fcc284b31._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_1_5dc6b520381a7b26563c641fcc284b31._comment
index d5031602a..d5031602a 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_1_5dc6b520381a7b26563c641fcc284b31._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_1_5dc6b520381a7b26563c641fcc284b31._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_2_8c8d7ad99de78d282d202c541323a299._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_2_8c8d7ad99de78d282d202c541323a299._comment
index 71da557b1..71da557b1 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_2_8c8d7ad99de78d282d202c541323a299._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_2_8c8d7ad99de78d282d202c541323a299._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_3_08d950812832acd5aa54287a54fed207._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_3_08d950812832acd5aa54287a54fed207._comment
index b984c6788..b984c6788 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_3_08d950812832acd5aa54287a54fed207._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_3_08d950812832acd5aa54287a54fed207._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_4_b8c8fac1dc7bd72cfa8a01495c4a5096._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_4_b8c8fac1dc7bd72cfa8a01495c4a5096._comment
index 0b766149f..0b766149f 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_4_b8c8fac1dc7bd72cfa8a01495c4a5096._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_4_b8c8fac1dc7bd72cfa8a01495c4a5096._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_5_e873c82ebc62e0af5051cf36ca084e0a._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_5_e873c82ebc62e0af5051cf36ca084e0a._comment
index c8ec76575..c8ec76575 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_5_e873c82ebc62e0af5051cf36ca084e0a._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_5_e873c82ebc62e0af5051cf36ca084e0a._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_6_f439c7d9491036035d95a4c0abc99123._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_6_f439c7d9491036035d95a4c0abc99123._comment
index 032c7245b..032c7245b 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_6_f439c7d9491036035d95a4c0abc99123._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_6_f439c7d9491036035d95a4c0abc99123._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_7_1c0352c37ff07a8478d13c12aa72b484._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_7_1c0352c37ff07a8478d13c12aa72b484._comment
index e0f73a82f..e0f73a82f 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_7_1c0352c37ff07a8478d13c12aa72b484._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_7_1c0352c37ff07a8478d13c12aa72b484._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment
index 82012ec6a..82012ec6a 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_8_7bdcfb72d5b9998402317ae6c9fd6046._comment
diff --git a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_9_9f6b04e9f155d289e8330b444585444f._comment b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_9_9f6b04e9f155d289e8330b444585444f._comment
index d7c331bee..d7c331bee 100644
--- a/doc/bugs/git-annex_doesn__39__t_work_on_lustre:_waitToSetLock:_unsupported_operation___40__Function_not_implemented__41__/comment_9_9f6b04e9f155d289e8330b444585444f._comment
+++ b/doc/bugs/git-annex_doesn__39__t_work_on_lustre__58___waitToSetLock__58___unsupported_operation___40__Function_not_implemented__41__/comment_9_9f6b04e9f155d289e8330b444585444f._comment
diff --git a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows.mdwn b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows.mdwn
index ada6621f9..ada6621f9 100644
--- a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows.mdwn
+++ b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows.mdwn
diff --git a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows/comment_1_f0d30a953f072f8d9a929a4a6ba69914._comment b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows/comment_1_f0d30a953f072f8d9a929a4a6ba69914._comment
index c7de2eb6d..c7de2eb6d 100644
--- a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows/comment_1_f0d30a953f072f8d9a929a4a6ba69914._comment
+++ b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows/comment_1_f0d30a953f072f8d9a929a4a6ba69914._comment
diff --git a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows/comment_2_504ea07f798838710cdbf6133135c815._comment b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows/comment_2_504ea07f798838710cdbf6133135c815._comment
index 5097e2e16..5097e2e16 100644
--- a/doc/bugs/git-annex_drop_fails_to_access_file:__47____47____47___target_URL_on_Windows/comment_2_504ea07f798838710cdbf6133135c815._comment
+++ b/doc/bugs/git-annex_drop_fails_to_access_file__58____47____47____47___target_URL_on_Windows/comment_2_504ea07f798838710cdbf6133135c815._comment
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory.mdwn b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory.mdwn
index 13ac5a98f..13ac5a98f 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory.mdwn
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory.mdwn
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment
index 3662fe04f..3662fe04f 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_1_984f75d8078f2809486f38ecb3b16be3._comment
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_2_c0f07e2d4bb142389629050479dd1465._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_2_c0f07e2d4bb142389629050479dd1465._comment
index 0601b0a7d..0601b0a7d 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_2_c0f07e2d4bb142389629050479dd1465._comment
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_2_c0f07e2d4bb142389629050479dd1465._comment
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_3_7a58a884aaacedca9697b17cd5248214._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_3_7a58a884aaacedca9697b17cd5248214._comment
index c6aa8360a..c6aa8360a 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_3_7a58a884aaacedca9697b17cd5248214._comment
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_3_7a58a884aaacedca9697b17cd5248214._comment
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_4_aa4f1806207138115d2a95935bb0546b._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_4_aa4f1806207138115d2a95935bb0546b._comment
index 8e9815242..8e9815242 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_4_aa4f1806207138115d2a95935bb0546b._comment
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_4_aa4f1806207138115d2a95935bb0546b._comment
diff --git a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_5_fa95f93416e3d6e66af557df6562f1e5._comment b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_5_fa95f93416e3d6e66af557df6562f1e5._comment
index 749ee44ad..749ee44ad 100644
--- a/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_5_fa95f93416e3d6e66af557df6562f1e5._comment
+++ b/doc/bugs/git_annex_add_out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_5_fa95f93416e3d6e66af557df6562f1e5._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist.mdwn b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist.mdwn
index 2e2000c61..2e2000c61 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist.mdwn
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist.mdwn
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_1_b4ad8561eab9b5c3a6eaa2f275aececc._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_1_b4ad8561eab9b5c3a6eaa2f275aececc._comment
index 8e080776c..8e080776c 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_1_b4ad8561eab9b5c3a6eaa2f275aececc._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_1_b4ad8561eab9b5c3a6eaa2f275aececc._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_2_f995b3212c8140b386e4d1785994d29a._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_2_f995b3212c8140b386e4d1785994d29a._comment
index 1e971dd57..1e971dd57 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_2_f995b3212c8140b386e4d1785994d29a._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_2_f995b3212c8140b386e4d1785994d29a._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_3_4c914d08f473490f2077d76664a7d6dd._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_3_4c914d08f473490f2077d76664a7d6dd._comment
index 600115bfe..600115bfe 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_3_4c914d08f473490f2077d76664a7d6dd._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_3_4c914d08f473490f2077d76664a7d6dd._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_4_3c7a7a0983d3a75a04395141aaf16dbb._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_4_3c7a7a0983d3a75a04395141aaf16dbb._comment
index fb1c5641d..fb1c5641d 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_4_3c7a7a0983d3a75a04395141aaf16dbb._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_4_3c7a7a0983d3a75a04395141aaf16dbb._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_5_64000cfe5ef2cdf4260c3342f032e916._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_5_64000cfe5ef2cdf4260c3342f032e916._comment
index 3de74e295..3de74e295 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_5_64000cfe5ef2cdf4260c3342f032e916._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_5_64000cfe5ef2cdf4260c3342f032e916._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_6_da1b3ee6948afc81273aafe44c7604ba._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_6_da1b3ee6948afc81273aafe44c7604ba._comment
index 2286cb478..2286cb478 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_6_da1b3ee6948afc81273aafe44c7604ba._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_6_da1b3ee6948afc81273aafe44c7604ba._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_7_4712f638717c68ed3529dd2a078f1746._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_7_4712f638717c68ed3529dd2a078f1746._comment
index 20333d235..20333d235 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_7_4712f638717c68ed3529dd2a078f1746._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_7_4712f638717c68ed3529dd2a078f1746._comment
diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment
index 7539e9b1f..7539e9b1f 100644
--- a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment
+++ b/doc/bugs/git_annex_direct_-__62___rename__58___does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment
diff --git a/doc/bugs/git_annex_import:_ignored_names_fatal.mdwn b/doc/bugs/git_annex_import__58___ignored_names_fatal.mdwn
index 8981cadd8..8981cadd8 100644
--- a/doc/bugs/git_annex_import:_ignored_names_fatal.mdwn
+++ b/doc/bugs/git_annex_import__58___ignored_names_fatal.mdwn
diff --git a/doc/bugs/git_annex_import:_ignored_names_fatal/comment_1_f7fac12d354408480f48a719331c2d82._comment b/doc/bugs/git_annex_import__58___ignored_names_fatal/comment_1_f7fac12d354408480f48a719331c2d82._comment
index bf27b863d..bf27b863d 100644
--- a/doc/bugs/git_annex_import:_ignored_names_fatal/comment_1_f7fac12d354408480f48a719331c2d82._comment
+++ b/doc/bugs/git_annex_import__58___ignored_names_fatal/comment_1_f7fac12d354408480f48a719331c2d82._comment
diff --git a/doc/bugs/git_annex_import:_ignored_names_fatal/comment_2_99f575f424ec2f0d739fa7296f0d0086._comment b/doc/bugs/git_annex_import__58___ignored_names_fatal/comment_2_99f575f424ec2f0d739fa7296f0d0086._comment
index 0806cdef0..0806cdef0 100644
--- a/doc/bugs/git_annex_import:_ignored_names_fatal/comment_2_99f575f424ec2f0d739fa7296f0d0086._comment
+++ b/doc/bugs/git_annex_import__58___ignored_names_fatal/comment_2_99f575f424ec2f0d739fa7296f0d0086._comment
diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__.mdwn
index e61d44883..e61d44883 100644
--- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__.mdwn
+++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__.mdwn
diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_183c3740a108b5f09baf1c401dcfa7f9._comment b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_1_183c3740a108b5f09baf1c401dcfa7f9._comment
index cc9f7a9e8..cc9f7a9e8 100644
--- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_183c3740a108b5f09baf1c401dcfa7f9._comment
+++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_1_183c3740a108b5f09baf1c401dcfa7f9._comment
diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_2_b8ee68b445c6a8d27121d90a2eeba0c7._comment b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_2_b8ee68b445c6a8d27121d90a2eeba0c7._comment
index 6f5570e25..6f5570e25 100644
--- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_2_b8ee68b445c6a8d27121d90a2eeba0c7._comment
+++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_2_b8ee68b445c6a8d27121d90a2eeba0c7._comment
diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_3_7502f88ae1c46e070e7fdbd9b9c1b54d._comment b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_3_7502f88ae1c46e070e7fdbd9b9c1b54d._comment
index db40450d0..db40450d0 100644
--- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_3_7502f88ae1c46e070e7fdbd9b9c1b54d._comment
+++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_3_7502f88ae1c46e070e7fdbd9b9c1b54d._comment
diff --git a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_4_9f67b14c9ac81f159439c5dff7354b8f._comment b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_4_9f67b14c9ac81f159439c5dff7354b8f._comment
index 8d15f5c57..8d15f5c57 100644
--- a/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid:_removeLink:_does_not_exist___40__No_such_file_or_directory__41__/comment_4_9f67b14c9ac81f159439c5dff7354b8f._comment
+++ b/doc/bugs/git_annex_repair_fails_-___47__tmp__47__tmprepo.1__47__.git__47__gc.pid__58___removeLink__58___does_not_exist___40__No_such_file_or_directory__41__/comment_4_9f67b14c9ac81f159439c5dff7354b8f._comment
diff --git a/doc/bugs/git_annex_vicfg_fail_with_Buffer:_invalid_argument___40__invalid_character__41__.mdwn b/doc/bugs/git_annex_vicfg_fail_with_Buffer__58___invalid_argument___40__invalid_character__41__.mdwn
index b74528bda..b74528bda 100644
--- a/doc/bugs/git_annex_vicfg_fail_with_Buffer:_invalid_argument___40__invalid_character__41__.mdwn
+++ b/doc/bugs/git_annex_vicfg_fail_with_Buffer__58___invalid_argument___40__invalid_character__41__.mdwn
diff --git a/doc/bugs/git_security_fix.mdwn b/doc/bugs/git_security_fix.mdwn
new file mode 100644
index 000000000..43b3f505f
--- /dev/null
+++ b/doc/bugs/git_security_fix.mdwn
@@ -0,0 +1,20 @@
+git had some remotely exploitable security holes announced recently
+(CVE-2016-2324, CVE-2016-2315)
+
+git-annex builds that bundle git need to be updated.
+
+status of autobuilds:
+
+* Linux is fixed (all builds)
+* OSX is fixed
+* Windows does not bundle git
+* Android is fixed (git build is untested)
+
+status of released builds:
+
+* Linux is fixed (all builds)
+* OSX is fixed (yosemite only; old builds vulnerable so removed)
+* Windows does not bundle git
+* Android is fixed (git build is untested)
+
+[[done]] --[[Joey]]
diff --git a/doc/bugs/internal_server_error:_hGetContents:_invalid_argument___40__invalid_byte_sequence__41__.mdwn b/doc/bugs/internal_server_error__58___hGetContents__58___invalid_argument___40__invalid_byte_sequence__41__.mdwn
index 8c9703ed2..8c9703ed2 100644
--- a/doc/bugs/internal_server_error:_hGetContents:_invalid_argument___40__invalid_byte_sequence__41__.mdwn
+++ b/doc/bugs/internal_server_error__58___hGetContents__58___invalid_argument___40__invalid_byte_sequence__41__.mdwn
diff --git a/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains_:_or___59__.mdwn b/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains___58___or___59__.mdwn
index 57c1e1d25..57c1e1d25 100644
--- a/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains_:_or___59__.mdwn
+++ b/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains___58___or___59__.mdwn
diff --git a/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains_:_or___59__/comment_1_a98072047799a0c9ba8c5589471f6a7b._comment b/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains___58___or___59__/comment_1_a98072047799a0c9ba8c5589471f6a7b._comment
index 297a81521..297a81521 100644
--- a/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains_:_or___59__/comment_1_a98072047799a0c9ba8c5589471f6a7b._comment
+++ b/doc/bugs/linux_standalone_git_annex_won__39__t_work_in_a_directory_whose_path_contains___58___or___59__/comment_1_a98072047799a0c9ba8c5589471f6a7b._comment
diff --git a/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn b/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn
new file mode 100644
index 000000000..c1e1d9e17
--- /dev/null
+++ b/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn
@@ -0,0 +1,15 @@
+### Please describe the problem.
+
+When a repository created shared pre 5.20151208 is fsck'd, it spews error messages a la `setFileMode: permission denied (Operation not permitted)` and fails the fsck.
+
+This seems to be due to the change in file permissions introduced in [[news/5.20151208]] ("When core.sharedRepository is set, annex object files are not made mode 444, since that prevents a user other than the file owner from locking them. Instead, a mode such as 664 is used in this case."). The error message is unclear to a user, though, and does IMO not constitute an error to fail over.
+
+IMO, failure to set the mode due to ownership issues should be ignored in fsck, and when a user other than the original owner tries to lock a file, they should be presented with an error message a la "Please run `git annex fsck --fast` as <user> to fix the file's permissions". As an alternative or additionally, fsck could show a warning (maybe even an error) that running an additional fsck as all of the other users (explicit list would be nice) to fix all file permissions.
+
+### Workarounds
+
+The issue can be resolved for a repository by 
+
+### What version of git-annex are you using? On what operating system?
+
+This was observed on a git-annex remote pushed to via ssh on debian sid, with pushes from various git-annex versions over the past years.
diff --git a/doc/bugs/nautilus__47__scripts__47__git-annex_get:_openFile:_does_not_exist___40__No_such_file_or_directory__41__.mdwn b/doc/bugs/nautilus__47__scripts__47__git-annex_get__58___openFile__58___does_not_exist___40__No_such_file_or_directory__41__.mdwn
index 8dca631ba..8dca631ba 100644
--- a/doc/bugs/nautilus__47__scripts__47__git-annex_get:_openFile:_does_not_exist___40__No_such_file_or_directory__41__.mdwn
+++ b/doc/bugs/nautilus__47__scripts__47__git-annex_get__58___openFile__58___does_not_exist___40__No_such_file_or_directory__41__.mdwn
diff --git a/doc/bugs/nautilus__47__scripts__47__git-annex_get:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_9fdeaa51ccc7c71dcfeea3ea783d3b50._comment b/doc/bugs/nautilus__47__scripts__47__git-annex_get__58___openFile__58___does_not_exist___40__No_such_file_or_directory__41__/comment_1_9fdeaa51ccc7c71dcfeea3ea783d3b50._comment
index d25188658..d25188658 100644
--- a/doc/bugs/nautilus__47__scripts__47__git-annex_get:_openFile:_does_not_exist___40__No_such_file_or_directory__41__/comment_1_9fdeaa51ccc7c71dcfeea3ea783d3b50._comment
+++ b/doc/bugs/nautilus__47__scripts__47__git-annex_get__58___openFile__58___does_not_exist___40__No_such_file_or_directory__41__/comment_1_9fdeaa51ccc7c71dcfeea3ea783d3b50._comment
diff --git a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs__58__79__58__0__58___-_error__58___missing_binary_operator_before_token___34____40____34__.mdwn
index 5a1b48031..5a1b48031 100644
--- a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn
+++ b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs__58__79__58__0__58___-_error__58___missing_binary_operator_before_token___34____40____34__.mdwn
diff --git a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__/comment_1_9ff4036e726bf5eda8150ee167b1228b._comment b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs__58__79__58__0__58___-_error__58___missing_binary_operator_before_token___34____40____34__/comment_1_9ff4036e726bf5eda8150ee167b1228b._comment
index 6c2cbb417..6c2cbb417 100644
--- a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__/comment_1_9ff4036e726bf5eda8150ee167b1228b._comment
+++ b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs__58__79__58__0__58___-_error__58___missing_binary_operator_before_token___34____40____34__/comment_1_9ff4036e726bf5eda8150ee167b1228b._comment
diff --git a/doc/bugs/pathspec_magic_not_supported_by_this_command:___39__literal__39__.mdwn b/doc/bugs/pathspec_magic_not_supported_by_this_command__58_____39__literal__39__.mdwn
index d0de521a0..d0de521a0 100644
--- a/doc/bugs/pathspec_magic_not_supported_by_this_command:___39__literal__39__.mdwn
+++ b/doc/bugs/pathspec_magic_not_supported_by_this_command__58_____39__literal__39__.mdwn
diff --git a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames.mdwn b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames.mdwn
index 56311bc70..56311bc70 100644
--- a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames.mdwn
+++ b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames.mdwn
diff --git a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames/comment_1_ca10638d4b4b178cfd0de8736542c4dc._comment b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames/comment_1_ca10638d4b4b178cfd0de8736542c4dc._comment
index a7438c559..a7438c559 100644
--- a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames/comment_1_ca10638d4b4b178cfd0de8736542c4dc._comment
+++ b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames/comment_1_ca10638d4b4b178cfd0de8736542c4dc._comment
diff --git a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames/comment_2_986a393a512229d35e529ba242b77b1e._comment b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames/comment_2_986a393a512229d35e529ba242b77b1e._comment
index 7dbeb3d08..7dbeb3d08 100644
--- a/doc/bugs/preferred_content:_include_statement_does_not_allow_spaces_in_filenames/comment_2_986a393a512229d35e529ba242b77b1e._comment
+++ b/doc/bugs/preferred_content__58___include_statement_does_not_allow_spaces_in_filenames/comment_2_986a393a512229d35e529ba242b77b1e._comment
diff --git a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist.mdwn b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist.mdwn
index 9421dc66d..9421dc66d 100644
--- a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist.mdwn
+++ b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist.mdwn
diff --git a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_1_3e444d500071779bcbfbc781b4756daf._comment b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_1_3e444d500071779bcbfbc781b4756daf._comment
index 6fc7f84db..6fc7f84db 100644
--- a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_1_3e444d500071779bcbfbc781b4756daf._comment
+++ b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_1_3e444d500071779bcbfbc781b4756daf._comment
diff --git a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_2_4e2bd0704377c9bdc9fdb06a078fbc62._comment b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_2_4e2bd0704377c9bdc9fdb06a078fbc62._comment
index 3e77d3a39..3e77d3a39 100644
--- a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_2_4e2bd0704377c9bdc9fdb06a078fbc62._comment
+++ b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_2_4e2bd0704377c9bdc9fdb06a078fbc62._comment
diff --git a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_3_9ea62129cc568b07994b7e3d517a100c._comment b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_3_9ea62129cc568b07994b7e3d517a100c._comment
index 20de644e9..20de644e9 100644
--- a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_3_9ea62129cc568b07994b7e3d517a100c._comment
+++ b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_3_9ea62129cc568b07994b7e3d517a100c._comment
diff --git a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_4_42481bb2f6f625a9891e59ec97574164._comment b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_4_42481bb2f6f625a9891e59ec97574164._comment
index 4755498c1..4755498c1 100644
--- a/doc/bugs/regression:_behavior_when_files_to_add_do_not_exist/comment_4_42481bb2f6f625a9891e59ec97574164._comment
+++ b/doc/bugs/regression__58___behavior_when_files_to_add_do_not_exist/comment_4_42481bb2f6f625a9891e59ec97574164._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior.mdwn
index 4c1f0971d..4c1f0971d 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior.mdwn
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior.mdwn
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment
index f3e8ec690..f3e8ec690 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_1_1a0b964f93c753838d6ccbdc8f79b39e._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment
index 6af5a06a6..6af5a06a6 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_2_d22dcd7f95c5dc1c381c3c746781efce._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment
index b608efdbe..b608efdbe 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_3_a25140eb90f6b24c1a3ca39c901694e2._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_4_825e15183008ff7d97a81cacc3f55fb4._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_4_825e15183008ff7d97a81cacc3f55fb4._comment
index 7b503ac9a..7b503ac9a 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_4_825e15183008ff7d97a81cacc3f55fb4._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_4_825e15183008ff7d97a81cacc3f55fb4._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_5_e858fc7c729cd39740354fb12627d556._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_5_e858fc7c729cd39740354fb12627d556._comment
index 9b3aa7c17..9b3aa7c17 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_5_e858fc7c729cd39740354fb12627d556._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_5_e858fc7c729cd39740354fb12627d556._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_6_9881b0f2dfb0907a60c0da296bc3da3f._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_6_9881b0f2dfb0907a60c0da296bc3da3f._comment
index f1509b395..f1509b395 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_6_9881b0f2dfb0907a60c0da296bc3da3f._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_6_9881b0f2dfb0907a60c0da296bc3da3f._comment
diff --git a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_7_ca017b9d3bafea4cb31448c802f3834e._comment b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_7_ca017b9d3bafea4cb31448c802f3834e._comment
index 48173bff9..48173bff9 100644
--- a/doc/bugs/regression_in_direct_mode_on_windows_:_weird___96__git_annex_sync__96___behavior/comment_7_ca017b9d3bafea4cb31448c802f3834e._comment
+++ b/doc/bugs/regression_in_direct_mode_on_windows___58___weird___96__git_annex_sync__96___behavior/comment_7_ca017b9d3bafea4cb31448c802f3834e._comment
diff --git a/doc/bugs/rsync:_protocol_version_mismatch.mdwn b/doc/bugs/rsync__58___protocol_version_mismatch.mdwn
index fb5500601..fb5500601 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch.mdwn
+++ b/doc/bugs/rsync__58___protocol_version_mismatch.mdwn
diff --git a/doc/bugs/rsync:_protocol_version_mismatch/comment_1_672d89a7d06d5ec336381b670a41a9c7._comment b/doc/bugs/rsync__58___protocol_version_mismatch/comment_1_672d89a7d06d5ec336381b670a41a9c7._comment
index 8379a7d82..8379a7d82 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch/comment_1_672d89a7d06d5ec336381b670a41a9c7._comment
+++ b/doc/bugs/rsync__58___protocol_version_mismatch/comment_1_672d89a7d06d5ec336381b670a41a9c7._comment
diff --git a/doc/bugs/rsync:_protocol_version_mismatch/comment_2_531b85c911d390b1b93ee55a8cf5d47e._comment b/doc/bugs/rsync__58___protocol_version_mismatch/comment_2_531b85c911d390b1b93ee55a8cf5d47e._comment
index 268f36993..268f36993 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch/comment_2_531b85c911d390b1b93ee55a8cf5d47e._comment
+++ b/doc/bugs/rsync__58___protocol_version_mismatch/comment_2_531b85c911d390b1b93ee55a8cf5d47e._comment
diff --git a/doc/bugs/rsync:_protocol_version_mismatch/comment_3_eff8f33134157635387ee681805ff7a8._comment b/doc/bugs/rsync__58___protocol_version_mismatch/comment_3_eff8f33134157635387ee681805ff7a8._comment
index b2a335a0b..b2a335a0b 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch/comment_3_eff8f33134157635387ee681805ff7a8._comment
+++ b/doc/bugs/rsync__58___protocol_version_mismatch/comment_3_eff8f33134157635387ee681805ff7a8._comment
diff --git a/doc/bugs/rsync:_protocol_version_mismatch/comment_4_77e59a25c859b6afec8b75f74885ef5e._comment b/doc/bugs/rsync__58___protocol_version_mismatch/comment_4_77e59a25c859b6afec8b75f74885ef5e._comment
index cad761d14..cad761d14 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch/comment_4_77e59a25c859b6afec8b75f74885ef5e._comment
+++ b/doc/bugs/rsync__58___protocol_version_mismatch/comment_4_77e59a25c859b6afec8b75f74885ef5e._comment
diff --git a/doc/bugs/rsync:_protocol_version_mismatch/comment_5_7d819c3e4af2b8044a52fa6131f36187._comment b/doc/bugs/rsync__58___protocol_version_mismatch/comment_5_7d819c3e4af2b8044a52fa6131f36187._comment
index 85af7d221..85af7d221 100644
--- a/doc/bugs/rsync:_protocol_version_mismatch/comment_5_7d819c3e4af2b8044a52fa6131f36187._comment
+++ b/doc/bugs/rsync__58___protocol_version_mismatch/comment_5_7d819c3e4af2b8044a52fa6131f36187._comment
diff --git a/doc/bugs/rsync_fails_with_sync_error:_syntax_or_usage_error_.mdwn b/doc/bugs/rsync_fails_with_sync_error__58___syntax_or_usage_error_.mdwn
index 09c79d78d..09c79d78d 100644
--- a/doc/bugs/rsync_fails_with_sync_error:_syntax_or_usage_error_.mdwn
+++ b/doc/bugs/rsync_fails_with_sync_error__58___syntax_or_usage_error_.mdwn
diff --git a/doc/bugs/rsync_fails_with_sync_error:_syntax_or_usage_error_/comment_1_464d733de18f6ca438ebd84e88b8cee2._comment b/doc/bugs/rsync_fails_with_sync_error__58___syntax_or_usage_error_/comment_1_464d733de18f6ca438ebd84e88b8cee2._comment
index ea9db7bc6..ea9db7bc6 100644
--- a/doc/bugs/rsync_fails_with_sync_error:_syntax_or_usage_error_/comment_1_464d733de18f6ca438ebd84e88b8cee2._comment
+++ b/doc/bugs/rsync_fails_with_sync_error__58___syntax_or_usage_error_/comment_1_464d733de18f6ca438ebd84e88b8cee2._comment
diff --git a/doc/bugs/rsync_transport:_username_not_respected.mdwn b/doc/bugs/rsync_transport__58___username_not_respected.mdwn
index 467e67643..467e67643 100644
--- a/doc/bugs/rsync_transport:_username_not_respected.mdwn
+++ b/doc/bugs/rsync_transport__58___username_not_respected.mdwn
diff --git a/doc/bugs/ssh:_unprotected_private_key_file.mdwn b/doc/bugs/ssh__58___unprotected_private_key_file.mdwn
index 207ef76d1..207ef76d1 100644
--- a/doc/bugs/ssh:_unprotected_private_key_file.mdwn
+++ b/doc/bugs/ssh__58___unprotected_private_key_file.mdwn
diff --git a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
new file mode 100644
index 000000000..0dcc6f7ea
--- /dev/null
+++ b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
@@ -0,0 +1,71 @@
+### Please describe the problem.
+
+`stack build` on a fresh clone of git-annex at e029eb8b fails with
+
+    git-annex-6.20160229: configure
+
+    Utility/FileSystemEncoding.hs:30:18:
+        Could not find module ‘Data.Hash.MD5’
+        Use -v to see a list of the files searched for.
+
+    Utility/FileSystemEncoding.hs:32:8:
+        Could not find module ‘Data.Bits.Utils’
+        Perhaps you meant
+          Data.BitUtil
+          Data.Bits.Lens (from lens-4.13@lens_IUJoiaRWYAQ6ieqgqTJZ5D)
+        Use -v to see a list of the files searched for.
+
+    Utility/FileSystemEncoding.hs:34:8:
+        Could not find module ‘Data.List.Utils’
+        Perhaps you meant
+          Data.BitUtil
+          Data.List.Lens (from lens-4.13@lens_IUJoiaRWYAQ6ieqgqTJZ5D)
+          Data.List.Split (from split-0.2.3@split_CDzOynTh4l8Ahg1HaWUL4Z)
+        Use -v to see a list of the files searched for.
+
+    Utility/Process.hs:53:8:
+        Could not find module ‘System.Log.Logger’
+        Perhaps you meant
+          System.Log.FastLogger (from fast-logger-2.4.1@fastl_1adi3bwIxvVE3Gyx2Jy1k0)
+        Use -v to see a list of the files searched for.
+
+    Utility/SafeCommand.hs:14:8:
+        Could not find module ‘Data.String.Utils’
+        Perhaps you meant
+          Data.String.UTF8 (from utf8-string-1.0.1.1@utf8s_L8eKHa7Iv9q7FVKUYW6u4b)
+        Use -v to see a list of the files searched for.
+
+### What steps will reproduce the problem?
+
+`stack build`
+
+### What version of git-annex are you using? On what operating system?
+
+e029eb8b, OS X 10.10.5.
+
+### Please provide any additional information below.
+
+These are apparently dependencies of `Setup.hs`. Adding
+
+    explicit-setup-deps:
+      "*": true
+
+to `stack.yaml` [(as described here)](https://github.com/commercialhaskell/stack/blob/a59997d5db963bba403119843340688ee25e2c6f/doc/yaml_configuration.md#explicit-setup-deps)
+fixes the error and builds git-annex successfully.
+
+### 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)
+
+> I tried enabling this, and it broke build on my i386ancient autobuilder,
+> which uses stack 1.0.4.2. Strange build failure
+> both building git-annex and also its dependencies (eg, process):
+
+	/usr/bin/ld: cannot find -ltinfo
+
+> Which seems to be libtinfo, part of the ncurses library. Which is weird,
+> AFAIK git-annex does not use ncurses at all.
+> 
+> I tried weakening the setting from `*` to  `git-annex: true`, which
+> lets the build deps get built, but building git-annex still fails with
+> above error.
+> 
+> --[[Joey]]
diff --git a/doc/bugs/webapp:_difficult_to_abort_adding_a_repository.mdwn b/doc/bugs/webapp__58___difficult_to_abort_adding_a_repository.mdwn
index 41007dbb4..41007dbb4 100644
--- a/doc/bugs/webapp:_difficult_to_abort_adding_a_repository.mdwn
+++ b/doc/bugs/webapp__58___difficult_to_abort_adding_a_repository.mdwn
diff --git a/doc/bugs/webapp_usability:_fails_mysteriously_on_newer_repo_layouts.mdwn b/doc/bugs/webapp_usability__58___fails_mysteriously_on_newer_repo_layouts.mdwn
index 73908f40b..73908f40b 100644
--- a/doc/bugs/webapp_usability:_fails_mysteriously_on_newer_repo_layouts.mdwn
+++ b/doc/bugs/webapp_usability__58___fails_mysteriously_on_newer_repo_layouts.mdwn
diff --git a/doc/bugs/webdav_fails___40__server:_radicale_0.9-1__41__.mdwn b/doc/bugs/webdav_fails___40__server__58___radicale_0.9-1__41__.mdwn
index 8da66a810..8da66a810 100644
--- a/doc/bugs/webdav_fails___40__server:_radicale_0.9-1__41__.mdwn
+++ b/doc/bugs/webdav_fails___40__server__58___radicale_0.9-1__41__.mdwn
diff --git a/doc/bugs/webdav_fails___40__server:_radicale_0.9-1__41__/comment_1_487bf264afeef2a3b0a61d306ebfc3c5._comment b/doc/bugs/webdav_fails___40__server__58___radicale_0.9-1__41__/comment_1_487bf264afeef2a3b0a61d306ebfc3c5._comment
index 56e34a09d..56e34a09d 100644
--- a/doc/bugs/webdav_fails___40__server:_radicale_0.9-1__41__/comment_1_487bf264afeef2a3b0a61d306ebfc3c5._comment
+++ b/doc/bugs/webdav_fails___40__server__58___radicale_0.9-1__41__/comment_1_487bf264afeef2a3b0a61d306ebfc3c5._comment
diff --git a/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment b/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment
new file mode 100644
index 000000000..6a3502997
--- /dev/null
+++ b/doc/design/adjusted_branches/comment_2_ff7cbdf93f0be5886f212bdd411efb5b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2016-03-14T20:38:09Z"
+ content="""
+Yes, lots of things are possible with this. Filtering to only annexed files
+probably. May be some hairyness around updating the branch when files are
+got or dropped. Matching a preferred content expression, maybe..
+"""]]
diff --git a/doc/design/assistant/blog/day_150__12:12.mdwn b/doc/design/assistant/blog/day_150__12__58__12.mdwn
index 8e1f192db..8e1f192db 100644
--- a/doc/design/assistant/blog/day_150__12:12.mdwn
+++ b/doc/design/assistant/blog/day_150__12__58__12.mdwn
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
index 3febc95a1..b2b22a20b 100644
--- a/doc/design/assistant/polls/Android_default_directory.mdwn
+++ b/doc/design/assistant/polls/Android_default_directory.mdwn
@@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
 want the first time they run it, but to save typing on android, anything
 that gets enough votes will be included in a list of choices as well.
 
-[[!poll open=yes expandable=yes 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]]
+[[!poll open=yes expandable=yes 73 "/sdcard/annex" 6 "Whole /sdcard" 8 "DCIM directory (photos and videos only)" 3 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_bf44404de52b00ff4e4f1effd4cef336._comment b/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_bf44404de52b00ff4e4f1effd4cef336._comment
new file mode 100644
index 000000000..e7f4f4054
--- /dev/null
+++ b/doc/devblog/day_360__annex.largefiles_mimetype/comment_3_bf44404de52b00ff4e4f1effd4cef336._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f"
+ nickname="g"
+ subject="why not mimetypes for preferred content?"
+ date="2016-03-28T08:32:45Z"
+ content="""
+Why does matching by mimetype only make sense for annex.largefiles, but not for preferred content expressions? Sorry if this is a stupid question, but it seems it would in fact be quite useful to easily express that, for example, a certain repo have a preference for my photos and not my music files (though both should be considered large files)
+"""]]
diff --git a/doc/devblog/day_360__annex.largefiles_mimetype/comment_4_70c337d91f8d0458927c111763041118._comment b/doc/devblog/day_360__annex.largefiles_mimetype/comment_4_70c337d91f8d0458927c111763041118._comment
new file mode 100644
index 000000000..51bff8488
--- /dev/null
+++ b/doc/devblog/day_360__annex.largefiles_mimetype/comment_4_70c337d91f8d0458927c111763041118._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2016-03-28T13:22:35Z"
+ content="""
+For the simple reason that git-annex doesn't know the mime type of a file
+before it downloads a copy.
+
+There are some more complicated reasons involving preferred content
+expressions needing to evaluate the same way in different repos, which
+can be on different computers with different versions of the magic
+database, etc.
+"""]]
diff --git a/doc/devblog/day_372__adjusted_branches_improved.mdwn b/doc/devblog/day_372__adjusted_branches_improved.mdwn
new file mode 100644
index 000000000..625169eaf
--- /dev/null
+++ b/doc/devblog/day_372__adjusted_branches_improved.mdwn
@@ -0,0 +1,18 @@
+After a real brain-bender of a day, I have commit propagation from the
+adjusted branch back to the original branch working, without needing to
+reverse adjust the whole tree. This is faster, but the really nice thing
+is that it makes individual adjustments simpler to write.
+
+In fact, it's so simple that I took 10 minutes just now to implement a second
+adjustment!
+
+[[!format haskell """
+adjustTreeItem HideMissingAdjustment h ti@(TreeItem _ _ s) = do
+         mk <- catKey s
+         case mk of
+                 Just k -> ifM (inAnnex k)
+                         ( return (Just ti)
+      	                 , return Nothing
+                         )
+                 Nothing -> return (Just ti)
+"""]]
diff --git a/doc/devblog/day_373__away.mdwn b/doc/devblog/day_373__away.mdwn
new file mode 100644
index 000000000..e8761b4e2
--- /dev/null
+++ b/doc/devblog/day_373__away.mdwn
@@ -0,0 +1,6 @@
+Caught up with a few last things today, before I leave for 
+[a week in Boston](http://joeyh.name/trips/2016/boston/).
+
+Converted several places that ran git hash-object repeatedly to feed data
+to a running process. This sped up git-annex add in direct mode and with
+v6 unlocked files, by up to 2x.
diff --git a/doc/devblog/day_374__security_fix.mdwn b/doc/devblog/day_374__security_fix.mdwn
new file mode 100644
index 000000000..c1d20bbdf
--- /dev/null
+++ b/doc/devblog/day_374__security_fix.mdwn
@@ -0,0 +1,4 @@
+Pushed out a git-annex release this morning mostly because of the recent
+[[bugs/git_security_fix]]. Several git-annex builds bundle a copy of git and
+needed to be updated. Note that the OSX autobuilder is temporarily down and
+so it's not been updated yet -- hopefully soon.
diff --git a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__.mdwn b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__.mdwn
index c6c67a291..c6c67a291 100644
--- a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__.mdwn
+++ b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__.mdwn
diff --git a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_1_fe291cd6cd8e2d5b8e23f8e3689d824b._comment b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_1_fe291cd6cd8e2d5b8e23f8e3689d824b._comment
index e29f57657..e29f57657 100644
--- a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_1_fe291cd6cd8e2d5b8e23f8e3689d824b._comment
+++ b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_1_fe291cd6cd8e2d5b8e23f8e3689d824b._comment
diff --git a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_2_f0dbc3c723999bf0f22502e3a89d1d4a._comment b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_2_f0dbc3c723999bf0f22502e3a89d1d4a._comment
index 3ae6b94c5..3ae6b94c5 100644
--- a/doc/forum/A_question_an_the_nomad_use_cases:_files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_2_f0dbc3c723999bf0f22502e3a89d1d4a._comment
+++ b/doc/forum/A_question_an_the_nomad_use_cases__58___files_to_fetch__44___files_to_delete__44___files_to_keep__63__/comment_2_f0dbc3c723999bf0f22502e3a89d1d4a._comment
diff --git a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook.mdwn b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook.mdwn
index 459e73838..459e73838 100644
--- a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook.mdwn
+++ b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook.mdwn
diff --git a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook/comment_1_af8ab0a47cd379fcb1445e50782ad086._comment b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook/comment_1_af8ab0a47cd379fcb1445e50782ad086._comment
index a7cb701b6..a7cb701b6 100644
--- a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook/comment_1_af8ab0a47cd379fcb1445e50782ad086._comment
+++ b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook/comment_1_af8ab0a47cd379fcb1445e50782ad086._comment
diff --git a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook/comment_2_a7202bcbdda36a3801833d2432db1965._comment b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook/comment_2_a7202bcbdda36a3801833d2432db1965._comment
index 478d2804f..478d2804f 100644
--- a/doc/forum/Advice_needed:_git-annex_slows_down_my_macbook/comment_2_a7202bcbdda36a3801833d2432db1965._comment
+++ b/doc/forum/Advice_needed__58___git-annex_slows_down_my_macbook/comment_2_a7202bcbdda36a3801833d2432db1965._comment
diff --git a/doc/forum/Android__58___Cabal_hell.mdwn b/doc/forum/Android__58___Cabal_hell.mdwn
new file mode 100644
index 000000000..e31b1b0dc
--- /dev/null
+++ b/doc/forum/Android__58___Cabal_hell.mdwn
@@ -0,0 +1,32 @@
+I tried to build the Android app according to the instructions on [the install page](https://git-annex.branchable.com/install/Android/).
+
+But during step 2 (In the chroot, run install-haskell-packages) cabal fails to handle the dependencies correctly. So I tried to change the standalone/android/cabal.config file to update all the dependencies, but this had me running into something I think is unresolvable in another package's
+dependencies. Eventually I had the following output:
+
+    # ./standalone/android/install-haskell-packages 
+    Downloading the latest package list from hackage.haskell.org
+    Skipping download: Local and remote files match.
+    /home/repo/git-annex /home/repo/git-annex/standalone/android
+    Resolving dependencies...
+    cabal: Could not resolve dependencies:
+    trying: git-annex-6.20160318 (user goal)
+    trying: persistent-template-2.1.6/installed-08b... (dependency of
+    git-annex-6.20160318)
+    next goal: monad-control (dependency of git-annex-6.20160318)
+    rejecting: monad-control-1.0.0.5/installed-cac..., 1.0.0.5, 1.0.0.4, 1.0.0.3,
+    1.0.0.2, 1.0.0.1, 1.0.0.0, 0.3.3.1, 0.3.3.0, 0.3.2.3 (global constraint
+    requires ==0.3.2.2)
+    rejecting: monad-control-0.3.2.2 (conflict: persistent-template =>
+    monad-control==1.0.0.5/installed-cac...)
+    rejecting: monad-control-0.3.2.1, 0.3.2, 0.3.1.4, 0.3.1.3, 0.3.1.2, 0.3.1.1,
+    0.3.1, 0.3.0.1, 0.3, 0.2.0.3, 0.2.0.2, 0.2.0.1, 0.2, 0.1 (global constraint
+    requires ==0.3.2.2)
+
+This tells me that the package persistent-template depends on the package monad-control at a version of 1.0.0.5. So I look at the [persistent-template hackage page](https://hackage.haskell.org/package/persistent-template-2.1.6) and see that it lists its dependency on monad-control as:
+
+    monad-control (>=0.2 && <1.1)
+
+And I don't think that's possible to resolve.
+
+All I wanted to do was change the icons on the Android package, so if you'll just accept the changed
+icons folder, I can submit the patch without testing the Android build, but currently I'm unable to build the Android port of git-annex.
diff --git a/doc/forum/Android__58___Cabal_hell/comment_1_34e869c1092f2885f54f627fb77a6057._comment b/doc/forum/Android__58___Cabal_hell/comment_1_34e869c1092f2885f54f627fb77a6057._comment
new file mode 100644
index 000000000..e96bdf222
--- /dev/null
+++ b/doc/forum/Android__58___Cabal_hell/comment_1_34e869c1092f2885f54f627fb77a6057._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-28T13:20:06Z"
+ content="""
+The android packages are all pinned at old versions, so the build is
+supposed to be reproducible using those versions. Diverging certainly
+invites cabal hell.
+
+Any chance you could show the original failure?
+
+I could probably integrate new icons if you want to just submit them.
+"""]]
diff --git a/doc/forum/Android:_Encrypted_Remotes__63__.mdwn b/doc/forum/Android__58___Encrypted_Remotes__63__.mdwn
index b8342392f..b8342392f 100644
--- a/doc/forum/Android:_Encrypted_Remotes__63__.mdwn
+++ b/doc/forum/Android__58___Encrypted_Remotes__63__.mdwn
diff --git a/doc/forum/Android:_Encrypted_Remotes__63__/comment_1_6b16cd372a9bd4f99d4c8b09a82ce3ed._comment b/doc/forum/Android__58___Encrypted_Remotes__63__/comment_1_6b16cd372a9bd4f99d4c8b09a82ce3ed._comment
index 3edcc5f90..3edcc5f90 100644
--- a/doc/forum/Android:_Encrypted_Remotes__63__/comment_1_6b16cd372a9bd4f99d4c8b09a82ce3ed._comment
+++ b/doc/forum/Android__58___Encrypted_Remotes__63__/comment_1_6b16cd372a9bd4f99d4c8b09a82ce3ed._comment
diff --git a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__.mdwn b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__.mdwn
index 4d4b67941..4d4b67941 100644
--- a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__.mdwn
+++ b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__.mdwn
diff --git a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__/comment_1_aff6a984ab076433fbce32bacae6660e._comment b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__/comment_1_aff6a984ab076433fbce32bacae6660e._comment
index 8d62f0bf5..8d62f0bf5 100644
--- a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__/comment_1_aff6a984ab076433fbce32bacae6660e._comment
+++ b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__/comment_1_aff6a984ab076433fbce32bacae6660e._comment
diff --git a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__/comment_2_5b1565955ed88554e5ef4a00c0f4a754._comment b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__/comment_2_5b1565955ed88554e5ef4a00c0f4a754._comment
index 056c78547..056c78547 100644
--- a/doc/forum/Android:_git_annex_sync_--content_not_run_in_all_repos__63__/comment_2_5b1565955ed88554e5ef4a00c0f4a754._comment
+++ b/doc/forum/Android__58___git_annex_sync_--content_not_run_in_all_repos__63__/comment_2_5b1565955ed88554e5ef4a00c0f4a754._comment
diff --git a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__.mdwn b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__.mdwn
index 0392dbb38..0392dbb38 100644
--- a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__.mdwn
+++ b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__.mdwn
diff --git a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_1_7880fc38792a1fcbf3e5c47e8bcaabce._comment b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__/comment_1_7880fc38792a1fcbf3e5c47e8bcaabce._comment
index 28f3dfb92..28f3dfb92 100644
--- a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_1_7880fc38792a1fcbf3e5c47e8bcaabce._comment
+++ b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__/comment_1_7880fc38792a1fcbf3e5c47e8bcaabce._comment
diff --git a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment
index eaf42c9e2..eaf42c9e2 100644
--- a/doc/forum/Android:_is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment
+++ b/doc/forum/Android__58___is_constant_high_cpu_usage_to_be_expected__63__/comment_2_840fbce18b4fdec21ee557fdf52c366e._comment
diff --git a/doc/forum/Android:_unusably_slow_with_moderately_sized_repositories.mdwn b/doc/forum/Android__58___unusably_slow_with_moderately_sized_repositories.mdwn
index ca2b3906f..ca2b3906f 100644
--- a/doc/forum/Android:_unusably_slow_with_moderately_sized_repositories.mdwn
+++ b/doc/forum/Android__58___unusably_slow_with_moderately_sized_repositories.mdwn
diff --git a/doc/forum/Android:_unusably_slow_with_moderately_sized_repositories/comment_3_c5c655ee3ec2501c1c3c60fd83574914._comment b/doc/forum/Android__58___unusably_slow_with_moderately_sized_repositories/comment_3_c5c655ee3ec2501c1c3c60fd83574914._comment
index 42cab60b5..42cab60b5 100644
--- a/doc/forum/Android:_unusably_slow_with_moderately_sized_repositories/comment_3_c5c655ee3ec2501c1c3c60fd83574914._comment
+++ b/doc/forum/Android__58___unusably_slow_with_moderately_sized_repositories/comment_3_c5c655ee3ec2501c1c3c60fd83574914._comment
diff --git a/doc/forum/Assistant:_configure_auto-sync.mdwn b/doc/forum/Assistant__58___configure_auto-sync.mdwn
index 48c4dc455..48c4dc455 100644
--- a/doc/forum/Assistant:_configure_auto-sync.mdwn
+++ b/doc/forum/Assistant__58___configure_auto-sync.mdwn
diff --git a/doc/forum/Assistant:_configure_auto-sync/comment_1_c8cabd38114582bbdbad49f2d81959d7._comment b/doc/forum/Assistant__58___configure_auto-sync/comment_1_c8cabd38114582bbdbad49f2d81959d7._comment
index 34fffb846..34fffb846 100644
--- a/doc/forum/Assistant:_configure_auto-sync/comment_1_c8cabd38114582bbdbad49f2d81959d7._comment
+++ b/doc/forum/Assistant__58___configure_auto-sync/comment_1_c8cabd38114582bbdbad49f2d81959d7._comment
diff --git a/doc/forum/Assistant:_run_with___34__sync_--fast__34___to_automatically_use_only_available_remotes.mdwn b/doc/forum/Assistant__58___run_with___34__sync_--fast__34___to_automatically_use_only_available_remotes.mdwn
index 3a6e4a710..3a6e4a710 100644
--- a/doc/forum/Assistant:_run_with___34__sync_--fast__34___to_automatically_use_only_available_remotes.mdwn
+++ b/doc/forum/Assistant__58___run_with___34__sync_--fast__34___to_automatically_use_only_available_remotes.mdwn
diff --git a/doc/forum/Autostart_the_assistant.mdwn b/doc/forum/Autostart_the_assistant.mdwn
new file mode 100644
index 000000000..06439750e
--- /dev/null
+++ b/doc/forum/Autostart_the_assistant.mdwn
@@ -0,0 +1,9 @@
+Hello,
+
+I'm using the Arch git-annex package: https://www.archlinux.org/packages/community/x86_64/git-annex/
+
+Checking the autostart checkbox in the assistant's web interface has no effect. There is no git-annex desktop file in ~/.config/autostart/ or alike. Neither is one contained in the package, however in the tarball I haven't found either.
+
+How does autostarting the assistant works?
+
+Best Thanks!
diff --git a/doc/forum/Autostart_the_assistant/comment_1_a5421711102fb1649d98d916e5ced86b._comment b/doc/forum/Autostart_the_assistant/comment_1_a5421711102fb1649d98d916e5ced86b._comment
new file mode 100644
index 000000000..88ad0fc3a
--- /dev/null
+++ b/doc/forum/Autostart_the_assistant/comment_1_a5421711102fb1649d98d916e5ced86b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 1"
+ date="2016-03-14T08:18:49Z"
+ content="""
+Bump that, since a vast number of ancient posts somehow were resurrected...
+"""]]
diff --git a/doc/forum/Autostart_the_assistant/comment_2_df70bd0f5caab43503a3c9d805323289._comment b/doc/forum/Autostart_the_assistant/comment_2_df70bd0f5caab43503a3c9d805323289._comment
new file mode 100644
index 000000000..3bad9e467
--- /dev/null
+++ b/doc/forum/Autostart_the_assistant/comment_2_df70bd0f5caab43503a3c9d805323289._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2016-03-14T17:41:38Z"
+ content="""
+The way autostart works is, the repository gets listed in
+`~/.config/git-annex/autostart` -- setting up that file is all that
+the webapp preferences does.
+
+`git annex assistant --autostart` looks at that files and gets the
+assistant running in each listed repository.
+
+Now, something has to take care of running that command when the system
+starts or you log in or whatever. At this point it gets OS dependant.
+
+For example, on Debian, this is handled by the git-annex package containing
+`/etc/xdg/autostart/git-annex.desktop`
+
+Sounds like they may have left this file out of the Arch package. 
+
+git-annex's `make install` handles building that desktop file. It only
+generates it if run as root, or with DESTDIR set. One or the other should
+normally be the case when building a package.
+
+Here's the content of `/etc/xdg/autostart/git-annex.desktop`
+
+	[Desktop Entry]
+	Type=Application
+	Version=1.0
+	Name=Git Annex Assistant
+	Comment=Autostart
+	Terminal=false
+	Exec=/usr/bin/git-annex assistant --autostart
+	Categories=
+"""]]
diff --git a/doc/forum/Autostart_the_assistant/comment_3_42de896f64adb49c60ec3f7e0aeebda6._comment b/doc/forum/Autostart_the_assistant/comment_3_42de896f64adb49c60ec3f7e0aeebda6._comment
new file mode 100644
index 000000000..3f23c03e5
--- /dev/null
+++ b/doc/forum/Autostart_the_assistant/comment_3_42de896f64adb49c60ec3f7e0aeebda6._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="Horus"
+ subject="comment 3"
+ date="2016-03-15T08:53:14Z"
+ content="""
+I use the Arch package, it is built / installed like that <https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/git-annex>
+
+    runhaskell Setup configure -O --prefix=/usr --docdir=\"/usr/share/doc/${pkgname}\" \
+        -fcryptonite -fnetwork-uri -f-ekg -fconcurrentoutput -ftorrentparser \
+        -ftestsuite -f-androidsplice -f-android -fproduction -fpairing -fwebapp \
+        -fassistant -fwebdav -fs3 -f-benchmark -fdbus -fxmpp -fmagicmime
+    runhaskell Setup build
+
+    runhaskell Setup copy --destdir=\"${pkgdir}\"
+
+Seem to be no classical make install involved. I try to peek your build system, but I know way to little about Haskell.
+
+Is there a way to get all the generated desktop files? Maybe add them to the prebuilt tarball?
+"""]]
diff --git a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server.mdwn b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server.mdwn
index 7291bd4b0..7291bd4b0 100644
--- a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server.mdwn
+++ b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server.mdwn
diff --git a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_1_871b5a42f1134a059df520993bb55268._comment b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_1_871b5a42f1134a059df520993bb55268._comment
index 35346757a..35346757a 100644
--- a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_1_871b5a42f1134a059df520993bb55268._comment
+++ b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_1_871b5a42f1134a059df520993bb55268._comment
diff --git a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_2_68d675096d9ea32780b8ec8526544b12._comment b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_2_68d675096d9ea32780b8ec8526544b12._comment
index 296505433..296505433 100644
--- a/doc/forum/Beginners_questions:_limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_2_68d675096d9ea32780b8ec8526544b12._comment
+++ b/doc/forum/Beginners_questions__58___limit_content_on_special_remotes___38___use_non-git_clients_for_r__47__w_access_on_shared_git-annex_server/comment_2_68d675096d9ea32780b8ec8526544b12._comment
diff --git a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__.mdwn b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__.mdwn
index f4878da20..f4878da20 100644
--- a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__.mdwn
+++ b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__.mdwn
diff --git a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_1_2eb4f410b54a25fcc895893a3c631c43._comment b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_1_2eb4f410b54a25fcc895893a3c631c43._comment
index b18e74f7a..b18e74f7a 100644
--- a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_1_2eb4f410b54a25fcc895893a3c631c43._comment
+++ b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_1_2eb4f410b54a25fcc895893a3c631c43._comment
diff --git a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment
index 4d8b0a8aa..4d8b0a8aa 100644
--- a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment
+++ b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment
diff --git a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_3_992af6855901df79a2018a07941cb8b6._comment b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_3_992af6855901df79a2018a07941cb8b6._comment
index 09d0dbd9a..09d0dbd9a 100644
--- a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_3_992af6855901df79a2018a07941cb8b6._comment
+++ b/doc/forum/Cabal__58___Could_not_resolve_dependencies___40__yesod__41__/comment_3_992af6855901df79a2018a07941cb8b6._comment
diff --git a/doc/forum/Can__39__t_create_remote_for_Goo*/comment_1_6227a28cd0c848cc1479d17fd48d37d5._comment b/doc/forum/Can__39__t_create_remote_for_Goo*/comment_1_6227a28cd0c848cc1479d17fd48d37d5._comment
deleted file mode 100644
index cdfb24685..000000000
--- a/doc/forum/Can__39__t_create_remote_for_Goo*/comment_1_6227a28cd0c848cc1479d17fd48d37d5._comment
+++ /dev/null
@@ -1,13 +0,0 @@
-[[!comment format=mdwn
- username="joey"
- subject="""comment 1"""
- date="2015-03-16T17:43:44Z"
- content="""
-Ok, the problem here is that Aws.S3.Core.StorageClass currently only 
-offers Standard | ReducedRedundancy | Glacier.
-
-To support this google thing, the library needs to be expanded.
-I have filed a request for that here:
-
-<https://github.com/aristidb/aws/issues/155>
-"""]]
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2.mdwn b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2.mdwn
index d63acdcb8..d63acdcb8 100644
--- a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2.mdwn
+++ b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2.mdwn
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_1_c44023d81e9e4f7c9341af0e4271a1e4._comment b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_1_c44023d81e9e4f7c9341af0e4271a1e4._comment
index 43f86c8b0..43f86c8b0 100644
--- a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_1_c44023d81e9e4f7c9341af0e4271a1e4._comment
+++ b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_1_c44023d81e9e4f7c9341af0e4271a1e4._comment
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_2_dfbcd39eedff28dc9ed866a8f1411ef3._comment b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_2_dfbcd39eedff28dc9ed866a8f1411ef3._comment
index 904fbb15c..904fbb15c 100644
--- a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_2_dfbcd39eedff28dc9ed866a8f1411ef3._comment
+++ b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_2_dfbcd39eedff28dc9ed866a8f1411ef3._comment
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment
index dbfff2a84..dbfff2a84 100644
--- a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment
+++ b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment
index c221455fc..c221455fc 100644
--- a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment
+++ b/doc/forum/Can__39__t_install__58___Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment
diff --git a/doc/forum/Crippled_FS:_remove_read_perms_from_dropped_files__63___.mdwn b/doc/forum/Crippled_FS__58___remove_read_perms_from_dropped_files__63___.mdwn
index 18dc2fe66..18dc2fe66 100644
--- a/doc/forum/Crippled_FS:_remove_read_perms_from_dropped_files__63___.mdwn
+++ b/doc/forum/Crippled_FS__58___remove_read_perms_from_dropped_files__63___.mdwn
diff --git a/doc/forum/Crippled_FS:_remove_read_perms_from_dropped_files__63___/comment_1_53941b83ff173025934e002a26031d9b._comment b/doc/forum/Crippled_FS__58___remove_read_perms_from_dropped_files__63___/comment_1_53941b83ff173025934e002a26031d9b._comment
index 243f839aa..243f839aa 100644
--- a/doc/forum/Crippled_FS:_remove_read_perms_from_dropped_files__63___/comment_1_53941b83ff173025934e002a26031d9b._comment
+++ b/doc/forum/Crippled_FS__58___remove_read_perms_from_dropped_files__63___/comment_1_53941b83ff173025934e002a26031d9b._comment
diff --git a/doc/forum/Disadvantages_of_WORM:_long_filename__63__.mdwn b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__.mdwn
index bff1a3ffe..bff1a3ffe 100644
--- a/doc/forum/Disadvantages_of_WORM:_long_filename__63__.mdwn
+++ b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__.mdwn
diff --git a/doc/forum/Disadvantages_of_WORM:_long_filename__63__/comment_1_cc5502b55fb71c8fdb235ea9d17216ff._comment b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__/comment_1_cc5502b55fb71c8fdb235ea9d17216ff._comment
index 9cd635eba..9cd635eba 100644
--- a/doc/forum/Disadvantages_of_WORM:_long_filename__63__/comment_1_cc5502b55fb71c8fdb235ea9d17216ff._comment
+++ b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__/comment_1_cc5502b55fb71c8fdb235ea9d17216ff._comment
diff --git a/doc/forum/Disadvantages_of_WORM:_long_filename__63__/comment_2_d04b7adcc17a305fb1d7f1c1a3641be1._comment b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__/comment_2_d04b7adcc17a305fb1d7f1c1a3641be1._comment
index a13631845..a13631845 100644
--- a/doc/forum/Disadvantages_of_WORM:_long_filename__63__/comment_2_d04b7adcc17a305fb1d7f1c1a3641be1._comment
+++ b/doc/forum/Disadvantages_of_WORM__58___long_filename__63__/comment_2_d04b7adcc17a305fb1d7f1c1a3641be1._comment
diff --git a/doc/forum/Feature_Request:_add_filename_to_hash_objects.mdwn b/doc/forum/Feature_Request__58___add_filename_to_hash_objects.mdwn
index 173cd2d94..173cd2d94 100644
--- a/doc/forum/Feature_Request:_add_filename_to_hash_objects.mdwn
+++ b/doc/forum/Feature_Request__58___add_filename_to_hash_objects.mdwn
diff --git a/doc/forum/Feature_Request:_add_filename_to_hash_objects/comment_1_73dc0a9cad486cf2d34faf064c6193b1._comment b/doc/forum/Feature_Request__58___add_filename_to_hash_objects/comment_1_73dc0a9cad486cf2d34faf064c6193b1._comment
index 8a2f9fb00..8a2f9fb00 100644
--- a/doc/forum/Feature_Request:_add_filename_to_hash_objects/comment_1_73dc0a9cad486cf2d34faf064c6193b1._comment
+++ b/doc/forum/Feature_Request__58___add_filename_to_hash_objects/comment_1_73dc0a9cad486cf2d34faf064c6193b1._comment
diff --git a/doc/forum/Feature_Request:_add_filename_to_hash_objects/comment_2_f818b3ecfeb1d1dd83df4668c061718a._comment b/doc/forum/Feature_Request__58___add_filename_to_hash_objects/comment_2_f818b3ecfeb1d1dd83df4668c061718a._comment
index 638492822..638492822 100644
--- a/doc/forum/Feature_Request:_add_filename_to_hash_objects/comment_2_f818b3ecfeb1d1dd83df4668c061718a._comment
+++ b/doc/forum/Feature_Request__58___add_filename_to_hash_objects/comment_2_f818b3ecfeb1d1dd83df4668c061718a._comment
diff --git a/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn b/doc/forum/Feature_request__58___Multiple_concurrent_transfers.mdwn
index a9d9fb162..a9d9fb162 100644
--- a/doc/forum/Feature_request:_Multiple_concurrent_transfers.mdwn
+++ b/doc/forum/Feature_request__58___Multiple_concurrent_transfers.mdwn
diff --git a/doc/forum/Feature_request:_git_annex_copy_--auto_does_the_right_thing.mdwn b/doc/forum/Feature_request__58___git_annex_copy_--auto_does_the_right_thing.mdwn
index 0a069340c..0a069340c 100644
--- a/doc/forum/Feature_request:_git_annex_copy_--auto_does_the_right_thing.mdwn
+++ b/doc/forum/Feature_request__58___git_annex_copy_--auto_does_the_right_thing.mdwn
diff --git a/doc/forum/Feature_request:_git_annex_copy_--auto_does_the_right_thing/comment_1_bbac7d0810a79eb1f42a01e1b31d5c4c._comment b/doc/forum/Feature_request__58___git_annex_copy_--auto_does_the_right_thing/comment_1_bbac7d0810a79eb1f42a01e1b31d5c4c._comment
index cd834e08d..cd834e08d 100644
--- a/doc/forum/Feature_request:_git_annex_copy_--auto_does_the_right_thing/comment_1_bbac7d0810a79eb1f42a01e1b31d5c4c._comment
+++ b/doc/forum/Feature_request__58___git_annex_copy_--auto_does_the_right_thing/comment_1_bbac7d0810a79eb1f42a01e1b31d5c4c._comment
diff --git a/doc/forum/Feature_request:_webapp_support_for_centralized_bare_repos.mdwn b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos.mdwn
index 2fdab28a7..2fdab28a7 100644
--- a/doc/forum/Feature_request:_webapp_support_for_centralized_bare_repos.mdwn
+++ b/doc/forum/Feature_request__58___webapp_support_for_centralized_bare_repos.mdwn
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__.mdwn b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__.mdwn
index 777140354..777140354 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__.mdwn
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__.mdwn
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_10_645af86feb8506c3ea2134badac68e0b._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_10_645af86feb8506c3ea2134badac68e0b._comment
index 8029f07c0..8029f07c0 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_10_645af86feb8506c3ea2134badac68e0b._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_10_645af86feb8506c3ea2134badac68e0b._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_1_d9acd44c00676d814e19613d6fd276a2._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_1_d9acd44c00676d814e19613d6fd276a2._comment
index a4915729a..a4915729a 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_1_d9acd44c00676d814e19613d6fd276a2._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_1_d9acd44c00676d814e19613d6fd276a2._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_2_45928886d1ae4a76e2daefb355967729._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_2_45928886d1ae4a76e2daefb355967729._comment
index 1b0f11834..1b0f11834 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_2_45928886d1ae4a76e2daefb355967729._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_2_45928886d1ae4a76e2daefb355967729._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_3_1249bf921ea7709b4f7ae25e613bf60a._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_3_1249bf921ea7709b4f7ae25e613bf60a._comment
index 4fb44b160..4fb44b160 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_3_1249bf921ea7709b4f7ae25e613bf60a._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_3_1249bf921ea7709b4f7ae25e613bf60a._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_4_616cb76a510fa32c2aa48c25d24c6044._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_4_616cb76a510fa32c2aa48c25d24c6044._comment
index cad2b2493..cad2b2493 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_4_616cb76a510fa32c2aa48c25d24c6044._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_4_616cb76a510fa32c2aa48c25d24c6044._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_5_100fc29a95923e5ef92eaf87d76bbc6f._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_5_100fc29a95923e5ef92eaf87d76bbc6f._comment
index c527276c6..c527276c6 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_5_100fc29a95923e5ef92eaf87d76bbc6f._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_5_100fc29a95923e5ef92eaf87d76bbc6f._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_6_9b19ae8e8c0c70e3827c9f362c1c1dea._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_6_9b19ae8e8c0c70e3827c9f362c1c1dea._comment
index fbec80f92..fbec80f92 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_6_9b19ae8e8c0c70e3827c9f362c1c1dea._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_6_9b19ae8e8c0c70e3827c9f362c1c1dea._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_7_0c1c76bb082c108f3074b725bcc272c9._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_7_0c1c76bb082c108f3074b725bcc272c9._comment
index d437b916d..d437b916d 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_7_0c1c76bb082c108f3074b725bcc272c9._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_7_0c1c76bb082c108f3074b725bcc272c9._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_8_1d7c8c8c5b34cbc7166f8d4d52b91761._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_8_1d7c8c8c5b34cbc7166f8d4d52b91761._comment
index 41462a16b..41462a16b 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_8_1d7c8c8c5b34cbc7166f8d4d52b91761._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_8_1d7c8c8c5b34cbc7166f8d4d52b91761._comment
diff --git a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_9_2bfb2eaf1a72e0822341cfeba9058aa7._comment b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_9_2bfb2eaf1a72e0822341cfeba9058aa7._comment
index 086dce752..086dce752 100644
--- a/doc/forum/Git-annex_assistant:_where_are_deleted_files_and_older_versions_saved__63__/comment_9_2bfb2eaf1a72e0822341cfeba9058aa7._comment
+++ b/doc/forum/Git-annex_assistant__58___where_are_deleted_files_and_older_versions_saved__63__/comment_9_2bfb2eaf1a72e0822341cfeba9058aa7._comment
diff --git a/doc/forum/Git_Annex_Assistant:_How_to_add_a_remote__63__.mdwn b/doc/forum/Git_Annex_Assistant__58___How_to_add_a_remote__63__.mdwn
index 0a3aac911..0a3aac911 100644
--- a/doc/forum/Git_Annex_Assistant:_How_to_add_a_remote__63__.mdwn
+++ b/doc/forum/Git_Annex_Assistant__58___How_to_add_a_remote__63__.mdwn
diff --git a/doc/forum/Git_Annex_Assistant:_How_to_add_a_remote__63__/comment_1_d0a3d0090928790d5a05e9f8e5f05320._comment b/doc/forum/Git_Annex_Assistant__58___How_to_add_a_remote__63__/comment_1_d0a3d0090928790d5a05e9f8e5f05320._comment
index 5c3a596a5..5c3a596a5 100644
--- a/doc/forum/Git_Annex_Assistant:_How_to_add_a_remote__63__/comment_1_d0a3d0090928790d5a05e9f8e5f05320._comment
+++ b/doc/forum/Git_Annex_Assistant__58___How_to_add_a_remote__63__/comment_1_d0a3d0090928790d5a05e9f8e5f05320._comment
diff --git a/doc/forum/OSX:_Upgrader:_Failed_to_check_if_upgrade_is_available..mdwn b/doc/forum/OSX__58___Upgrader__58___Failed_to_check_if_upgrade_is_available..mdwn
index 1f02b568c..1f02b568c 100644
--- a/doc/forum/OSX:_Upgrader:_Failed_to_check_if_upgrade_is_available..mdwn
+++ b/doc/forum/OSX__58___Upgrader__58___Failed_to_check_if_upgrade_is_available..mdwn
diff --git a/doc/forum/OSX:_Upgrader:_Failed_to_check_if_upgrade_is_available./comment_1_ac7c1f39e723cbcd49d6497649e7e44f._comment b/doc/forum/OSX__58___Upgrader__58___Failed_to_check_if_upgrade_is_available./comment_1_ac7c1f39e723cbcd49d6497649e7e44f._comment
index 39eae02a8..39eae02a8 100644
--- a/doc/forum/OSX:_Upgrader:_Failed_to_check_if_upgrade_is_available./comment_1_ac7c1f39e723cbcd49d6497649e7e44f._comment
+++ b/doc/forum/OSX__58___Upgrader__58___Failed_to_check_if_upgrade_is_available./comment_1_ac7c1f39e723cbcd49d6497649e7e44f._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__.mdwn b/doc/forum/Question__58___git-annex-only_repo___63__.mdwn
index e6b5ab663..e6b5ab663 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__.mdwn
+++ b/doc/forum/Question__58___git-annex-only_repo___63__.mdwn
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment
index b0fe83dd6..b0fe83dd6 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_10_ada27f7b8c7dc3c388e6c56ef095e682._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment
index 7f485a418..7f485a418 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_1_321632cc794c00181932f5737db9aff0._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_1_321632cc794c00181932f5737db9aff0._comment
index b69abb3bd..b69abb3bd 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_1_321632cc794c00181932f5737db9aff0._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_1_321632cc794c00181932f5737db9aff0._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_2_941b62a63c11caa1ada5d544c2e926ca._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_2_941b62a63c11caa1ada5d544c2e926ca._comment
index fdde45be6..fdde45be6 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_2_941b62a63c11caa1ada5d544c2e926ca._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_2_941b62a63c11caa1ada5d544c2e926ca._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_3_0c0dad1ffa11f2f8708906d310a189db._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_3_0c0dad1ffa11f2f8708906d310a189db._comment
index d61393dc8..d61393dc8 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_3_0c0dad1ffa11f2f8708906d310a189db._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_3_0c0dad1ffa11f2f8708906d310a189db._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_4_426160c2237db790b133b9c9f0abd4b2._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_4_426160c2237db790b133b9c9f0abd4b2._comment
index ff771d16c..ff771d16c 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_4_426160c2237db790b133b9c9f0abd4b2._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_4_426160c2237db790b133b9c9f0abd4b2._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_5_36bd0a398b385e65df7eda26fa5c50d0._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_5_36bd0a398b385e65df7eda26fa5c50d0._comment
index fe9c9714f..fe9c9714f 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_5_36bd0a398b385e65df7eda26fa5c50d0._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_5_36bd0a398b385e65df7eda26fa5c50d0._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_6_32fb6930bcaac36d00b088d8ee09face._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_6_32fb6930bcaac36d00b088d8ee09face._comment
index ce10012ee..ce10012ee 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_6_32fb6930bcaac36d00b088d8ee09face._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_6_32fb6930bcaac36d00b088d8ee09face._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_7_8278ee493da14aac86e928d2349d8173._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_7_8278ee493da14aac86e928d2349d8173._comment
index 56aae7d1d..56aae7d1d 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_7_8278ee493da14aac86e928d2349d8173._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_7_8278ee493da14aac86e928d2349d8173._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_8_3e24c9f9042d6abdafaae45015645b11._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_8_3e24c9f9042d6abdafaae45015645b11._comment
index 0011ebb20..0011ebb20 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_8_3e24c9f9042d6abdafaae45015645b11._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_8_3e24c9f9042d6abdafaae45015645b11._comment
diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_9_182c66e98086dbfde29b615d0cf0e8e4._comment b/doc/forum/Question__58___git-annex-only_repo___63__/comment_9_182c66e98086dbfde29b615d0cf0e8e4._comment
index b9432bb03..b9432bb03 100644
--- a/doc/forum/Question:_git-annex-only_repo___63__/comment_9_182c66e98086dbfde29b615d0cf0e8e4._comment
+++ b/doc/forum/Question__58___git-annex-only_repo___63__/comment_9_182c66e98086dbfde29b615d0cf0e8e4._comment
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff.mdwn b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff.mdwn
index 3d93d8026..3d93d8026 100644
--- a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff.mdwn
+++ b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff.mdwn
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_1_20147b287fd995fa8ac9e868b5974d8a._comment b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_1_20147b287fd995fa8ac9e868b5974d8a._comment
index 1f5018e34..1f5018e34 100644
--- a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_1_20147b287fd995fa8ac9e868b5974d8a._comment
+++ b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_1_20147b287fd995fa8ac9e868b5974d8a._comment
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment
index e90238063..e90238063 100644
--- a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment
+++ b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_2_f6d977a534264b4368401e1b13628931._comment
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment
index 214444c61..214444c61 100644
--- a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment
+++ b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_3_d534da276b79a40fdb7d8d158f6eae26._comment
diff --git a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_4_8c817d08ca9d94a1228fb21cd0b15744._comment b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_4_8c817d08ca9d94a1228fb21cd0b15744._comment
index 74a3a2a75..74a3a2a75 100644
--- a/doc/forum/Somehow_have_lots_of_directories_in_root:_000...ffff/comment_4_8c817d08ca9d94a1228fb21cd0b15744._comment
+++ b/doc/forum/Somehow_have_lots_of_directories_in_root__58___000...ffff/comment_4_8c817d08ca9d94a1228fb21cd0b15744._comment
diff --git a/doc/forum/Ssh_remote_on_NAS/comment_6_26d444afe2edea3500f80bb5c62ba491._comment b/doc/forum/Ssh_remote_on_NAS/comment_6_26d444afe2edea3500f80bb5c62ba491._comment
new file mode 100644
index 000000000..af180a980
--- /dev/null
+++ b/doc/forum/Ssh_remote_on_NAS/comment_6_26d444afe2edea3500f80bb5c62ba491._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="torpidus"
+ subject="comment 6"
+ date="2016-03-16T22:23:26Z"
+ content="""
+Hello Fabio,
+I came across this posting from you one year ago. Since I'm also using a QNAP NAS for hosting several of my git-annex repos, it would be very valuable to hear some details about your setup. My setup currently consists of a virtual machine hosted on the NAS with an ordinary linux, nothing special. Would love to have git-annex installed on the NAS operating system rather, which is unfortunately not that easy.
+
+
+Even in case you may not have been able to solve the issue described in this thread, can you maybe tell for example how you solved the issue of the QNAP operating system purging self-installed software? Or how you managed to let the pre-installed SSH daemon let other users than \"admin\" log-in?
+
+
+Probably we're the first ones ever trying this, so it would be very useful to collect all about QNAP NAS and the usage of git-annex on these devices.
+"""]]
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__.mdwn b/doc/forum/Stupid_mistake__58___recoverable__63__.mdwn
index 8e25d7081..8e25d7081 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__.mdwn
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__.mdwn
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__/comment_1_00ceb3a5e37825c4bbc806f532893706._comment b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_1_00ceb3a5e37825c4bbc806f532893706._comment
index ebc8073f7..ebc8073f7 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__/comment_1_00ceb3a5e37825c4bbc806f532893706._comment
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_1_00ceb3a5e37825c4bbc806f532893706._comment
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__/comment_2_cbedc29678d9b6af3b3c0bb1915d2391._comment b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_2_cbedc29678d9b6af3b3c0bb1915d2391._comment
index f552cfb18..f552cfb18 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__/comment_2_cbedc29678d9b6af3b3c0bb1915d2391._comment
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_2_cbedc29678d9b6af3b3c0bb1915d2391._comment
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__/comment_3_86aa4d92a1330811862da1ba568b3037._comment b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_3_86aa4d92a1330811862da1ba568b3037._comment
index b642cde98..b642cde98 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__/comment_3_86aa4d92a1330811862da1ba568b3037._comment
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_3_86aa4d92a1330811862da1ba568b3037._comment
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__/comment_4_6d15bf8a3c3c27cc92957070161675a9._comment b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_4_6d15bf8a3c3c27cc92957070161675a9._comment
index 97a4cd0db..97a4cd0db 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__/comment_4_6d15bf8a3c3c27cc92957070161675a9._comment
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_4_6d15bf8a3c3c27cc92957070161675a9._comment
diff --git a/doc/forum/Stupid_mistake:_recoverable__63__/comment_5_f836b9b1d03d94c49e3798961790b2ba._comment b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_5_f836b9b1d03d94c49e3798961790b2ba._comment
index d28c247e1..d28c247e1 100644
--- a/doc/forum/Stupid_mistake:_recoverable__63__/comment_5_f836b9b1d03d94c49e3798961790b2ba._comment
+++ b/doc/forum/Stupid_mistake__58___recoverable__63__/comment_5_f836b9b1d03d94c49e3798961790b2ba._comment
diff --git a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version.mdwn b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version.mdwn
index 1f8730514..1f8730514 100644
--- a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version.mdwn
+++ b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version.mdwn
diff --git a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version/comment_1_5c2f376a82458c6387560355940419d3._comment b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version/comment_1_5c2f376a82458c6387560355940419d3._comment
index 9a39a2e4c..9a39a2e4c 100644
--- a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version/comment_1_5c2f376a82458c6387560355940419d3._comment
+++ b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version/comment_1_5c2f376a82458c6387560355940419d3._comment
diff --git a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version/comment_2_6321dec0b2f22f841f3cb986e063113f._comment b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version/comment_2_6321dec0b2f22f841f3cb986e063113f._comment
index b1ce5a1a5..b1ce5a1a5 100644
--- a/doc/forum/Suggestion:_Put_ssh_server_back_into_android_version/comment_2_6321dec0b2f22f841f3cb986e063113f._comment
+++ b/doc/forum/Suggestion__58___Put_ssh_server_back_into_android_version/comment_2_6321dec0b2f22f841f3cb986e063113f._comment
diff --git a/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands:_scp_rsync__160__.mdwn b/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands__58___scp_rsync__160__.mdwn
index 932c78a9a..932c78a9a 100644
--- a/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands:_scp_rsync__160__.mdwn
+++ b/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands__58___scp_rsync__160__.mdwn
diff --git a/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands:_scp_rsync__160__/comment_1_68e911629da672473bd6188407a68be2._comment b/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands__58___scp_rsync__160__/comment_1_68e911629da672473bd6188407a68be2._comment
index b6fa2d1a1..b6fa2d1a1 100644
--- a/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands:_scp_rsync__160__/comment_1_68e911629da672473bd6188407a68be2._comment
+++ b/doc/forum/This_account_is_restricted_by_rssh._Allowed_commands__58___scp_rsync__160__/comment_1_68e911629da672473bd6188407a68be2._comment
diff --git a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__.mdwn b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__.mdwn
index 5495e2649..5495e2649 100644
--- a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__.mdwn
+++ b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__.mdwn
diff --git a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_1_b8702892280447193e6e80be22a580a0._comment b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_1_b8702892280447193e6e80be22a580a0._comment
index 915e7209b..915e7209b 100644
--- a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_1_b8702892280447193e6e80be22a580a0._comment
+++ b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_1_b8702892280447193e6e80be22a580a0._comment
diff --git a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_2_50cafde7e30b928480d1f142ddd763d2._comment b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_2_50cafde7e30b928480d1f142ddd763d2._comment
index 4495401b2..4495401b2 100644
--- a/doc/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_2_50cafde7e30b928480d1f142ddd763d2._comment
+++ b/doc/forum/Two_computer_setup__58_____34__transfer__34___or___34__full_backup__34___repository_groups__63__/comment_2_50cafde7e30b928480d1f142ddd763d2._comment
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too..mdwn b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too..mdwn
index 37dd1bc24..37dd1bc24 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too..mdwn
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too..mdwn
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment
index 7f170975a..7f170975a 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_1_30205c1ba18e5dca2314f593e1a0e236._comment
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_2_f8df728de28218a6b060ae9f08adac79._comment b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_2_f8df728de28218a6b060ae9f08adac79._comment
index 576007b62..576007b62 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_2_f8df728de28218a6b060ae9f08adac79._comment
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_2_f8df728de28218a6b060ae9f08adac79._comment
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_3_ba438b3a371261ee841665f1ae57eba2._comment b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_3_ba438b3a371261ee841665f1ae57eba2._comment
index 9184495b5..9184495b5 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_3_ba438b3a371261ee841665f1ae57eba2._comment
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_3_ba438b3a371261ee841665f1ae57eba2._comment
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_4_9f72e6c7c14a77330297526aef260762._comment b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_4_9f72e6c7c14a77330297526aef260762._comment
index d43019ce0..d43019ce0 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_4_9f72e6c7c14a77330297526aef260762._comment
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_4_9f72e6c7c14a77330297526aef260762._comment
diff --git a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_5_a06e8c9b4e30c1cd6cbed40d2db50abc._comment b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_5_a06e8c9b4e30c1cd6cbed40d2db50abc._comment
index 321fa9c53..321fa9c53 100644
--- a/doc/forum/Usecase:_Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_5_a06e8c9b4e30c1cd6cbed40d2db50abc._comment
+++ b/doc/forum/Usecase__58___Tree_of_files_on_a_remote_SMB_server_that_i_need_to_leave_there__44____while_also_cloning_and_syncing_too./comment_5_a06e8c9b4e30c1cd6cbed40d2db50abc._comment
diff --git a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised.mdwn
index f191503e3..f191503e3 100644
--- a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn
+++ b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised.mdwn
diff --git a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised/comment_1_c3dd239d4b5b372229f2cec42a8a6eb4._comment b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised/comment_1_c3dd239d4b5b372229f2cec42a8a6eb4._comment
index 935b46a01..935b46a01 100644
--- a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised/comment_1_c3dd239d4b5b372229f2cec42a8a6eb4._comment
+++ b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised/comment_1_c3dd239d4b5b372229f2cec42a8a6eb4._comment
diff --git a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised/comment_2_b76dd79aabe87ec717eea164aa965d74._comment b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised/comment_2_b76dd79aabe87ec717eea164aa965d74._comment
index 2b5a8672b..2b5a8672b 100644
--- a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised/comment_2_b76dd79aabe87ec717eea164aa965d74._comment
+++ b/doc/forum/Using_standard_groups_and_sync_to_preserve_history__58___--all_not_recognised/comment_2_b76dd79aabe87ec717eea164aa965d74._comment
diff --git a/doc/forum/WARNING:_linker:git-annex_has_text_relocations....mdwn b/doc/forum/WARNING__58___linker__58__git-annex_has_text_relocations.mdwn
index 2d9ee1324..2d9ee1324 100644
--- a/doc/forum/WARNING:_linker:git-annex_has_text_relocations....mdwn
+++ b/doc/forum/WARNING__58___linker__58__git-annex_has_text_relocations.mdwn
diff --git a/doc/forum/WARNING:_linker:git-annex_has_text_relocations.../comment_1_fee360353f0b46aab6ee7a902c0837bb._comment b/doc/forum/WARNING__58___linker__58__git-annex_has_text_relocations/comment_1_fee360353f0b46aab6ee7a902c0837bb._comment
index 8d9af9624..8d9af9624 100644
--- a/doc/forum/WARNING:_linker:git-annex_has_text_relocations.../comment_1_fee360353f0b46aab6ee7a902c0837bb._comment
+++ b/doc/forum/WARNING__58___linker__58__git-annex_has_text_relocations/comment_1_fee360353f0b46aab6ee7a902c0837bb._comment
diff --git a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__.mdwn b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__.mdwn
index 99dcc799b..99dcc799b 100644
--- a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__.mdwn
+++ b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__.mdwn
diff --git a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_1_b051dc30bf5a0fc9f5710c664f487ea9._comment b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_1_b051dc30bf5a0fc9f5710c664f487ea9._comment
index eba1455f1..eba1455f1 100644
--- a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_1_b051dc30bf5a0fc9f5710c664f487ea9._comment
+++ b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_1_b051dc30bf5a0fc9f5710c664f487ea9._comment
diff --git a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_2_8775a1483b29e2cc8f0456473c24e51e._comment b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_2_8775a1483b29e2cc8f0456473c24e51e._comment
index d757ef7f1..d757ef7f1 100644
--- a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_2_8775a1483b29e2cc8f0456473c24e51e._comment
+++ b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_2_8775a1483b29e2cc8f0456473c24e51e._comment
diff --git a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_3_cbaa3e0fa4e2347332b3929411f60d1d._comment b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_3_cbaa3e0fa4e2347332b3929411f60d1d._comment
index e68f9b080..e68f9b080 100644
--- a/doc/forum/Windows_error:___34__git:___39__annex__39___is_not_a_git_command.__34__/comment_3_cbaa3e0fa4e2347332b3929411f60d1d._comment
+++ b/doc/forum/Windows_error__58_____34__git__58_____39__annex__39___is_not_a_git_command.__34__/comment_3_cbaa3e0fa4e2347332b3929411f60d1d._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers.mdwn b/doc/forum/Wishlist__58___Bittorrent-like_transfers.mdwn
index 7ec663216..7ec663216 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers.mdwn
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers.mdwn
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_1_13544d54fb0418af4ca9200cdb045d91._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_1_13544d54fb0418af4ca9200cdb045d91._comment
index 73295478f..73295478f 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_1_13544d54fb0418af4ca9200cdb045d91._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_1_13544d54fb0418af4ca9200cdb045d91._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_2_9a7dad35bf80c684ad97892420d7370c._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_2_9a7dad35bf80c684ad97892420d7370c._comment
index affd07efd..affd07efd 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_2_9a7dad35bf80c684ad97892420d7370c._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_2_9a7dad35bf80c684ad97892420d7370c._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_3_e5de748bc5da12a4a01e08cde2407dd1._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_3_e5de748bc5da12a4a01e08cde2407dd1._comment
index ba8da25f0..ba8da25f0 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_3_e5de748bc5da12a4a01e08cde2407dd1._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_3_e5de748bc5da12a4a01e08cde2407dd1._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_4_e51530178f1e034c0fdd5c9aa9945567._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_4_e51530178f1e034c0fdd5c9aa9945567._comment
index d3e0d3314..d3e0d3314 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_4_e51530178f1e034c0fdd5c9aa9945567._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_4_e51530178f1e034c0fdd5c9aa9945567._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_5_81ea9c129d8c02097f09ef8c68f1bb11._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_5_81ea9c129d8c02097f09ef8c68f1bb11._comment
index 1ef2b25ac..1ef2b25ac 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_5_81ea9c129d8c02097f09ef8c68f1bb11._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_5_81ea9c129d8c02097f09ef8c68f1bb11._comment
diff --git a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_6_3b5798414f89686526da3dfa72c0c4f2._comment b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_6_3b5798414f89686526da3dfa72c0c4f2._comment
index 7a027c909..7a027c909 100644
--- a/doc/forum/Wishlist:_Bittorrent-like_transfers/comment_6_3b5798414f89686526da3dfa72c0c4f2._comment
+++ b/doc/forum/Wishlist__58___Bittorrent-like_transfers/comment_6_3b5798414f89686526da3dfa72c0c4f2._comment
diff --git a/doc/forum/Wishlist:_Don__39__t_make_files_readonly.mdwn b/doc/forum/Wishlist__58___Don__39__t_make_files_readonly.mdwn
index 4d67f93b1..4d67f93b1 100644
--- a/doc/forum/Wishlist:_Don__39__t_make_files_readonly.mdwn
+++ b/doc/forum/Wishlist__58___Don__39__t_make_files_readonly.mdwn
diff --git a/doc/forum/Wishlist:_Don__39__t_make_files_readonly/comment_1_7148527961e2d27793810966588c8d35._comment b/doc/forum/Wishlist__58___Don__39__t_make_files_readonly/comment_1_7148527961e2d27793810966588c8d35._comment
index b7a6f55f4..b7a6f55f4 100644
--- a/doc/forum/Wishlist:_Don__39__t_make_files_readonly/comment_1_7148527961e2d27793810966588c8d35._comment
+++ b/doc/forum/Wishlist__58___Don__39__t_make_files_readonly/comment_1_7148527961e2d27793810966588c8d35._comment
diff --git a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__.mdwn b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__.mdwn
index 1a7930fec..1a7930fec 100644
--- a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__.mdwn
+++ b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__.mdwn
diff --git a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_1_1cf4ab29dfa2cff59b86305fc0018251._comment b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_1_1cf4ab29dfa2cff59b86305fc0018251._comment
index 3ab518714..3ab518714 100644
--- a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_1_1cf4ab29dfa2cff59b86305fc0018251._comment
+++ b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_1_1cf4ab29dfa2cff59b86305fc0018251._comment
diff --git a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_2_f5ebb7f43dcef861ecc13373fb1e263f._comment b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_2_f5ebb7f43dcef861ecc13373fb1e263f._comment
index 960100379..960100379 100644
--- a/doc/forum/Wishlist:_Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_2_f5ebb7f43dcef861ecc13373fb1e263f._comment
+++ b/doc/forum/Wishlist__58___Is_it_possible_to___34__unlock__34___files_without_copying_the_file_data__63__/comment_2_f5ebb7f43dcef861ecc13373fb1e263f._comment
diff --git a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information.mdwn b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information.mdwn
index 1de06f7cd..1de06f7cd 100644
--- a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information.mdwn
+++ b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information.mdwn
diff --git a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information/comment_1_818f38aa988177d3a9415055e084f0fb._comment b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information/comment_1_818f38aa988177d3a9415055e084f0fb._comment
index 11b44b809..11b44b809 100644
--- a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information/comment_1_818f38aa988177d3a9415055e084f0fb._comment
+++ b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information/comment_1_818f38aa988177d3a9415055e084f0fb._comment
diff --git a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information/comment_2_97e2ed48bd552d02918c4f98f963e6e1._comment b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information/comment_2_97e2ed48bd552d02918c4f98f963e6e1._comment
index 787cf8f5d..787cf8f5d 100644
--- a/doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information/comment_2_97e2ed48bd552d02918c4f98f963e6e1._comment
+++ b/doc/forum/Wishlist__58___Ways_of_selecting_files_based_on_meta-information/comment_2_97e2ed48bd552d02918c4f98f963e6e1._comment
diff --git a/doc/forum/Wishlist:_automatic_reinject.mdwn b/doc/forum/Wishlist__58___automatic_reinject.mdwn
index f975c7521..f975c7521 100644
--- a/doc/forum/Wishlist:_automatic_reinject.mdwn
+++ b/doc/forum/Wishlist__58___automatic_reinject.mdwn
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files.mdwn b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files.mdwn
index 7bdd93654..7bdd93654 100644
--- a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files.mdwn
+++ b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files.mdwn
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment
index bff5b2ea7..bff5b2ea7 100644
--- a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment
+++ b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_2_b4c6ebada7526263e04c70eac312fda9._comment b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_2_b4c6ebada7526263e04c70eac312fda9._comment
index 551c685d4..551c685d4 100644
--- a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_2_b4c6ebada7526263e04c70eac312fda9._comment
+++ b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_2_b4c6ebada7526263e04c70eac312fda9._comment
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_3_ded71b270b94617a8ebb3a713d46a274._comment b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_3_ded71b270b94617a8ebb3a713d46a274._comment
index ddc9ae147..ddc9ae147 100644
--- a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_3_ded71b270b94617a8ebb3a713d46a274._comment
+++ b/doc/forum/Wishlist__58___getting_the_disk_used_by_a_subtree_of_files/comment_3_ded71b270b94617a8ebb3a713d46a274._comment
diff --git a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__.mdwn b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__.mdwn
index c3f915e7d..c3f915e7d 100644
--- a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__.mdwn
+++ b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__.mdwn
diff --git a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment
index c0746a5a7..c0746a5a7 100644
--- a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment
+++ b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment
diff --git a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_2_3e201039fa0e611554171ee30e69a414._comment b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_2_3e201039fa0e611554171ee30e69a414._comment
index b1a76ce2d..b1a76ce2d 100644
--- a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_2_3e201039fa0e611554171ee30e69a414._comment
+++ b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_2_3e201039fa0e611554171ee30e69a414._comment
diff --git a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_3_d1074724c44f3296cb438b2d526d8728._comment b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_3_d1074724c44f3296cb438b2d526d8728._comment
index eb1862829..eb1862829 100644
--- a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_3_d1074724c44f3296cb438b2d526d8728._comment
+++ b/doc/forum/Wishlist__58___logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_3_d1074724c44f3296cb438b2d526d8728._comment
diff --git a/doc/forum/Wishlist:_mark_remotes_offline.mdwn b/doc/forum/Wishlist__58___mark_remotes_offline.mdwn
index 046c62210..046c62210 100644
--- a/doc/forum/Wishlist:_mark_remotes_offline.mdwn
+++ b/doc/forum/Wishlist__58___mark_remotes_offline.mdwn
diff --git a/doc/forum/Wishlist:_mark_remotes_offline/comment_1_9e3901f0123abb66034cce95cc5a941a._comment b/doc/forum/Wishlist__58___mark_remotes_offline/comment_1_9e3901f0123abb66034cce95cc5a941a._comment
index c24a786c9..c24a786c9 100644
--- a/doc/forum/Wishlist:_mark_remotes_offline/comment_1_9e3901f0123abb66034cce95cc5a941a._comment
+++ b/doc/forum/Wishlist__58___mark_remotes_offline/comment_1_9e3901f0123abb66034cce95cc5a941a._comment
diff --git a/doc/forum/Wishlist:_mark_remotes_offline/comment_2_d10e3d90cf421ae425e64ab266ea811b._comment b/doc/forum/Wishlist__58___mark_remotes_offline/comment_2_d10e3d90cf421ae425e64ab266ea811b._comment
index e14cfa822..e14cfa822 100644
--- a/doc/forum/Wishlist:_mark_remotes_offline/comment_2_d10e3d90cf421ae425e64ab266ea811b._comment
+++ b/doc/forum/Wishlist__58___mark_remotes_offline/comment_2_d10e3d90cf421ae425e64ab266ea811b._comment
diff --git a/doc/forum/Wishlist:_options_for_syncing_meta-data_and_data.mdwn b/doc/forum/Wishlist__58___options_for_syncing_meta-data_and_data.mdwn
index d1df6628e..d1df6628e 100644
--- a/doc/forum/Wishlist:_options_for_syncing_meta-data_and_data.mdwn
+++ b/doc/forum/Wishlist__58___options_for_syncing_meta-data_and_data.mdwn
diff --git a/doc/forum/Wishlist:_rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT.mdwn b/doc/forum/Wishlist__58___rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT.mdwn
index 847ff01bd..847ff01bd 100644
--- a/doc/forum/Wishlist:_rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT.mdwn
+++ b/doc/forum/Wishlist__58___rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT.mdwn
diff --git a/doc/forum/Wishlist:_rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT/comment_1_5d33bcbd862537f53edd91dcff2b8977._comment b/doc/forum/Wishlist__58___rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT/comment_1_5d33bcbd862537f53edd91dcff2b8977._comment
index 42fad62b9..42fad62b9 100644
--- a/doc/forum/Wishlist:_rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT/comment_1_5d33bcbd862537f53edd91dcff2b8977._comment
+++ b/doc/forum/Wishlist__58___rename_files__47__dirs_w__47___special_characters_if_filesystem_is_FAT/comment_1_5d33bcbd862537f53edd91dcff2b8977._comment
diff --git a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner.mdwn b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner.mdwn
index 85395869e..85395869e 100644
--- a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner.mdwn
+++ b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner.mdwn
diff --git a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_1_ee783a968a5948e2f50bd2d090a2238b._comment b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_1_ee783a968a5948e2f50bd2d090a2238b._comment
index 3eaa59b6b..3eaa59b6b 100644
--- a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_1_ee783a968a5948e2f50bd2d090a2238b._comment
+++ b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_1_ee783a968a5948e2f50bd2d090a2238b._comment
diff --git a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_2_259b67a887dd6aa327b752f455c24bff._comment b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_2_259b67a887dd6aa327b752f455c24bff._comment
index e7697132a..e7697132a 100644
--- a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_2_259b67a887dd6aa327b752f455c24bff._comment
+++ b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_2_259b67a887dd6aa327b752f455c24bff._comment
diff --git a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment
index ff649fe60..ff649fe60 100644
--- a/doc/forum/Writing_a_book_about_git-annex:_I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment
+++ b/doc/forum/Writing_a_book_about_git-annex__58___I_need_a_sparring_partner/comment_3_a072a5c8f0798094d9ab0b7dc6c34f98._comment
diff --git a/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring.mdwn b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring.mdwn
new file mode 100644
index 000000000..5d39ec77f
--- /dev/null
+++ b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring.mdwn
@@ -0,0 +1,40 @@
+Currently I am trying to synchronize two folders between my NAS and my main computer. On both machines I can access the web app. However, once I try to pair these machines with a secret phrase I get the following error:
+ 
+illegal control characters in pairing message; ignoring
+
+The log on one machine is:
+
+[2016-03-18 14:25:16.861132] main: Pairing in progress
+Generating public/private rsa key pair.
+Your identification has been saved in /var/folders/_v/hkf9zbqs0bgd2vcnmr_qnlgm0000gn/T/git-annex-keygenN92651/key.
+Your public key has been saved in /var/folders/_v/hkf9zbqs0bgd2vcnmr_qnlgm0000gn/T/git-annex-keygenN92651/key.pub.
+The key fingerprint is:
+SHA256:beyV1f5MKFGaaH9p1CRMPmaVcYAmOyc/lhp7HCw668M username@iMac.home
+The key's randomart image is:
++---[RSA 2048]----+
+|             +=o*|
+|          ..o=.B.|
+|          o++ B o|
+|         ++..B = |
+|        S +*=.= o|
+|         oo.B+ o.|
+|       . ..B o  o|
+|        E o o    |
+|       .o+ .     |
++----[SHA256]-----+
+[2016-03-18 14:25:26.442301] main: Pairing in progress
+ 
+  illegal control characters in pairing message; ignoring
+ 
+  illegal control characters in pairing message; ignoring
+ 
+  illegal control characters in pairing message; ignoring
+ 
+  illegal control characters in pairing message; ignoring
+
+While on the other machine I get:
+
+[2016-03-18 14:25:35 CET] main: Pairing with username@iMac.home:~/Desktop/annex in progress
+
+
+
diff --git a/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_1_99975a677f832c410050ba721be6d904._comment b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_1_99975a677f832c410050ba721be6d904._comment
new file mode 100644
index 000000000..0ebe49ec5
--- /dev/null
+++ b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_1_99975a677f832c410050ba721be6d904._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-18T15:31:17Z"
+ content="""
+This probably has something to do with the hostname of the other host than
+the one that displays the error. Or possibly with the name of the user on
+that host, or the directory on that host where the git-annex repository is.
+
+Can you share that information, or at least the parts of it that are not
+regular alphabet characters?
+
+(There's also an outside possibility it could have found a control
+character in the ssh public key, but I don't see how.)
+"""]]
diff --git a/doc/forum/_preferred_content:_lastpresent.mdwn b/doc/forum/_preferred_content__58___lastpresent.mdwn
index e8730eb00..e8730eb00 100644
--- a/doc/forum/_preferred_content:_lastpresent.mdwn
+++ b/doc/forum/_preferred_content__58___lastpresent.mdwn
diff --git a/doc/forum/_preferred_content:_lastpresent/comment_1_7610cd866b256d36646b642eb5f8cae5._comment b/doc/forum/_preferred_content__58___lastpresent/comment_1_7610cd866b256d36646b642eb5f8cae5._comment
index d5910c6d0..d5910c6d0 100644
--- a/doc/forum/_preferred_content:_lastpresent/comment_1_7610cd866b256d36646b642eb5f8cae5._comment
+++ b/doc/forum/_preferred_content__58___lastpresent/comment_1_7610cd866b256d36646b642eb5f8cae5._comment
diff --git a/doc/forum/_preferred_content:_lastpresent/comment_2_d25666a173b78213d583f029fd166d06._comment b/doc/forum/_preferred_content__58___lastpresent/comment_2_d25666a173b78213d583f029fd166d06._comment
index 4714034c3..4714034c3 100644
--- a/doc/forum/_preferred_content:_lastpresent/comment_2_d25666a173b78213d583f029fd166d06._comment
+++ b/doc/forum/_preferred_content__58___lastpresent/comment_2_d25666a173b78213d583f029fd166d06._comment
diff --git a/doc/forum/annex.largefiles:_two_quesitons.mdwn b/doc/forum/annex.largefiles__58___two_quesitons.mdwn
index 170aad7e6..170aad7e6 100644
--- a/doc/forum/annex.largefiles:_two_quesitons.mdwn
+++ b/doc/forum/annex.largefiles__58___two_quesitons.mdwn
diff --git a/doc/forum/annex.largefiles:_two_quesitons/comment_1_75fc6cd2315e9ad6897b94bcc527ddc1._comment b/doc/forum/annex.largefiles__58___two_quesitons/comment_1_75fc6cd2315e9ad6897b94bcc527ddc1._comment
index 2be567c39..2be567c39 100644
--- a/doc/forum/annex.largefiles:_two_quesitons/comment_1_75fc6cd2315e9ad6897b94bcc527ddc1._comment
+++ b/doc/forum/annex.largefiles__58___two_quesitons/comment_1_75fc6cd2315e9ad6897b94bcc527ddc1._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__.mdwn b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__.mdwn
index c18dfb6ca..c18dfb6ca 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__.mdwn
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__.mdwn
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_1_70200f871b9df49261f32752a6bb0e67._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_1_70200f871b9df49261f32752a6bb0e67._comment
index 9d457a9d2..9d457a9d2 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_1_70200f871b9df49261f32752a6bb0e67._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_1_70200f871b9df49261f32752a6bb0e67._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment
index dbf2178f5..dbf2178f5 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_3_1ecea12a4be5ad09013cddb62df6ab20._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_3_1ecea12a4be5ad09013cddb62df6ab20._comment
index aaf373589..aaf373589 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_3_1ecea12a4be5ad09013cddb62df6ab20._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_3_1ecea12a4be5ad09013cddb62df6ab20._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_4_af4bc222d1479482bd83952353c97f05._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_4_af4bc222d1479482bd83952353c97f05._comment
index 7b7b86c30..7b7b86c30 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_4_af4bc222d1479482bd83952353c97f05._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_4_af4bc222d1479482bd83952353c97f05._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_5_c1d247fa128c0a0fc899284f5f95002c._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_5_c1d247fa128c0a0fc899284f5f95002c._comment
index 474bd6673..474bd6673 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_5_c1d247fa128c0a0fc899284f5f95002c._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_5_c1d247fa128c0a0fc899284f5f95002c._comment
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_6_cf877a3502802492cd2bc3012cb2d779._comment b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_6_cf877a3502802492cd2bc3012cb2d779._comment
index 3765a67cc..3765a67cc 100644
--- a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_6_cf877a3502802492cd2bc3012cb2d779._comment
+++ b/doc/forum/assistant_created_encrypted__backup_remote__58___Howto_restore__63__/comment_6_cf877a3502802492cd2bc3012cb2d779._comment
diff --git a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn b/doc/forum/assitant__58___special_remote_server___40__needs_ssh_tunnel__41__.mdwn
index 45c43f443..45c43f443 100644
--- a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__.mdwn
+++ b/doc/forum/assitant__58___special_remote_server___40__needs_ssh_tunnel__41__.mdwn
diff --git a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment b/doc/forum/assitant__58___special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment
index b3e495dc2..b3e495dc2 100644
--- a/doc/forum/assitant:_special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment
+++ b/doc/forum/assitant__58___special_remote_server___40__needs_ssh_tunnel__41__/comment_1_817a3ed424e4fb76fcd33295f2953250._comment
diff --git a/doc/forum/bainstorming:_git_annex_push___38___pull.mdwn b/doc/forum/bainstorming__58___git_annex_push___38___pull.mdwn
index 8a6c552b8..8a6c552b8 100644
--- a/doc/forum/bainstorming:_git_annex_push___38___pull.mdwn
+++ b/doc/forum/bainstorming__58___git_annex_push___38___pull.mdwn
diff --git a/doc/forum/bainstorming:_git_annex_push___38___pull/comment_1_3a0bf74b51586354b7a91f8b43472376._comment b/doc/forum/bainstorming__58___git_annex_push___38___pull/comment_1_3a0bf74b51586354b7a91f8b43472376._comment
index 3d69e8f29..3d69e8f29 100644
--- a/doc/forum/bainstorming:_git_annex_push___38___pull/comment_1_3a0bf74b51586354b7a91f8b43472376._comment
+++ b/doc/forum/bainstorming__58___git_annex_push___38___pull/comment_1_3a0bf74b51586354b7a91f8b43472376._comment
diff --git a/doc/forum/bainstorming:_git_annex_push___38___pull/comment_2_b02ca09914e788393c01196686f95831._comment b/doc/forum/bainstorming__58___git_annex_push___38___pull/comment_2_b02ca09914e788393c01196686f95831._comment
index e0ecc1a81..e0ecc1a81 100644
--- a/doc/forum/bainstorming:_git_annex_push___38___pull/comment_2_b02ca09914e788393c01196686f95831._comment
+++ b/doc/forum/bainstorming__58___git_annex_push___38___pull/comment_2_b02ca09914e788393c01196686f95831._comment
diff --git a/doc/forum/comprehension_question:_repository_vs._working_copy_in_direct_mode.mdwn b/doc/forum/comprehension_question__58___repository_vs._working_copy_in_direct_mode.mdwn
index 350bcd7bd..350bcd7bd 100644
--- a/doc/forum/comprehension_question:_repository_vs._working_copy_in_direct_mode.mdwn
+++ b/doc/forum/comprehension_question__58___repository_vs._working_copy_in_direct_mode.mdwn
diff --git a/doc/forum/comprehension_question:_repository_vs._working_copy_in_direct_mode/comment_1_a6b4db0cefa439f72b97089d48dfacbd._comment b/doc/forum/comprehension_question__58___repository_vs._working_copy_in_direct_mode/comment_1_a6b4db0cefa439f72b97089d48dfacbd._comment
index 327c05705..327c05705 100644
--- a/doc/forum/comprehension_question:_repository_vs._working_copy_in_direct_mode/comment_1_a6b4db0cefa439f72b97089d48dfacbd._comment
+++ b/doc/forum/comprehension_question__58___repository_vs._working_copy_in_direct_mode/comment_1_a6b4db0cefa439f72b97089d48dfacbd._comment
diff --git a/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo.mdwn b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo.mdwn
new file mode 100644
index 000000000..40735383a
--- /dev/null
+++ b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo.mdwn
@@ -0,0 +1,34 @@
+Hi,
+I'm trying to convert a v5 classic, symlink repository into a v6 always unloked repository.
+
+
+I'm trying to follow along with: <http://git-annex.branchable.com/tips/unlocked_files>
+but something goes wrong in the process, so I'm sure I'm missing something.
+The repository is about 600G to start with on a ext4 filesystem, and I don't have another 600G of free space on disk, so I'm going with thin mode:
+
+1.       git annex upgrade 
+2.       git config annex.thin true 
+3.       git annex fix 
+4.       git annex unlock
+
+It's all good to this point. Everything gets unlocked and is fine. 
+Then I try to commit the changes with:
+
+     git annex sync
+
+The process seems to take 
+and incredibly long time (several hours) and then ends up running out of space. I check the repository with "du -sh"
+and it's almost double the size. Is there a reason for this? Is there a way to avoid this duplication of data. Shouldn't annex.thin do the trick?
+
+This is also strange: with "git annex info" I get
+
+     local annex keys: 3572
+     local annex size: 933.19 gigabytes
+     annexed files in working tree: 0
+     size of annexed files in working tree: 0 bytes
+
+the annex size should be about 540G and why are there no annexed files in the working tree?
+
+Is there a correct and faster way to migrate my repo to an always unlocked one which won't require hours of time and take all that disk space?
+
+thanks a lot, daniel
diff --git a/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_1_e08eb54547bfd4dbfcc79a5a4a529647._comment b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_1_e08eb54547bfd4dbfcc79a5a4a529647._comment
new file mode 100644
index 000000000..362609f52
--- /dev/null
+++ b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_1_e08eb54547bfd4dbfcc79a5a4a529647._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T16:48:33Z"
+ content="""
+Thank you for trying v6 unlocked mode; do note that it's still somewhat
+experimental.
+
+`git annex info` doesn't report correctly on unlocked files, which is why
+it has 0 in two places in the output you showed. I have just committed a
+fix for that problem.
+
+I don't know what would cause the unexpectedly small "local annex size".
+That should correspond to `du -hsc .git/annex/objects`; if it does then you
+seem to have fewer annexed objects than you expect for some reason.
+
+The behavior on sync sounds kind of like git commit is checking the whole
+contents of files into git, bypassing the annex. I don't know how that
+could happen, barring a misconfiguration, but it's at least the first thing
+to check. Check for gigabytes of data in .git/objects/ to see if that
+is the case. 
+
+If the above isn't the problem, can you see if the files in the work tree
+have a link count of 2? For example:
+
+	$ ls -l
+	-rw-r--r--  2 joey joey     30 Mar 14 12:49 foo
+	            ^
+
+If you don't see link count of 2, something has caused the annex.thin not
+to take effect. One possibility would be if the `git annex sync` merged in
+changes that moved a lot of files around. When that happens, git checks out
+the updated work tree, and git-annex currently is not able to preserve
+annex.thin in that case.
+"""]]
diff --git a/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_2_85946916ac9c2a19c0d65e2b1a3e5832._comment b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_2_85946916ac9c2a19c0d65e2b1a3e5832._comment
new file mode 100644
index 000000000..4c8f1b238
--- /dev/null
+++ b/doc/forum/converting_a_v5_repo_to_an_always_unlocked_v6_repo/comment_2_85946916ac9c2a19c0d65e2b1a3e5832._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848"
+ nickname="susetux"
+ subject="re"
+ date="2016-03-15T14:14:47Z"
+ content="""
+Hi, thanks for your quick feedback!
+
+So, I've investigated a bit and this is what I found:
+
+1. hardlinks are there: both \"ls -l\" and \"find -samefile\" report that most files (I haven't checked all of them though) are hardlinked, as expected, in the annex. So annex.thin is doing something.
+2. \"du -shc .git/annex/objects\" has the same size of the same command given on the whole annex, as expected  (du counts hard links only once, so it makes sense). It gives about 933G.
+3. 900G is well above what it should be: 530G of the indirect annex.
+4. This size is also reported in git annex info: \"local annex size: 933.19 gigabytes\"
+5. I tried locking the files again (and git annex fix), but the annex remained oversized.
+
+I currently deleted the annex and restored from a backup because I couldn't afford to keep it in an inconsistent state.
+It seems like this problem can be consistently reproduced. I had the same problem on a smaller annex (200G) which took a long time to commit and also inflated during the process. At the end of the process (it had enough space to finish) the size shrinked again, although it was still bigger than the original. I also tried with a test annex and random data a the problem seemed to still be there.
+
+
+"""]]
diff --git a/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__.mdwn b/doc/forum/error__58___refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__.mdwn
index a39951bb5..a39951bb5 100644
--- a/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__.mdwn
+++ b/doc/forum/error__58___refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__.mdwn
diff --git a/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment b/doc/forum/error__58___refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment
index cf7601d40..cf7601d40 100644
--- a/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment
+++ b/doc/forum/error__58___refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment
diff --git a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__.mdwn b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__.mdwn
index 633ff6f9b..633ff6f9b 100644
--- a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__.mdwn
+++ b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__.mdwn
diff --git a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_1_990197bf01351dc1ccbe1940d5084adb._comment b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_1_990197bf01351dc1ccbe1940d5084adb._comment
index 7164de760..7164de760 100644
--- a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_1_990197bf01351dc1ccbe1940d5084adb._comment
+++ b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_1_990197bf01351dc1ccbe1940d5084adb._comment
diff --git a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_2_3bb1d21b7f0d0bd6d59190ae9d246d46._comment b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_2_3bb1d21b7f0d0bd6d59190ae9d246d46._comment
index 2fa6cc01a..2fa6cc01a 100644
--- a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_2_3bb1d21b7f0d0bd6d59190ae9d246d46._comment
+++ b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_2_3bb1d21b7f0d0bd6d59190ae9d246d46._comment
diff --git a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_3_692f268218690437138ae0540c879425._comment b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_3_692f268218690437138ae0540c879425._comment
index d5c84b431..d5c84b431 100644
--- a/doc/forum/fail_to_git_annex_add_some_files:_getFileStatus:_does_not_exist__40__v_3.20111231__41__/comment_3_692f268218690437138ae0540c879425._comment
+++ b/doc/forum/fail_to_git_annex_add_some_files__58___getFileStatus__58___does_not_exist__40__v_3.20111231__41__/comment_3_692f268218690437138ae0540c879425._comment
diff --git a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory.mdwn b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory.mdwn
index ee0b49eb6..ee0b49eb6 100644
--- a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory.mdwn
+++ b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory.mdwn
diff --git a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_d98a155fa01d10ecff9058d79290156d._comment b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_1_d98a155fa01d10ecff9058d79290156d._comment
index 989ab1a6a..989ab1a6a 100644
--- a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_1_d98a155fa01d10ecff9058d79290156d._comment
+++ b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_1_d98a155fa01d10ecff9058d79290156d._comment
diff --git a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_2_3b9ea7a1254ac5b50a5ab59cd331ec3f._comment b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_2_3b9ea7a1254ac5b50a5ab59cd331ec3f._comment
index 2a575e059..2a575e059 100644
--- a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_2_3b9ea7a1254ac5b50a5ab59cd331ec3f._comment
+++ b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_2_3b9ea7a1254ac5b50a5ab59cd331ec3f._comment
diff --git a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_3_5ee300034819c5825c676cd7e3af659f._comment b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_3_5ee300034819c5825c676cd7e3af659f._comment
index 55345537e..55345537e 100644
--- a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_3_5ee300034819c5825c676cd7e3af659f._comment
+++ b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_3_5ee300034819c5825c676cd7e3af659f._comment
diff --git a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_4_cf7f5c91d3c15f72d2a714b7362c1197._comment b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_4_cf7f5c91d3c15f72d2a714b7362c1197._comment
index 4b250a3e2..4b250a3e2 100644
--- a/doc/forum/fatal:_Out_of_memory__63___mmap_failed:_No_such_file_or_directory/comment_4_cf7f5c91d3c15f72d2a714b7362c1197._comment
+++ b/doc/forum/fatal__58___Out_of_memory__63___mmap_failed__58___No_such_file_or_directory/comment_4_cf7f5c91d3c15f72d2a714b7362c1197._comment
diff --git a/doc/forum/git-annex:_map:_1_failed.mdwn b/doc/forum/git-annex__58___map__58___1_failed.mdwn
index 10be60ca5..10be60ca5 100644
--- a/doc/forum/git-annex:_map:_1_failed.mdwn
+++ b/doc/forum/git-annex__58___map__58___1_failed.mdwn
diff --git a/doc/forum/git-annex:_map:_1_failed/comment_1_35ff3256e823ab8cfc53276a2123ad5f._comment b/doc/forum/git-annex__58___map__58___1_failed/comment_1_35ff3256e823ab8cfc53276a2123ad5f._comment
index d1beb5909..d1beb5909 100644
--- a/doc/forum/git-annex:_map:_1_failed/comment_1_35ff3256e823ab8cfc53276a2123ad5f._comment
+++ b/doc/forum/git-annex__58___map__58___1_failed/comment_1_35ff3256e823ab8cfc53276a2123ad5f._comment
diff --git a/doc/forum/git-annex:_map:_1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment b/doc/forum/git-annex__58___map__58___1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment
index b8841dd36..b8841dd36 100644
--- a/doc/forum/git-annex:_map:_1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment
+++ b/doc/forum/git-annex__58___map__58___1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment
diff --git a/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes.mdwn b/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes.mdwn
new file mode 100644
index 000000000..75ba03dd3
--- /dev/null
+++ b/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes.mdwn
@@ -0,0 +1 @@
+I'm using git-annex (git-annex-6.20160126 from homebrew) on osx and for a while now, it claims that it tries to repair my annex-dir on my osx machine, even though it never finishes (or fails) to do so. I'm not sure what's causing this and I also tried to use `git annex repair`, but this didn't help either (it ran forever but never finishes). I tried to run `git annex fsck` and saw that some larger video files were only in one other place and therefore couldn't be droped, which I think I fixed by doing `git annex add` then `git annex sync` and finally `git annex copy --auto -to $Remote`. I'm not sure how to proceed, the log file doesn't seem to tell me a whole lot either. It just tells me for some of my files "Unable to lock down 1 copy of file that is required to safely drop it." and tries to repair that stuff over and over and over… or at least that's what I guess happens.
diff --git a/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes/comment_1_a12892b2881969ddd6faa92d860e1bc8._comment b/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes/comment_1_a12892b2881969ddd6faa92d860e1bc8._comment
new file mode 100644
index 000000000..92a3f70b7
--- /dev/null
+++ b/doc/forum/git-annex_assistant_atempts_to_repair__44___but_never_finishes/comment_1_a12892b2881969ddd6faa92d860e1bc8._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 1"
+ date="2016-03-19T17:08:19Z"
+ content="""
+I added an old external hdd to my setup and now it seems to be working again. I assume, that a lot of my remotes stoped working, or only working sometimes. I guess I have to use `testremote` and go from there…
+"""]]
diff --git a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing.mdwn b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing.mdwn
index ac6560e49..ac6560e49 100644
--- a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing.mdwn
+++ b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing.mdwn
diff --git a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing/comment_1_8a2e3be32800b7b8a6fa78bbdcba7608._comment b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing/comment_1_8a2e3be32800b7b8a6fa78bbdcba7608._comment
index b856d79fd..b856d79fd 100644
--- a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing/comment_1_8a2e3be32800b7b8a6fa78bbdcba7608._comment
+++ b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing/comment_1_8a2e3be32800b7b8a6fa78bbdcba7608._comment
diff --git a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing/comment_2_451b3c89d1b98212d5c21efa4e535424._comment b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing/comment_2_451b3c89d1b98212d5c21efa4e535424._comment
index 9d09e096d..9d09e096d 100644
--- a/doc/forum/git:___39__annex__39___is_not_a_git_command_error_after_installing/comment_2_451b3c89d1b98212d5c21efa4e535424._comment
+++ b/doc/forum/git__58_____39__annex__39___is_not_a_git_command_error_after_installing/comment_2_451b3c89d1b98212d5c21efa4e535424._comment
diff --git a/doc/forum/git_annex_info:_local_annex_keys__63__.mdwn b/doc/forum/git_annex_info__58___local_annex_keys__63__.mdwn
index e1a79f038..e1a79f038 100644
--- a/doc/forum/git_annex_info:_local_annex_keys__63__.mdwn
+++ b/doc/forum/git_annex_info__58___local_annex_keys__63__.mdwn
diff --git a/doc/forum/git_annex_sync:_only_git-annex.mdwn b/doc/forum/git_annex_sync__58___only_git-annex.mdwn
index 84ae140cd..84ae140cd 100644
--- a/doc/forum/git_annex_sync:_only_git-annex.mdwn
+++ b/doc/forum/git_annex_sync__58___only_git-annex.mdwn
diff --git a/doc/forum/git_annex_sync:_only_git-annex/comment_1_2be68ed36a1e6bfc896d5aea9463d3c7._comment b/doc/forum/git_annex_sync__58___only_git-annex/comment_1_2be68ed36a1e6bfc896d5aea9463d3c7._comment
index bf90184aa..bf90184aa 100644
--- a/doc/forum/git_annex_sync:_only_git-annex/comment_1_2be68ed36a1e6bfc896d5aea9463d3c7._comment
+++ b/doc/forum/git_annex_sync__58___only_git-annex/comment_1_2be68ed36a1e6bfc896d5aea9463d3c7._comment
diff --git a/doc/forum/git_annex_sync:_only_git-annex/comment_2_50e137e4d278dfd0103a41aff0cfa3a9._comment b/doc/forum/git_annex_sync__58___only_git-annex/comment_2_50e137e4d278dfd0103a41aff0cfa3a9._comment
index 10f3792b3..10f3792b3 100644
--- a/doc/forum/git_annex_sync:_only_git-annex/comment_2_50e137e4d278dfd0103a41aff0cfa3a9._comment
+++ b/doc/forum/git_annex_sync__58___only_git-annex/comment_2_50e137e4d278dfd0103a41aff0cfa3a9._comment
diff --git a/doc/forum/git_annex_sync:_only_git-annex/comment_3_7753f8276478e0e05c10dba2b84bbc49._comment b/doc/forum/git_annex_sync__58___only_git-annex/comment_3_7753f8276478e0e05c10dba2b84bbc49._comment
index 49a61c0b7..49a61c0b7 100644
--- a/doc/forum/git_annex_sync:_only_git-annex/comment_3_7753f8276478e0e05c10dba2b84bbc49._comment
+++ b/doc/forum/git_annex_sync__58___only_git-annex/comment_3_7753f8276478e0e05c10dba2b84bbc49._comment
diff --git a/doc/forum/git_annex_sync:_only_git-annex/comment_5_52010f21a15d76d68986aa1fba29aaf1._comment b/doc/forum/git_annex_sync__58___only_git-annex/comment_5_52010f21a15d76d68986aa1fba29aaf1._comment
index cee2a9bd2..cee2a9bd2 100644
--- a/doc/forum/git_annex_sync:_only_git-annex/comment_5_52010f21a15d76d68986aa1fba29aaf1._comment
+++ b/doc/forum/git_annex_sync__58___only_git-annex/comment_5_52010f21a15d76d68986aa1fba29aaf1._comment
diff --git a/doc/forum/git_annex_sync:_only_git-annex/comment_6_df94154fbbc4edbf7ff658f61bde48b5._comment b/doc/forum/git_annex_sync__58___only_git-annex/comment_6_df94154fbbc4edbf7ff658f61bde48b5._comment
index 8772255eb..8772255eb 100644
--- a/doc/forum/git_annex_sync:_only_git-annex/comment_6_df94154fbbc4edbf7ff658f61bde48b5._comment
+++ b/doc/forum/git_annex_sync__58___only_git-annex/comment_6_df94154fbbc4edbf7ff658f61bde48b5._comment
diff --git a/doc/forum/importfeed:_comments_in_file_with_feed_urls.mdwn b/doc/forum/importfeed__58___comments_in_file_with_feed_urls.mdwn
index 0f2ab9731..0f2ab9731 100644
--- a/doc/forum/importfeed:_comments_in_file_with_feed_urls.mdwn
+++ b/doc/forum/importfeed__58___comments_in_file_with_feed_urls.mdwn
diff --git a/doc/forum/importfeed:_comments_in_file_with_feed_urls/comment_1_370f5165fdda5c01a5335c864321a348._comment b/doc/forum/importfeed__58___comments_in_file_with_feed_urls/comment_1_370f5165fdda5c01a5335c864321a348._comment
index c4e243766..c4e243766 100644
--- a/doc/forum/importfeed:_comments_in_file_with_feed_urls/comment_1_370f5165fdda5c01a5335c864321a348._comment
+++ b/doc/forum/importfeed__58___comments_in_file_with_feed_urls/comment_1_370f5165fdda5c01a5335c864321a348._comment
diff --git a/doc/forum/lost_in_walkthrough....mdwn b/doc/forum/lost_in_walkthrough.mdwn
index 89f4af026..89f4af026 100644
--- a/doc/forum/lost_in_walkthrough....mdwn
+++ b/doc/forum/lost_in_walkthrough.mdwn
diff --git a/doc/forum/lost_in_walkthrough.../comment_1_51b703b961ca762f0359e1c169f1ee75._comment b/doc/forum/lost_in_walkthrough/comment_1_51b703b961ca762f0359e1c169f1ee75._comment
index a5c574b4a..a5c574b4a 100644
--- a/doc/forum/lost_in_walkthrough.../comment_1_51b703b961ca762f0359e1c169f1ee75._comment
+++ b/doc/forum/lost_in_walkthrough/comment_1_51b703b961ca762f0359e1c169f1ee75._comment
diff --git a/doc/forum/lost_in_walkthrough.../comment_2_a9de0401a103bdd4401ba2d5983dc54a._comment b/doc/forum/lost_in_walkthrough/comment_2_a9de0401a103bdd4401ba2d5983dc54a._comment
index 4a8110eb4..4a8110eb4 100644
--- a/doc/forum/lost_in_walkthrough.../comment_2_a9de0401a103bdd4401ba2d5983dc54a._comment
+++ b/doc/forum/lost_in_walkthrough/comment_2_a9de0401a103bdd4401ba2d5983dc54a._comment
diff --git a/doc/tips/messed_up_annex_by_using_git_checkout.mdwn b/doc/forum/messed_up_annex_by_using_git_checkout.mdwn
index f9b2eb63c..f9b2eb63c 100644
--- a/doc/tips/messed_up_annex_by_using_git_checkout.mdwn
+++ b/doc/forum/messed_up_annex_by_using_git_checkout.mdwn
diff --git a/doc/forum/messed_up_annex_by_using_git_checkout/comment_1_04f33895f6451690372595c576be2811._comment b/doc/forum/messed_up_annex_by_using_git_checkout/comment_1_04f33895f6451690372595c576be2811._comment
new file mode 100644
index 000000000..cd480bc15
--- /dev/null
+++ b/doc/forum/messed_up_annex_by_using_git_checkout/comment_1_04f33895f6451690372595c576be2811._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-14T17:27:17Z"
+ content="""
+You don't seem to really say what the problem is, but I guess it has
+something to do with this `old_state4` branch which you have made.
+
+Maybe check what `git branch` shows to see if that branch is checked out,
+and if so, `git checkout master` to get back to the master branch.
+"""]]
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk.mdwn b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk.mdwn
index f70c12702..f70c12702 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk.mdwn
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk.mdwn
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_1_b3f22f9be02bc4f2d5a121db3d753ff5._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_1_b3f22f9be02bc4f2d5a121db3d753ff5._comment
index 124993bcf..124993bcf 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_1_b3f22f9be02bc4f2d5a121db3d753ff5._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_1_b3f22f9be02bc4f2d5a121db3d753ff5._comment
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_2_f94abce32ef818176b42a3cc860691ae._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_2_f94abce32ef818176b42a3cc860691ae._comment
index eddc8c631..eddc8c631 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_2_f94abce32ef818176b42a3cc860691ae._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_2_f94abce32ef818176b42a3cc860691ae._comment
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_3_0c8e77fe248e00bd990d568623e5a5c9._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_3_0c8e77fe248e00bd990d568623e5a5c9._comment
index fc29236c6..fc29236c6 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_3_0c8e77fe248e00bd990d568623e5a5c9._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_3_0c8e77fe248e00bd990d568623e5a5c9._comment
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_4_4b7e8f9521d61900d9ad418e74808ffb._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_4_4b7e8f9521d61900d9ad418e74808ffb._comment
index ec0f88d13..ec0f88d13 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_4_4b7e8f9521d61900d9ad418e74808ffb._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_4_4b7e8f9521d61900d9ad418e74808ffb._comment
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_5_7abbbe7db3988a2d239d11b0a4c597e7._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_5_7abbbe7db3988a2d239d11b0a4c597e7._comment
index 651fc8144..651fc8144 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_5_7abbbe7db3988a2d239d11b0a4c597e7._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_5_7abbbe7db3988a2d239d11b0a4c597e7._comment
diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment
index 0c0e3e495..0c0e3e495 100644
--- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment
+++ b/doc/forum/performance_improvement__58___git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment
diff --git a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__.mdwn b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__.mdwn
index 2a22d6ee7..2a22d6ee7 100644
--- a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__.mdwn
+++ b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__.mdwn
diff --git a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_1_7754e2cfb72b034effe8642c1b3e593e._comment b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_1_7754e2cfb72b034effe8642c1b3e593e._comment
index d29f6482c..d29f6482c 100644
--- a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_1_7754e2cfb72b034effe8642c1b3e593e._comment
+++ b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_1_7754e2cfb72b034effe8642c1b3e593e._comment
diff --git a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_2_04e1da4352ef9f9be90253ea726e5f24._comment b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_2_04e1da4352ef9f9be90253ea726e5f24._comment
index 3181c4fe0..3181c4fe0 100644
--- a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_2_04e1da4352ef9f9be90253ea726e5f24._comment
+++ b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_2_04e1da4352ef9f9be90253ea726e5f24._comment
diff --git a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_3_84aceb9a9d3e5bd14c044861f47e3b9d._comment b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_3_84aceb9a9d3e5bd14c044861f47e3b9d._comment
index ef70eea48..ef70eea48 100644
--- a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_3_84aceb9a9d3e5bd14c044861f47e3b9d._comment
+++ b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_3_84aceb9a9d3e5bd14c044861f47e3b9d._comment
diff --git a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_4_2cd17d01edeb230197865e6ea0884de0._comment b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_4_2cd17d01edeb230197865e6ea0884de0._comment
index bfb4c2d74..bfb4c2d74 100644
--- a/doc/forum/rsync.net:_Too_many_authentication_failures_for___42____42____42____42____42__/comment_4_2cd17d01edeb230197865e6ea0884de0._comment
+++ b/doc/forum/rsync.net__58___Too_many_authentication_failures_for___42____42____42____42____42__/comment_4_2cd17d01edeb230197865e6ea0884de0._comment
diff --git a/doc/forum/rsync_protocol_mismatch_due_to_encfs_folder.mdwn b/doc/forum/rsync_protocol_mismatch_due_to_encfs_folder.mdwn
new file mode 100644
index 000000000..c3667a2b6
--- /dev/null
+++ b/doc/forum/rsync_protocol_mismatch_due_to_encfs_folder.mdwn
@@ -0,0 +1,24 @@
+One of my repositories worked just fine for months, until I have decided to put an encfs folder within it. Encfs is encrypting folders and files, resulting in weird file and folder names. However, rsync just seems to fail.
+
+
+This has already been a topic here a few times, for example [1] and [2].
+
+Unfortunately, I have not been lucky enough to recover the situation by the hints given.
+
+
+What I did to investigate is that I have re-run one of the shell commands stuck client-side and appended --debug to gain a deeper look. This is the output:
+
+    $ /opt/git-annex/2016-01-14/exe/ssh --library-path /opt/git-annex/2016-01-14//etc/ld.so.conf.d:/opt/git-annex/2016-01-14//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex/2016-01-14//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex/2016-01-14//usr/lib:/opt/git-annex/2016-01-14//usr/lib/x86_64-linux-gnu:/opt/git-annex/2016-01-14//lib64:/opt/git-annex/2016-01-14//lib/x86_64-linux-gnu: /opt/git-annex/2016-01-14/shimmed/ssh/ssh -S .git/annex/ssh/user@10.0.0.1 -o ControlMaster=auto -o ControlPersist=yes -T user@10.0.0.1 git-annex-shell 'recvkey' '/mnt/path/to/share/' 'SHA256E-s262670--e004c6e3f87ad2b5d74d206de85de5449c9f263d83e6ef1c87ffb03be8b7e725' --debug --uuid e34522e4-1dab-459c-b295-1fe41e7692e4 '--' 'remoteuuid=07820aec-e2a3-4c60-bd57-b39b7213e056' 'unlocked=1' 'direct=1' 'associatedfile=.encfs_folder/CMG23xCwkemocE-Gq9WHpO-n/1vqfTkJChNm5CgjBsZ--,9r,ZOcSBTxE-Ogz5ytA8R23st52LWf4d9MjRref56VhbEB/4ezakoEn8dqOT8s,K4X,ueSs' '--' dummy rsync --server -pe.Lsfx --log-format=X --inplace . .
+    [2016-03-16 22:52:18.922914] transfer start
+    [2016-03-16 22:52:18.949417] call: rsync ["--server","-t","--inplace","-e.Lsf",".","../../mnt/path/to/share/.git/annex/tmp/SHA256E-s262670--e004c6e3f87ad2b5d74d206de85de5449c9f263d83e6ef1c87ffb03be8b7e725"]
+    protocol version mismatch -- is your shell clean?
+    (see the rsync man page for an explanation)
+    rsync error: protocol incompatibility (code 2) at compat.c(176) [Receiver=3.1.1]
+    [2016-03-16 22:59:05.890987] process done ExitFailure 2
+    [2016-03-16 22:59:05.899506] transfer done
+
+What can I do other than to just move the encfs outside my repository, which is of course the least favorable option for me to do?
+
+[1] <http://git-annex.branchable.com/bugs/protocol_mismatch_after_interrupt/>
+
+[2] <http://git-annex.branchable.com/bugs/rsync__58___protocol_version_mismatch/>
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer.mdwn
index f40b08324..f40b08324 100644
--- a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn
+++ b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer.mdwn
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_1_87b9540e37abb16c0ec7605f5ab204a5._comment b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_1_87b9540e37abb16c0ec7605f5ab204a5._comment
index b44c0c3b5..b44c0c3b5 100644
--- a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_1_87b9540e37abb16c0ec7605f5ab204a5._comment
+++ b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_1_87b9540e37abb16c0ec7605f5ab204a5._comment
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment
index 719b66eb7..719b66eb7 100644
--- a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment
+++ b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_2_bd3383c142bf93d9cd496cb668d7782c._comment
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_3_9b1911ae6468d09dae74ab1a60d2757b._comment b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_3_9b1911ae6468d09dae74ab1a60d2757b._comment
index 59f0f9f96..59f0f9f96 100644
--- a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer/comment_3_9b1911ae6468d09dae74ab1a60d2757b._comment
+++ b/doc/forum/ssh__95__exchange__95__identification__58___read__58___Connection_reset_by_peer/comment_3_9b1911ae6468d09dae74ab1a60d2757b._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs.mdwn b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs.mdwn
index 8981200d8..8981200d8 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs.mdwn
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs.mdwn
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_1_76bb33ce45ce6a91b86454147463193b._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_1_76bb33ce45ce6a91b86454147463193b._comment
index 388641f69..388641f69 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_1_76bb33ce45ce6a91b86454147463193b._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_1_76bb33ce45ce6a91b86454147463193b._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_2_4d9b9d47d01d606a475678f630797bf9._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_2_4d9b9d47d01d606a475678f630797bf9._comment
index e7c3d619d..e7c3d619d 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_2_4d9b9d47d01d606a475678f630797bf9._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_2_4d9b9d47d01d606a475678f630797bf9._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_3_8a812b11fcc2dc3b6fcf01cdbbb8459d._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_3_8a812b11fcc2dc3b6fcf01cdbbb8459d._comment
index 16ad9e988..16ad9e988 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_3_8a812b11fcc2dc3b6fcf01cdbbb8459d._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_3_8a812b11fcc2dc3b6fcf01cdbbb8459d._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_4_fc98c819bc5eb4d7c9e74d87fb4f6f3b._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_4_fc98c819bc5eb4d7c9e74d87fb4f6f3b._comment
index 5d271c6f3..5d271c6f3 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_4_fc98c819bc5eb4d7c9e74d87fb4f6f3b._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_4_fc98c819bc5eb4d7c9e74d87fb4f6f3b._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_5_c459fb479fe7b13eaea2377cfc1923a6._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_5_c459fb479fe7b13eaea2377cfc1923a6._comment
index 9127cdeea..9127cdeea 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_5_c459fb479fe7b13eaea2377cfc1923a6._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_5_c459fb479fe7b13eaea2377cfc1923a6._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_6_2e9da5a919bbbc27b32de3b243867d4f._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_6_2e9da5a919bbbc27b32de3b243867d4f._comment
index 80874db31..80874db31 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_6_2e9da5a919bbbc27b32de3b243867d4f._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_6_2e9da5a919bbbc27b32de3b243867d4f._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_7_d636c868524b2055ee85832527437f90._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_7_d636c868524b2055ee85832527437f90._comment
index 1d75fb963..1d75fb963 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_7_d636c868524b2055ee85832527437f90._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_7_d636c868524b2055ee85832527437f90._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_8_39dc449cc60a787c3bfbfaaac6f9be0c._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_8_39dc449cc60a787c3bfbfaaac6f9be0c._comment
index dc97128bd..dc97128bd 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_8_39dc449cc60a787c3bfbfaaac6f9be0c._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_8_39dc449cc60a787c3bfbfaaac6f9be0c._comment
diff --git a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_9_2592749c2f02b3e151896e31acba359b._comment b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_9_2592749c2f02b3e151896e31acba359b._comment
index ba58643b9..ba58643b9 100644
--- a/doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs/comment_9_2592749c2f02b3e151896e31acba359b._comment
+++ b/doc/forum/tips__58___special__95__remotes__47__hook_with_tahoe-lafs/comment_9_2592749c2f02b3e151896e31acba359b._comment
diff --git a/doc/forum/trusted_repositories:_fatal:_not_a_git_repo.mdwn b/doc/forum/trusted_repositories__58___fatal__58___not_a_git_repo.mdwn
index f94bd3804..f94bd3804 100644
--- a/doc/forum/trusted_repositories:_fatal:_not_a_git_repo.mdwn
+++ b/doc/forum/trusted_repositories__58___fatal__58___not_a_git_repo.mdwn
diff --git a/doc/forum/trusted_repositories:_fatal:_not_a_git_repo/comment_1_0a755a4a281c3bd130722093c8ddd080._comment b/doc/forum/trusted_repositories__58___fatal__58___not_a_git_repo/comment_1_0a755a4a281c3bd130722093c8ddd080._comment
index 133a80e14..133a80e14 100644
--- a/doc/forum/trusted_repositories:_fatal:_not_a_git_repo/comment_1_0a755a4a281c3bd130722093c8ddd080._comment
+++ b/doc/forum/trusted_repositories__58___fatal__58___not_a_git_repo/comment_1_0a755a4a281c3bd130722093c8ddd080._comment
diff --git a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive.mdwn b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive.mdwn
index a6bc0b7bd..a6bc0b7bd 100644
--- a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive.mdwn
+++ b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive.mdwn
diff --git a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_1_27b5283c65c402f330263426e4ca6ac1._comment b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_1_27b5283c65c402f330263426e4ca6ac1._comment
index 1b5508f97..1b5508f97 100644
--- a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_1_27b5283c65c402f330263426e4ca6ac1._comment
+++ b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_1_27b5283c65c402f330263426e4ca6ac1._comment
diff --git a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_2_b3a6b5ff0aaddd78903fc7bc7fbd6ee2._comment b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_2_b3a6b5ff0aaddd78903fc7bc7fbd6ee2._comment
index e264c8f08..e264c8f08 100644
--- a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_2_b3a6b5ff0aaddd78903fc7bc7fbd6ee2._comment
+++ b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_2_b3a6b5ff0aaddd78903fc7bc7fbd6ee2._comment
diff --git a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_3_aab934c0e37771d7f834d2567a9e76a1._comment b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_3_aab934c0e37771d7f834d2567a9e76a1._comment
index 50d97fa26..50d97fa26 100644
--- a/doc/forum/usability:_creating_an_archive_on_a_new_external_drive/comment_3_aab934c0e37771d7f834d2567a9e76a1._comment
+++ b/doc/forum/usability__58___creating_an_archive_on_a_new_external_drive/comment_3_aab934c0e37771d7f834d2567a9e76a1._comment
diff --git a/doc/forum/usability:_what_are_those_arrow_things__63__.mdwn b/doc/forum/usability__58___what_are_those_arrow_things__63__.mdwn
index cde7d8d50..cde7d8d50 100644
--- a/doc/forum/usability:_what_are_those_arrow_things__63__.mdwn
+++ b/doc/forum/usability__58___what_are_those_arrow_things__63__.mdwn
diff --git a/doc/forum/usability:_what_are_those_arrow_things__63__/comment_1_bf34c169c725f9504e0f2114ba53be4b._comment b/doc/forum/usability__58___what_are_those_arrow_things__63__/comment_1_bf34c169c725f9504e0f2114ba53be4b._comment
index 86099c0d5..86099c0d5 100644
--- a/doc/forum/usability:_what_are_those_arrow_things__63__/comment_1_bf34c169c725f9504e0f2114ba53be4b._comment
+++ b/doc/forum/usability__58___what_are_those_arrow_things__63__/comment_1_bf34c169c725f9504e0f2114ba53be4b._comment
diff --git a/doc/forum/usability:_what_are_those_arrow_things__63__/comment_2_364ce8b369fd0ba7ddaec3127840ff39._comment b/doc/forum/usability__58___what_are_those_arrow_things__63__/comment_2_364ce8b369fd0ba7ddaec3127840ff39._comment
index 32ecdf0df..32ecdf0df 100644
--- a/doc/forum/usability:_what_are_those_arrow_things__63__/comment_2_364ce8b369fd0ba7ddaec3127840ff39._comment
+++ b/doc/forum/usability__58___what_are_those_arrow_things__63__/comment_2_364ce8b369fd0ba7ddaec3127840ff39._comment
diff --git a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__.mdwn b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__.mdwn
index 76f03452d..76f03452d 100644
--- a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__.mdwn
+++ b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__.mdwn
diff --git a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__/comment_1_955f3aac12c1ddb41267c5a23ccb79e3._comment b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__/comment_1_955f3aac12c1ddb41267c5a23ccb79e3._comment
index 069d41c10..069d41c10 100644
--- a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__/comment_1_955f3aac12c1ddb41267c5a23ccb79e3._comment
+++ b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__/comment_1_955f3aac12c1ddb41267c5a23ccb79e3._comment
diff --git a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__/comment_2_0aff36755f49afddd5482a602a1ccd2b._comment b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__/comment_2_0aff36755f49afddd5482a602a1ccd2b._comment
index 2ef754f16..2ef754f16 100644
--- a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__/comment_2_0aff36755f49afddd5482a602a1ccd2b._comment
+++ b/doc/forum/use_case__58___unique_indentifier_of_objets___40__doi_like__41__/comment_2_0aff36755f49afddd5482a602a1ccd2b._comment
diff --git a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout.mdwn b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout.mdwn
index f57e0ee83..f57e0ee83 100644
--- a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout.mdwn
+++ b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout.mdwn
diff --git a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_1_c0d9758be80d1a349ffe82c80075bebd._comment b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_1_c0d9758be80d1a349ffe82c80075bebd._comment
index 3601e2639..3601e2639 100644
--- a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_1_c0d9758be80d1a349ffe82c80075bebd._comment
+++ b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_1_c0d9758be80d1a349ffe82c80075bebd._comment
diff --git a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_2_c28dae2eb0ab825ee6d43735e04a18a3._comment b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_2_c28dae2eb0ab825ee6d43735e04a18a3._comment
index 97671a2c5..97671a2c5 100644
--- a/doc/forum/warning:_remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_2_c28dae2eb0ab825ee6d43735e04a18a3._comment
+++ b/doc/forum/warning__58___remote_HEAD_refers_to_nonexistent_ref__44___unable_to_checkout/comment_2_c28dae2eb0ab825ee6d43735e04a18a3._comment
diff --git a/doc/forum/web-browser_for_the_repository.mdwn b/doc/forum/web-browser_for_the_repository.mdwn
new file mode 100644
index 000000000..40a332b6e
--- /dev/null
+++ b/doc/forum/web-browser_for_the_repository.mdwn
@@ -0,0 +1,10 @@
+Hi!
+
+I am a teacher and I would like to organize my school-files with git-annex in combination with a wiki. In the wiki I would like to outline lessons with included pictures (and links) of work-sheets etc. git-annex would help me to transfer and organize all the files. 
+
+Now I'm searching for a web-browser for a git-annex-repository, like the source-browser of trac (or gitweb). Actually I would really like to use trac (or dokuwiki) for my school-project. I tried trac with a bare-annex-repos, but it only shows the hash-links. In the web-assistent of annex I couldn't find such a feature.
+
+
+Is there any web-browser for a git-annex-repository?
+
+-- Tobias 
diff --git a/doc/forum/web-browser_for_the_repository/comment_1_1f8e7e54e9f377417cd672d66ae9bd9d._comment b/doc/forum/web-browser_for_the_repository/comment_1_1f8e7e54e9f377417cd672d66ae9bd9d._comment
new file mode 100644
index 000000000..32296609a
--- /dev/null
+++ b/doc/forum/web-browser_for_the_repository/comment_1_1f8e7e54e9f377417cd672d66ae9bd9d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Kalle"
+ subject="Different solution"
+ date="2016-03-21T21:02:57Z"
+ content="""
+Hi
+
+Are you able to install git-annex on the server? If so perhaps switching the server repo to **direct mode** will work. Then you should be able to use any directory listing method you like. My guess is that you need to make sure the file listing software is configured to ignore `.git` directories. I've never used TRAC so can't tell if this is possible or required.
+"""]]
diff --git a/doc/forum/web-browser_for_the_repository/comment_2_551d5bb2d24212de65720d796365177f._comment b/doc/forum/web-browser_for_the_repository/comment_2_551d5bb2d24212de65720d796365177f._comment
new file mode 100644
index 000000000..dfee3959e
--- /dev/null
+++ b/doc/forum/web-browser_for_the_repository/comment_2_551d5bb2d24212de65720d796365177f._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Tobias"
+ subject="bare repository in direct mode"
+ date="2016-03-21T21:28:57Z"
+ content="""
+It is not possible to put a bare repository in direct mode. I tried it and it did not work. 
+
+Tobias
+"""]]
diff --git a/doc/forum/web-browser_for_the_repository/comment_3_d410df4b7160f17e3846674c3e0e9368._comment b/doc/forum/web-browser_for_the_repository/comment_3_d410df4b7160f17e3846674c3e0e9368._comment
new file mode 100644
index 000000000..c84959a57
--- /dev/null
+++ b/doc/forum/web-browser_for_the_repository/comment_3_d410df4b7160f17e3846674c3e0e9368._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Kalle"
+ subject="comment 3"
+ date="2016-03-23T21:22:15Z"
+ content="""
+A normal direct mode repo with git annex installed on the server should give you a synced directory structure of files that you can browse with most directory listing software/modules and download files.
+
+Are you looking to enable something beyond browsing and downloading the files?
+"""]]
diff --git a/doc/forum/web-browser_for_the_repository/comment_4_d06217403bf53a713b845bbc9ca8b962._comment b/doc/forum/web-browser_for_the_repository/comment_4_d06217403bf53a713b845bbc9ca8b962._comment
new file mode 100644
index 000000000..e0ce7359b
--- /dev/null
+++ b/doc/forum/web-browser_for_the_repository/comment_4_d06217403bf53a713b845bbc9ca8b962._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Tobias"
+ subject="History"
+ date="2016-03-25T15:24:21Z"
+ content="""
+I'm not only interested in the current state of the files but also in a browser for the revisions. Therefore I need a \"real\" repository-browser. 
+"""]]
diff --git a/doc/forum/webapp:_disabling_a_paired_repository.mdwn b/doc/forum/webapp__58___disabling_a_paired_repository.mdwn
index bc2c809c3..bc2c809c3 100644
--- a/doc/forum/webapp:_disabling_a_paired_repository.mdwn
+++ b/doc/forum/webapp__58___disabling_a_paired_repository.mdwn
diff --git a/doc/forum/webapp:_disabling_a_paired_repository/comment_1_9dd316fedf55afecbc77f3b99e66d837._comment b/doc/forum/webapp__58___disabling_a_paired_repository/comment_1_9dd316fedf55afecbc77f3b99e66d837._comment
index 077832deb..077832deb 100644
--- a/doc/forum/webapp:_disabling_a_paired_repository/comment_1_9dd316fedf55afecbc77f3b99e66d837._comment
+++ b/doc/forum/webapp__58___disabling_a_paired_repository/comment_1_9dd316fedf55afecbc77f3b99e66d837._comment
diff --git a/doc/forum/webapp:_disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment b/doc/forum/webapp__58___disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment
index 5d78439b6..5d78439b6 100644
--- a/doc/forum/webapp:_disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment
+++ b/doc/forum/webapp__58___disabling_a_paired_repository/comment_2_28cf58629b9774426c084d80964151d7._comment
diff --git a/doc/forum/webapp:_disabling_a_paired_repository/comment_3_799d66b116e8ddf42e624bb4a082337c._comment b/doc/forum/webapp__58___disabling_a_paired_repository/comment_3_799d66b116e8ddf42e624bb4a082337c._comment
index 1e38b3185..1e38b3185 100644
--- a/doc/forum/webapp:_disabling_a_paired_repository/comment_3_799d66b116e8ddf42e624bb4a082337c._comment
+++ b/doc/forum/webapp__58___disabling_a_paired_repository/comment_3_799d66b116e8ddf42e624bb4a082337c._comment
diff --git a/doc/forum/wishlist:_get__47__drop_via_webapp_file_explorer.mdwn b/doc/forum/wishlist__58___get__47__drop_via_webapp_file_explorer.mdwn
index 3be01480e..3be01480e 100644
--- a/doc/forum/wishlist:_get__47__drop_via_webapp_file_explorer.mdwn
+++ b/doc/forum/wishlist__58___get__47__drop_via_webapp_file_explorer.mdwn
diff --git a/doc/forum/wishlist:_get__47__drop_via_webapp_file_explorer/comment_1_c818a6d44dc13a56460b1865f70eb97c._comment b/doc/forum/wishlist__58___get__47__drop_via_webapp_file_explorer/comment_1_c818a6d44dc13a56460b1865f70eb97c._comment
index 6cc0cf38b..6cc0cf38b 100644
--- a/doc/forum/wishlist:_get__47__drop_via_webapp_file_explorer/comment_1_c818a6d44dc13a56460b1865f70eb97c._comment
+++ b/doc/forum/wishlist__58___get__47__drop_via_webapp_file_explorer/comment_1_c818a6d44dc13a56460b1865f70eb97c._comment
diff --git a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space.mdwn b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space.mdwn
index 8896fee37..8896fee37 100644
--- a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space.mdwn
+++ b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space.mdwn
diff --git a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_1_467e5e3db3e836030bc4b4f15846951f._comment b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_1_467e5e3db3e836030bc4b4f15846951f._comment
index 5c5f17ca9..5c5f17ca9 100644
--- a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_1_467e5e3db3e836030bc4b4f15846951f._comment
+++ b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_1_467e5e3db3e836030bc4b4f15846951f._comment
diff --git a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_2_e3ca3db9bea11d3e085ee9c3c56b33fe._comment b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_2_e3ca3db9bea11d3e085ee9c3c56b33fe._comment
index ee535549f..ee535549f 100644
--- a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_2_e3ca3db9bea11d3e085ee9c3c56b33fe._comment
+++ b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_2_e3ca3db9bea11d3e085ee9c3c56b33fe._comment
diff --git a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_3_0ef8c37350fc192d9b784fbab1d9f318._comment b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_3_0ef8c37350fc192d9b784fbab1d9f318._comment
index a33cbcd27..a33cbcd27 100644
--- a/doc/forum/wishlist:_make_copy_stop_on_exhausted_disk_space/comment_3_0ef8c37350fc192d9b784fbab1d9f318._comment
+++ b/doc/forum/wishlist__58___make_copy_stop_on_exhausted_disk_space/comment_3_0ef8c37350fc192d9b784fbab1d9f318._comment
diff --git a/doc/git-annex-copy/comment_4_44dcb42a011cc203655bccca06de2e10._comment b/doc/git-annex-copy/comment_4_44dcb42a011cc203655bccca06de2e10._comment
new file mode 100644
index 000000000..abd34e597
--- /dev/null
+++ b/doc/git-annex-copy/comment_4_44dcb42a011cc203655bccca06de2e10._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="b@526b37d9a821b5f9ce4e48014422239233ded155"
+ nickname="b"
+ subject="Fetch files from two (or more) remotes simultaneously?"
+ date="2016-03-21T22:47:42Z"
+ content="""
+Let's assume that user has two slow remotes. Is it possible to fetch the data from both to at least partially speed-up the process?
+"""]]
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index b1ff1cc85..6b333dd7d 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -4,8 +4,6 @@
 For easy installation, use the prebuilt app bundle.
 
 * 10.11 El Capitan / 10.10 Yosemite / 10.9 Mavericks: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg)
-* 10.8.2 Mountain Lion: [git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/git-annex.dmg.bz2) **warning: not being updated any longer**
-* 10.7.5 Lion: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg) **warning: not being updated any longer**
 
 To run the [[git-annex_assistant|/assistant]], just
 install the app, look for the icon, and start it up. 
diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn
index 5063b275b..d32a790b4 100644
--- a/doc/install/Windows.mdwn
+++ b/doc/install/Windows.mdwn
@@ -35,8 +35,5 @@ Once the prerequisites are installed, run:
 	cd gitannex
 	build
 
-Note that git from Cygwin is able to clone git-annex's git repository;
-Regular git for Windows cannot due to some characters in filenames.
-
 (To build the git-annex installer, you also need to install the NullSoft
 installer system.)
diff --git a/doc/news/version_6.20160114.mdwn b/doc/news/version_6.20160114.mdwn
deleted file mode 100644
index f6ba0ebcf..000000000
--- a/doc/news/version_6.20160114.mdwn
+++ /dev/null
@@ -1,59 +0,0 @@
-git-annex 6.20160114 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-"hexapodia as the key insight"
-
-* Added v6 repository mode, but v5 is still the default for now.
-* unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a
-  pointer file, and this change can be committed to the git repository.
-  For details, see http://git-annex.branchable.com/tips/unlocked\_files/
-* The upgrade to version 6 is not done fully automatically yet, because
-  upgrading a direct mode repository to version 6 will prevent old
-  versions of git-annex from working in other clones of that repository.
-  For details, see http://git-annex.branchable.com/upgrades/
-* init: --version parameter added to control which supported repository
-  version to use.
-* init, upgrade: Configure .git/info/attributes to use git-annex
-  as a smudge filter. In v6 repository mode, this makes git add
-  add files to the annex in unlocked mode, unless overridden by
-  annex.largefiles configuration.
-* assistant: In v6 mode, adds files in unlocked mode, so they can
-  continue to be modified.
-* Added annex.thin setting, which makes unlocked files in v6 repositories
-  be hard linked to their content, instead of a copy. This saves disk
-  space but means any modification of an unlocked file will lose the local
-  (and possibly only) copy of the old version.
-* Enable annex.thin by default on upgrade from direct mode to v6, since
-  direct mode made the same tradeoff.
-* fix: Adjusts unlocked files as configured by annex.thin.
-* persistent-sqlite is now a hard build dependency, since v6 repository
-  mode needs it.
-* status: On crippled filesystems, was displaying M for all annexed files
-  that were present. Probably caused by a change to what git status
-  displays in this situation. Fixed by treating files git thinks are
-  modified the same as typechanged files.
-* addurl: Added --batch and --with-files options.
-* addurl: Support --json, particularly useful in --batch mode.
-* addurl: Refuse to overwrite any existing, non-annexed file.
-* Debian: Adjust build dependencies for webapp, DAV. Now available on
-  mips, mipsel, but temporarily removed armel since build is failing
-  there.
-* info: Fix "backend usage" numbers, which were counting present keys
-  twice.
-* info --json: Improve json for "backend usage", using a nested object
-  with fields for each backend instead of the previous weird nested lists.
-  This may break existing parsers of this json output, if there were any.
-* whereis --json: Make url list be included in machine-parseable form.
-* test: Added --keep-failures option.
-* unused: Bug fix when a new file was added to the annex, and then
-  removed (but not git rmed). git still has the add staged in this case,
-  so the content should not be unused and was wrongly treated as such.
-* migrate: Copy over metadata to new key.
-* rekey: No longer copies over urls from the old to the new key.
-  It makes sense for migrate to do that, but not for this low-level
-  (and little used) plumbing command to.
-* view: Fix crash in non-unicode capable locale when entering a view
-  of metadata containing a slash or backslash.
-* When annex.http-headers is used to set the User-Agent header, avoid
-  sending User-Agent: git-annex
-* Windows: Fix rsync cross-drive hack to work with msys2 rsync.
-  Thanks, Pieter Kitslaar."""]]
diff --git a/doc/news/version_6.20160318.mdwn b/doc/news/version_6.20160318.mdwn
new file mode 100644
index 000000000..7277d0696
--- /dev/null
+++ b/doc/news/version_6.20160318.mdwn
@@ -0,0 +1,18 @@
+git-annex 6.20160318 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * metadata: Added -r to remove all current values of a field.
+   * Fix data loss that can occur when annex.pidlock is set in a repository.
+   * Fix bug preventing moving files to/from a repository with annex.pidlock set.
+   * Fix shared lock file FD leak.
+   * Fix metadata hook behavior when multiple files are added at once.
+     Thanks, Klaus Ethgen.
+   * Added dependencies on haskell mountpoints and disk-free-space
+     libraries, removing FFI code from git-annex.
+   * dropkey: Add --batch and --json.
+   * Fix OSX dmg to include libraries needed by bundled gpg,
+     lost in last release.
+   * Always try to thaw content, even when annex.crippledfilesystem is set.
+   * Correct git-annex info to include unlocked files in v6 repository.
+   * Sped up git-annex add in direct mode and v6 by using
+     git hash-object --stdin-paths.
+   * Sped up git-annex merge by using git hash-object --stdin-paths."""]]
\ No newline at end of file
diff --git a/doc/special_remotes/ipfs/comment_8_eedf260df630192b49557bfc84c9ce82._comment b/doc/special_remotes/ipfs/comment_8_eedf260df630192b49557bfc84c9ce82._comment
new file mode 100644
index 000000000..62a67913c
--- /dev/null
+++ b/doc/special_remotes/ipfs/comment_8_eedf260df630192b49557bfc84c9ce82._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="git remote"
+ date="2016-03-24T14:15:06Z"
+ content="""
+there is now a [git remote for IPFS](https://github.com/cryptix/git-remote-ipfs). I *believe* it suffers from the same problem as all files within ipfs, namely that the contents are duplicated inside the repo. However, it certainly make for an interesting decentralised way of sharing metadata. --[[anarcat]]
+"""]]
diff --git a/doc/tips/centralised_repository:_starting_from_nothing.mdwn b/doc/tips/centralised_repository__58___starting_from_nothing.mdwn
index 7018697a0..7018697a0 100644
--- a/doc/tips/centralised_repository:_starting_from_nothing.mdwn
+++ b/doc/tips/centralised_repository__58___starting_from_nothing.mdwn
diff --git a/doc/tips/centralised_repository:_starting_from_nothing/comment_1_b0d22822017646775869ce1292e676f4._comment b/doc/tips/centralised_repository__58___starting_from_nothing/comment_1_b0d22822017646775869ce1292e676f4._comment
index 22857af3e..22857af3e 100644
--- a/doc/tips/centralised_repository:_starting_from_nothing/comment_1_b0d22822017646775869ce1292e676f4._comment
+++ b/doc/tips/centralised_repository__58___starting_from_nothing/comment_1_b0d22822017646775869ce1292e676f4._comment
diff --git a/doc/todo/Android:_add_a___34__Share_via__34___shortcut___34__Add_to_Annex__34__.mdwn b/doc/todo/Android__58___add_a___34__Share_via__34___shortcut___34__Add_to_Annex__34__.mdwn
index d04eee18d..d04eee18d 100644
--- a/doc/todo/Android:_add_a___34__Share_via__34___shortcut___34__Add_to_Annex__34__.mdwn
+++ b/doc/todo/Android__58___add_a___34__Share_via__34___shortcut___34__Add_to_Annex__34__.mdwn
diff --git a/doc/todo/Wishlist:_additional_environment_variables_for_hooks.mdwn b/doc/todo/Wishlist__58___additional_environment_variables_for_hooks.mdwn
index 6e852b9f2..6e852b9f2 100644
--- a/doc/todo/Wishlist:_additional_environment_variables_for_hooks.mdwn
+++ b/doc/todo/Wishlist__58___additional_environment_variables_for_hooks.mdwn
diff --git a/doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment b/doc/todo/Wishlist__58___additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment
index 4d0409d58..4d0409d58 100644
--- a/doc/todo/Wishlist:_additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment
+++ b/doc/todo/Wishlist__58___additional_environment_variables_for_hooks/comment_1_d82cbbb478a81a651fbe6cb8b71c1192._comment
diff --git a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant.mdwn b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant.mdwn
index 972247c84..972247c84 100644
--- a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant.mdwn
+++ b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant.mdwn
diff --git a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_1_3274820a0d1f10c505f15cd29a37b95a._comment b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_1_3274820a0d1f10c505f15cd29a37b95a._comment
index d4839cb1d..d4839cb1d 100644
--- a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_1_3274820a0d1f10c505f15cd29a37b95a._comment
+++ b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_1_3274820a0d1f10c505f15cd29a37b95a._comment
diff --git a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_2_2cf5aef3f1d340c4ed6249ef94c1b607._comment b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_2_2cf5aef3f1d340c4ed6249ef94c1b607._comment
index 015dd8cd7..015dd8cd7 100644
--- a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_2_2cf5aef3f1d340c4ed6249ef94c1b607._comment
+++ b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_2_2cf5aef3f1d340c4ed6249ef94c1b607._comment
diff --git a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_3_6c53d82e62b2d269a941ba967d05adf5._comment b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_3_6c53d82e62b2d269a941ba967d05adf5._comment
index 07b1b2557..07b1b2557 100644
--- a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant/comment_3_6c53d82e62b2d269a941ba967d05adf5._comment
+++ b/doc/todo/Wishlist__58___disable_auto-repair_for_the_assistant/comment_3_6c53d82e62b2d269a941ba967d05adf5._comment
diff --git a/doc/todo/Wishlist:_sanitychecker_fix_wrong_UUID__47__duplicate_remote.mdwn b/doc/todo/Wishlist__58___sanitychecker_fix_wrong_UUID__47__duplicate_remote.mdwn
index ff7773d3e..ff7773d3e 100644
--- a/doc/todo/Wishlist:_sanitychecker_fix_wrong_UUID__47__duplicate_remote.mdwn
+++ b/doc/todo/Wishlist__58___sanitychecker_fix_wrong_UUID__47__duplicate_remote.mdwn
diff --git a/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option.mdwn b/doc/todo/__91__PATCH__93___Log.hs__58___Add_missing_dash_to_--raw_option.mdwn
index 9a4e925b2..9a4e925b2 100644
--- a/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option.mdwn
+++ b/doc/todo/__91__PATCH__93___Log.hs__58___Add_missing_dash_to_--raw_option.mdwn
diff --git a/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment b/doc/todo/__91__PATCH__93___Log.hs__58___Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment
index 9feb93633..9feb93633 100644
--- a/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment
+++ b/doc/todo/__91__PATCH__93___Log.hs__58___Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment
diff --git a/doc/todo/dont_append_:5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
index 257054a90..257054a90 100644
--- a/doc/todo/dont_append_:5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
+++ b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
diff --git a/doc/todo/feature_request:_pubkey-only_encryption_mode.mdwn b/doc/todo/feature_request__58___pubkey-only_encryption_mode.mdwn
index 2bfc629dd..2bfc629dd 100644
--- a/doc/todo/feature_request:_pubkey-only_encryption_mode.mdwn
+++ b/doc/todo/feature_request__58___pubkey-only_encryption_mode.mdwn
diff --git a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_1_684d36c06429306be68fd60019564db3._comment b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_1_684d36c06429306be68fd60019564db3._comment
index 0e2f5e3ba..0e2f5e3ba 100644
--- a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_1_684d36c06429306be68fd60019564db3._comment
+++ b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_1_684d36c06429306be68fd60019564db3._comment
diff --git a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_2_13995d4f1142a393ff977859b86497b4._comment b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_2_13995d4f1142a393ff977859b86497b4._comment
index 88a45312d..88a45312d 100644
--- a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_2_13995d4f1142a393ff977859b86497b4._comment
+++ b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_2_13995d4f1142a393ff977859b86497b4._comment
diff --git a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_3_a37d5d27d073020ccf7eadb8e47d378a._comment b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_3_a37d5d27d073020ccf7eadb8e47d378a._comment
index 1278aaab3..1278aaab3 100644
--- a/doc/todo/feature_request:_pubkey-only_encryption_mode/comment_3_a37d5d27d073020ccf7eadb8e47d378a._comment
+++ b/doc/todo/feature_request__58___pubkey-only_encryption_mode/comment_3_a37d5d27d073020ccf7eadb8e47d378a._comment
diff --git a/doc/todo/immediate_stream-to-sync.mdwn b/doc/todo/immediate_stream-to-sync.mdwn
new file mode 100644
index 000000000..919651df5
--- /dev/null
+++ b/doc/todo/immediate_stream-to-sync.mdwn
@@ -0,0 +1,9 @@
+git-annex is really great for secure distributed archival, but it's missing a piece of the reliability portion: when data is generated and saved a system may crash before finishing, and some data may be lost, before the add is initiated.
+
+If there were a way to add a file at the same time as writing it -- and then at the same time stream that live data to a remote -- it would increase the utility of git-add for such uses as storing live recording and logfiles.
+
+I imagine e.g.
+
+$ cat /proc/kmsg | git annex addstreamsync livelogs/kernel-log-$(date)
+
+and kmsg would be streamed to enough remotes to meet numcopies, and hashed live .  If possible, if the system then crashed and even the entire source repo was lost, the remote would have some incomplete file and be able to complete the add properly at next sync.  Hashing the data at the same time as generating it would also speed adding any new file.
diff --git a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template.mdwn b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template.mdwn
index 46d9de34f..46d9de34f 100644
--- a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template.mdwn
+++ b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template.mdwn
diff --git a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template/comment_1_62752c760fc12eca0c34d67d58753d00._comment b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template/comment_1_62752c760fc12eca0c34d67d58753d00._comment
index cc3d85faf..cc3d85faf 100644
--- a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template/comment_1_62752c760fc12eca0c34d67d58753d00._comment
+++ b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template/comment_1_62752c760fc12eca0c34d67d58753d00._comment
diff --git a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template/comment_2_21672360060f48bc2eacfa535ff4c94d._comment b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template/comment_2_21672360060f48bc2eacfa535ff4c94d._comment
index c8770ec6e..c8770ec6e 100644
--- a/doc/todo/importfeed:_allow___36____123__itemdate__125___with_--template/comment_2_21672360060f48bc2eacfa535ff4c94d._comment
+++ b/doc/todo/importfeed__58___allow___36____123__itemdate__125___with_--template/comment_2_21672360060f48bc2eacfa535ff4c94d._comment
diff --git a/doc/todo/optimise_git-annex_merge.mdwn b/doc/todo/optimise_git-annex_merge.mdwn
index 91d18ebd7..ff2da3209 100644
--- a/doc/todo/optimise_git-annex_merge.mdwn
+++ b/doc/todo/optimise_git-annex_merge.mdwn
@@ -8,6 +8,9 @@ Instead, I'd like a way to stream multiple objects into git using stdin.
 Sometime, should look at either extending git-hash-object to support that,
 or possibly look at using git-fast-import instead.
 
+> Well, I went with git hash-object --stdin-paths despite it needing to read from
+> temp files. --[[Joey]]
+
 --- 
 
 `git-annex merge` also runs `git show` once per file that needs to be
@@ -21,3 +24,5 @@ There is already a Git.CatFile library that can do this easily. --[[Joey]]
 Merging used to use memory proportional to the size of the diff. It now
 streams data, running in constant space. This probably sped it up a lot,
 as there's much less allocation and GC action. --[[Joey]] 
+
+[[done]] 
diff --git a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn b/doc/todo/patch__58___Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn
index cb48db344..cb48db344 100644
--- a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn
+++ b/doc/todo/patch__58___Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn
diff --git a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment b/doc/todo/patch__58___Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment
index 474c61c1e..474c61c1e 100644
--- a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment
+++ b/doc/todo/patch__58___Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog/comment_1_031c5a4afe9453a5b62004c85e7e7192._comment
diff --git a/doc/todo/patch:_Command__47__Unused.hs:_Change_--unused-refspec_back_to_--used-refspec.mdwn b/doc/todo/patch__58___Command__47__Unused.hs__58___Change_--unused-refspec_back_to_--used-refspec.mdwn
index 87a0428f0..87a0428f0 100644
--- a/doc/todo/patch:_Command__47__Unused.hs:_Change_--unused-refspec_back_to_--used-refspec.mdwn
+++ b/doc/todo/patch__58___Command__47__Unused.hs__58___Change_--unused-refspec_back_to_--used-refspec.mdwn
diff --git a/doc/todo/webapp:_show_times_of_events.mdwn b/doc/todo/webapp__58___show_times_of_events.mdwn
index b58e52e9d..b58e52e9d 100644
--- a/doc/todo/webapp:_show_times_of_events.mdwn
+++ b/doc/todo/webapp__58___show_times_of_events.mdwn
diff --git a/doc/todo/whishlist:_temporary_relinking_to_remotes.mdwn b/doc/todo/whishlist__58___temporary_relinking_to_remotes.mdwn
index 3b1ca70eb..3b1ca70eb 100644
--- a/doc/todo/whishlist:_temporary_relinking_to_remotes.mdwn
+++ b/doc/todo/whishlist__58___temporary_relinking_to_remotes.mdwn
diff --git a/doc/todo/wishlist:_--all_option_for_sync.mdwn b/doc/todo/wishlist__58___--all_option_for_sync.mdwn
index fd609a091..fd609a091 100644
--- a/doc/todo/wishlist:_--all_option_for_sync.mdwn
+++ b/doc/todo/wishlist__58___--all_option_for_sync.mdwn
diff --git a/doc/todo/wishlist:_--dry-run_option_for_all_commands.mdwn b/doc/todo/wishlist__58___--dry-run_option_for_all_commands.mdwn
index fbea1b6fa..fbea1b6fa 100644
--- a/doc/todo/wishlist:_--dry-run_option_for_all_commands.mdwn
+++ b/doc/todo/wishlist__58___--dry-run_option_for_all_commands.mdwn
diff --git a/doc/todo/wishlist:_--dry-run_option_for_all_commands/comment_1_03bf493d5a7f957339f9aa388ba85ef8._comment b/doc/todo/wishlist__58___--dry-run_option_for_all_commands/comment_1_03bf493d5a7f957339f9aa388ba85ef8._comment
index 772574738..772574738 100644
--- a/doc/todo/wishlist:_--dry-run_option_for_all_commands/comment_1_03bf493d5a7f957339f9aa388ba85ef8._comment
+++ b/doc/todo/wishlist__58___--dry-run_option_for_all_commands/comment_1_03bf493d5a7f957339f9aa388ba85ef8._comment
diff --git a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find.mdwn b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find.mdwn
index c309f2491..c309f2491 100644
--- a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find.mdwn
+++ b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find.mdwn
diff --git a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_1_c355878ac49bbb23a4cf82fe685da9ee._comment b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_1_c355878ac49bbb23a4cf82fe685da9ee._comment
index 73d4cba5f..73d4cba5f 100644
--- a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_1_c355878ac49bbb23a4cf82fe685da9ee._comment
+++ b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_1_c355878ac49bbb23a4cf82fe685da9ee._comment
diff --git a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_2_da30a066c4de465fe172ad01057e2380._comment b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_2_da30a066c4de465fe172ad01057e2380._comment
index 944f36088..944f36088 100644
--- a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_2_da30a066c4de465fe172ad01057e2380._comment
+++ b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_2_da30a066c4de465fe172ad01057e2380._comment
diff --git a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_3_f3eadd6241f5cc2886515b2826dc5cf9._comment b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_3_f3eadd6241f5cc2886515b2826dc5cf9._comment
index 8da436e09..8da436e09 100644
--- a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_3_f3eadd6241f5cc2886515b2826dc5cf9._comment
+++ b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_3_f3eadd6241f5cc2886515b2826dc5cf9._comment
diff --git a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_4_c766c1465407324fc933db78be325b33._comment b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_4_c766c1465407324fc933db78be325b33._comment
index 6025101e2..6025101e2 100644
--- a/doc/todo/wishlist:_--maxdepth_option_for_git_annex_find/comment_4_c766c1465407324fc933db78be325b33._comment
+++ b/doc/todo/wishlist__58___--maxdepth_option_for_git_annex_find/comment_4_c766c1465407324fc933db78be325b33._comment
diff --git a/doc/todo/wishlist:_Add_--byte-limit_option.mdwn b/doc/todo/wishlist__58___Add_--byte-limit_option.mdwn
index 28642b50d..28642b50d 100644
--- a/doc/todo/wishlist:_Add_--byte-limit_option.mdwn
+++ b/doc/todo/wishlist__58___Add_--byte-limit_option.mdwn
diff --git a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn b/doc/todo/wishlist__58___Advanced_settings_for_xmpp_and_webdav.mdwn
index 96552eecc..96552eecc 100644
--- a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav.mdwn
+++ b/doc/todo/wishlist__58___Advanced_settings_for_xmpp_and_webdav.mdwn
diff --git a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav/comment_1_11c7444ab4988c60732af505b52bde3c._comment b/doc/todo/wishlist__58___Advanced_settings_for_xmpp_and_webdav/comment_1_11c7444ab4988c60732af505b52bde3c._comment
index 61cd3fc2e..61cd3fc2e 100644
--- a/doc/todo/wishlist:_Advanced_settings_for_xmpp_and_webdav/comment_1_11c7444ab4988c60732af505b52bde3c._comment
+++ b/doc/todo/wishlist__58___Advanced_settings_for_xmpp_and_webdav/comment_1_11c7444ab4988c60732af505b52bde3c._comment
diff --git a/doc/todo/wishlist:_Freeing_X_space_on_remote_Y.mdwn b/doc/todo/wishlist__58___Freeing_X_space_on_remote_Y.mdwn
index 5fec39d98..5fec39d98 100644
--- a/doc/todo/wishlist:_Freeing_X_space_on_remote_Y.mdwn
+++ b/doc/todo/wishlist__58___Freeing_X_space_on_remote_Y.mdwn
diff --git a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate.mdwn b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate.mdwn
index 3ecb42197..3ecb42197 100644
--- a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate.mdwn
+++ b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate.mdwn
diff --git a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_1_4fd870e14b5b70c8a6ade41406294387._comment b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_1_4fd870e14b5b70c8a6ade41406294387._comment
index 78ca76939..78ca76939 100644
--- a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_1_4fd870e14b5b70c8a6ade41406294387._comment
+++ b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_1_4fd870e14b5b70c8a6ade41406294387._comment
diff --git a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_2_dd854f297ad6a94b54be9f3edfd0f766._comment b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_2_dd854f297ad6a94b54be9f3edfd0f766._comment
index 70f04c616..70f04c616 100644
--- a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_2_dd854f297ad6a94b54be9f3edfd0f766._comment
+++ b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_2_dd854f297ad6a94b54be9f3edfd0f766._comment
diff --git a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_3_a8b7e90a473d5937807cc7eb456efe33._comment b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_3_a8b7e90a473d5937807cc7eb456efe33._comment
index a5f8f6a1b..a5f8f6a1b 100644
--- a/doc/todo/wishlist:_Option_to_specify_max_transfer_rate/comment_3_a8b7e90a473d5937807cc7eb456efe33._comment
+++ b/doc/todo/wishlist__58___Option_to_specify_max_transfer_rate/comment_3_a8b7e90a473d5937807cc7eb456efe33._comment
diff --git a/doc/todo/wishlist:_Parity_files_for_encrypted_remotes.mdwn b/doc/todo/wishlist__58___Parity_files_for_encrypted_remotes.mdwn
index 34f06ad63..34f06ad63 100644
--- a/doc/todo/wishlist:_Parity_files_for_encrypted_remotes.mdwn
+++ b/doc/todo/wishlist__58___Parity_files_for_encrypted_remotes.mdwn
diff --git a/doc/todo/wishlist:_Restore_s3_files_moved_to_Glacier.mdwn b/doc/todo/wishlist__58___Restore_s3_files_moved_to_Glacier.mdwn
index 85fc2785c..85fc2785c 100644
--- a/doc/todo/wishlist:_Restore_s3_files_moved_to_Glacier.mdwn
+++ b/doc/todo/wishlist__58___Restore_s3_files_moved_to_Glacier.mdwn
diff --git a/doc/todo/wishlist:_Restore_s3_files_moved_to_Glacier/comment_1_eb934756cb2af7fa13ad3b5fad7f85b2._comment b/doc/todo/wishlist__58___Restore_s3_files_moved_to_Glacier/comment_1_eb934756cb2af7fa13ad3b5fad7f85b2._comment
index 92554aa31..92554aa31 100644
--- a/doc/todo/wishlist:_Restore_s3_files_moved_to_Glacier/comment_1_eb934756cb2af7fa13ad3b5fad7f85b2._comment
+++ b/doc/todo/wishlist__58___Restore_s3_files_moved_to_Glacier/comment_1_eb934756cb2af7fa13ad3b5fad7f85b2._comment
diff --git a/doc/todo/wishlist__58___Unix_time_in_git_annex_log.mdwn b/doc/todo/wishlist__58___Unix_time_in_git_annex_log.mdwn
new file mode 100644
index 000000000..706686f62
--- /dev/null
+++ b/doc/todo/wishlist__58___Unix_time_in_git_annex_log.mdwn
@@ -0,0 +1,14 @@
+Could `git annex log` show the modification times using the Unix time instead of human-readable timestamps?
+
+This is an example of the output of `git annex log`:
+
+```
++ 2014-10-27 01:00:18 ev-2014.pdf | 50083bd6-7e20-4356-a32f-a1dde07de441 -- penn
+```
+
+If the timestamp were in Unix time, it would be easier to process in a mechanical way. Unix time would also avoid having to guess what is the correct timezone for the timestamp.
+
+```
++ 1414368018 ev-2014.pdf | 50083bd6-7e20-4356-a32f-a1dde07de441 -- penn
+```
+
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case.mdwn b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case.mdwn
index d53fa56ab..d53fa56ab 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case.mdwn
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case.mdwn
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_1_5c8812973cf91b046e7fc44d7e86c78e._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_1_5c8812973cf91b046e7fc44d7e86c78e._comment
index 61d82e2ae..61d82e2ae 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_1_5c8812973cf91b046e7fc44d7e86c78e._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_1_5c8812973cf91b046e7fc44d7e86c78e._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_2_f36b6a5b128423211aac91a252ecf85f._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_2_f36b6a5b128423211aac91a252ecf85f._comment
index 3379742d2..3379742d2 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_2_f36b6a5b128423211aac91a252ecf85f._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_2_f36b6a5b128423211aac91a252ecf85f._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_3_ad1569b2405acacd2e37f42b82f24c88._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_3_ad1569b2405acacd2e37f42b82f24c88._comment
index 14ab5f65a..14ab5f65a 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_3_ad1569b2405acacd2e37f42b82f24c88._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_3_ad1569b2405acacd2e37f42b82f24c88._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_4_8aba90150fe178ce9712ad951628f3d6._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_4_8aba90150fe178ce9712ad951628f3d6._comment
index c1f148fdb..c1f148fdb 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_4_8aba90150fe178ce9712ad951628f3d6._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_4_8aba90150fe178ce9712ad951628f3d6._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_5_6f42d240e0021f4dfa37146bea3f5d7e._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_5_6f42d240e0021f4dfa37146bea3f5d7e._comment
index aa547d790..aa547d790 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_5_6f42d240e0021f4dfa37146bea3f5d7e._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_5_6f42d240e0021f4dfa37146bea3f5d7e._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_6_5fda455febf728b079f26fe42bf7bcab._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_6_5fda455febf728b079f26fe42bf7bcab._comment
index 3f10e48ad..3f10e48ad 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_6_5fda455febf728b079f26fe42bf7bcab._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_6_5fda455febf728b079f26fe42bf7bcab._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_7_f1052ab997f1a2cccbabfd1533fc0a59._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_7_f1052ab997f1a2cccbabfd1533fc0a59._comment
index deb25a9ce..deb25a9ce 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_7_f1052ab997f1a2cccbabfd1533fc0a59._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_7_f1052ab997f1a2cccbabfd1533fc0a59._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_8_07804647b6023436878756bd97a23f32._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_8_07804647b6023436878756bd97a23f32._comment
index 4901a2d97..4901a2d97 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_8_07804647b6023436878756bd97a23f32._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_8_07804647b6023436878756bd97a23f32._comment
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment
index 2287f6935..2287f6935 100644
--- a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment
+++ b/doc/todo/wishlist__58_____34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment
diff --git a/doc/todo/wishlist:___39__get__39___queue_and_schedule..mdwn b/doc/todo/wishlist__58_____39__get__39___queue_and_schedule..mdwn
index 8166479b8..8166479b8 100644
--- a/doc/todo/wishlist:___39__get__39___queue_and_schedule..mdwn
+++ b/doc/todo/wishlist__58_____39__get__39___queue_and_schedule..mdwn
diff --git a/doc/todo/wishlist:___39__get__39___queue_and_schedule./comment_1_d6ab311beee2ce5f73ae325a4ae463d4._comment b/doc/todo/wishlist__58_____39__get__39___queue_and_schedule./comment_1_d6ab311beee2ce5f73ae325a4ae463d4._comment
index df273afb2..df273afb2 100644
--- a/doc/todo/wishlist:___39__get__39___queue_and_schedule./comment_1_d6ab311beee2ce5f73ae325a4ae463d4._comment
+++ b/doc/todo/wishlist__58_____39__get__39___queue_and_schedule./comment_1_d6ab311beee2ce5f73ae325a4ae463d4._comment
diff --git a/doc/todo/wishlist:___39__whereis__39___support_in_the_webapp.mdwn b/doc/todo/wishlist__58_____39__whereis__39___support_in_the_webapp.mdwn
index c074988b0..c074988b0 100644
--- a/doc/todo/wishlist:___39__whereis__39___support_in_the_webapp.mdwn
+++ b/doc/todo/wishlist__58_____39__whereis__39___support_in_the_webapp.mdwn
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__.mdwn b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__.mdwn
index 626f5a03f..626f5a03f 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__.mdwn
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__.mdwn
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_1_c83a6cddd0ce222205a149cfa41ca395._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_1_c83a6cddd0ce222205a149cfa41ca395._comment
index 32d0c0112..32d0c0112 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_1_c83a6cddd0ce222205a149cfa41ca395._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_1_c83a6cddd0ce222205a149cfa41ca395._comment
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_2_353fbc2bcc40cb8c9af42907a34c6e5a._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_2_353fbc2bcc40cb8c9af42907a34c6e5a._comment
index 40f299fa0..40f299fa0 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_2_353fbc2bcc40cb8c9af42907a34c6e5a._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_2_353fbc2bcc40cb8c9af42907a34c6e5a._comment
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_3_3e830035df580601f038ce3a7003c39d._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_3_3e830035df580601f038ce3a7003c39d._comment
index 8b4b132cb..8b4b132cb 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_3_3e830035df580601f038ce3a7003c39d._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_3_3e830035df580601f038ce3a7003c39d._comment
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_4_e5516689bc128c061dcd66649dc69584._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_4_e5516689bc128c061dcd66649dc69584._comment
index 3e2d6689c..3e2d6689c 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_4_e5516689bc128c061dcd66649dc69584._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_4_e5516689bc128c061dcd66649dc69584._comment
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_5_be740e4b06d9130ae6afc5783da3c0e0._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_5_be740e4b06d9130ae6afc5783da3c0e0._comment
index 32beef427..32beef427 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_5_be740e4b06d9130ae6afc5783da3c0e0._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_5_be740e4b06d9130ae6afc5783da3c0e0._comment
diff --git a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_6_79d115f95cec46bb51e7fba078524db1._comment b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_6_79d115f95cec46bb51e7fba078524db1._comment
index 6e376e316..6e376e316 100644
--- a/doc/todo/wishlist:___96__git_annex_drop_--relaxed__96__/comment_6_79d115f95cec46bb51e7fba078524db1._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_drop_--relaxed__96__/comment_6_79d115f95cec46bb51e7fba078524db1._comment
diff --git a/doc/todo/wishlist:___96__git_annex_optimize__96__.mdwn b/doc/todo/wishlist__58_____96__git_annex_optimize__96__.mdwn
index 8e6fced45..8e6fced45 100644
--- a/doc/todo/wishlist:___96__git_annex_optimize__96__.mdwn
+++ b/doc/todo/wishlist__58_____96__git_annex_optimize__96__.mdwn
diff --git a/doc/todo/wishlist:___96__git_annex_sync_-m__96__.mdwn b/doc/todo/wishlist__58_____96__git_annex_sync_-m__96__.mdwn
index c83d4db5c..c83d4db5c 100644
--- a/doc/todo/wishlist:___96__git_annex_sync_-m__96__.mdwn
+++ b/doc/todo/wishlist__58_____96__git_annex_sync_-m__96__.mdwn
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit.mdwn b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit.mdwn
index 381626724..381626724 100644
--- a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit.mdwn
+++ b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit.mdwn
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment
index 1e455c486..1e455c486 100644
--- a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment
index cc6cd727b..cc6cd727b 100644
--- a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_3_206e319f6d7c6b0d1f05af2475a8b335._comment b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_3_206e319f6d7c6b0d1f05af2475a8b335._comment
index 8e2a57e14..8e2a57e14 100644
--- a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_3_206e319f6d7c6b0d1f05af2475a8b335._comment
+++ b/doc/todo/wishlist__58_____96__git_annex_sync__96___without_auto-commit/comment_3_206e319f6d7c6b0d1f05af2475a8b335._comment
diff --git a/doc/todo/wishlist:_add_--symlink_option_to_import.mdwn b/doc/todo/wishlist__58___add_--symlink_option_to_import.mdwn
index c6c5e66a4..c6c5e66a4 100644
--- a/doc/todo/wishlist:_add_--symlink_option_to_import.mdwn
+++ b/doc/todo/wishlist__58___add_--symlink_option_to_import.mdwn
diff --git a/doc/todo/wishlist:_add_--symlink_option_to_import/comment_1_d5d853142d401b95577567e3eb43495e._comment b/doc/todo/wishlist__58___add_--symlink_option_to_import/comment_1_d5d853142d401b95577567e3eb43495e._comment
index 62d4264cb..62d4264cb 100644
--- a/doc/todo/wishlist:_add_--symlink_option_to_import/comment_1_d5d853142d401b95577567e3eb43495e._comment
+++ b/doc/todo/wishlist__58___add_--symlink_option_to_import/comment_1_d5d853142d401b95577567e3eb43495e._comment
diff --git a/doc/todo/wishlist:_add_repository_name_to_commit_messages.mdwn b/doc/todo/wishlist__58___add_repository_name_to_commit_messages.mdwn
index 1c37cc18b..1c37cc18b 100644
--- a/doc/todo/wishlist:_add_repository_name_to_commit_messages.mdwn
+++ b/doc/todo/wishlist__58___add_repository_name_to_commit_messages.mdwn
diff --git a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp.mdwn b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp.mdwn
index 85c8874fc..85c8874fc 100644
--- a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp.mdwn
+++ b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp.mdwn
diff --git a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_1_b89e90f9a70748c95aaf81740a40b76e._comment b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_1_b89e90f9a70748c95aaf81740a40b76e._comment
index 5e8c8a374..5e8c8a374 100644
--- a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_1_b89e90f9a70748c95aaf81740a40b76e._comment
+++ b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_1_b89e90f9a70748c95aaf81740a40b76e._comment
diff --git a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_2_d64361380cb18b98ddb43ada1c9f540a._comment b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_2_d64361380cb18b98ddb43ada1c9f540a._comment
index 5dfeedf37..5dfeedf37 100644
--- a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_2_d64361380cb18b98ddb43ada1c9f540a._comment
+++ b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_2_d64361380cb18b98ddb43ada1c9f540a._comment
diff --git a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_3_f465134958d858a8be21f252abd78aae._comment b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_3_f465134958d858a8be21f252abd78aae._comment
index f2cadb8b0..f2cadb8b0 100644
--- a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_3_f465134958d858a8be21f252abd78aae._comment
+++ b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_3_f465134958d858a8be21f252abd78aae._comment
diff --git a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_4_268b35928a7a192644d32b6c1d12ecc4._comment b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_4_268b35928a7a192644d32b6c1d12ecc4._comment
index 552b6c189..552b6c189 100644
--- a/doc/todo/wishlist:_add_systemd_services_file_samples_for_assistant_and_webapp/comment_4_268b35928a7a192644d32b6c1d12ecc4._comment
+++ b/doc/todo/wishlist__58___add_systemd_services_file_samples_for_assistant_and_webapp/comment_4_268b35928a7a192644d32b6c1d12ecc4._comment
diff --git a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp.mdwn b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp.mdwn
index 2d291608b..2d291608b 100644
--- a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp.mdwn
+++ b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp.mdwn
diff --git a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_1_3d1ea5579a6ad0c0efde58dca11c10aa._comment b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp/comment_1_3d1ea5579a6ad0c0efde58dca11c10aa._comment
index b6125fd6e..b6125fd6e 100644
--- a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_1_3d1ea5579a6ad0c0efde58dca11c10aa._comment
+++ b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp/comment_1_3d1ea5579a6ad0c0efde58dca11c10aa._comment
diff --git a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment
index bd3885a96..bd3885a96 100644
--- a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment
+++ b/doc/todo/wishlist__58___allow_custom_S3_url_in_webapp/comment_2_f96bb81fde4185368dc6ea5a5aed87da._comment
diff --git a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry.mdwn b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry.mdwn
index 258b82f6a..258b82f6a 100644
--- a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry.mdwn
+++ b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry.mdwn
diff --git a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry/comment_1_ef1dbde0fbf20b7fd91503d9df50dcab._comment b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry/comment_1_ef1dbde0fbf20b7fd91503d9df50dcab._comment
index 3c6df0477..3c6df0477 100644
--- a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry/comment_1_ef1dbde0fbf20b7fd91503d9df50dcab._comment
+++ b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry/comment_1_ef1dbde0fbf20b7fd91503d9df50dcab._comment
diff --git a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry/comment_2_3a3d793b32b8440a8213b38bc83ea94a._comment b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry/comment_2_3a3d793b32b8440a8213b38bc83ea94a._comment
index aeb98f06e..aeb98f06e 100644
--- a/doc/todo/wishlist:_allow_re-adding_without_generating_log_entry/comment_2_3a3d793b32b8440a8213b38bc83ea94a._comment
+++ b/doc/todo/wishlist__58___allow_re-adding_without_generating_log_entry/comment_2_3a3d793b32b8440a8213b38bc83ea94a._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads.mdwn b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads.mdwn
index c910ace83..c910ace83 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads.mdwn
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads.mdwn
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_1_36ae3c75053d5ec278b5e6eb2084d57a._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_1_36ae3c75053d5ec278b5e6eb2084d57a._comment
index 4c20561c7..4c20561c7 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_1_36ae3c75053d5ec278b5e6eb2084d57a._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_1_36ae3c75053d5ec278b5e6eb2084d57a._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_be8eb800523db8cf7a2c68a28fbf5ea5._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_be8eb800523db8cf7a2c68a28fbf5ea5._comment
index c958fd08f..c958fd08f 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_be8eb800523db8cf7a2c68a28fbf5ea5._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_be8eb800523db8cf7a2c68a28fbf5ea5._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_d9f725de41a8572c85e4c6d9b4bcc927._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_d9f725de41a8572c85e4c6d9b4bcc927._comment
index 30515a49b..30515a49b 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_d9f725de41a8572c85e4c6d9b4bcc927._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_3_d9f725de41a8572c85e4c6d9b4bcc927._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment
index 7efd583c0..7efd583c0 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_4_f52492e4cc6f965515800bd1c0e05c90._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_5_5b36656fc5fa124e763f06711d9da32b._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_5_5b36656fc5fa124e763f06711d9da32b._comment
index 494aab7a8..494aab7a8 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_5_5b36656fc5fa124e763f06711d9da32b._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_5_5b36656fc5fa124e763f06711d9da32b._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_6_285215a4466806baf85b8606f680494a._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_6_285215a4466806baf85b8606f680494a._comment
index d0545153f..d0545153f 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_6_285215a4466806baf85b8606f680494a._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_6_285215a4466806baf85b8606f680494a._comment
diff --git a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_7_15bf62e46db4b84ed3156f550f03de42._comment b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_7_15bf62e46db4b84ed3156f550f03de42._comment
index 484db1e81..484db1e81 100644
--- a/doc/todo/wishlist:_an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_7_15bf62e46db4b84ed3156f550f03de42._comment
+++ b/doc/todo/wishlist__58___an___34__assistant__34___for_web-browsing_--_tracking_the_sources_of_the_downloads/comment_7_15bf62e46db4b84ed3156f550f03de42._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync.mdwn b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync.mdwn
index 873988eea..873988eea 100644
--- a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync.mdwn
+++ b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync.mdwn
diff --git a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync/comment_1_db632de391ce9fce42af51a770ed3aeb._comment b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync/comment_1_db632de391ce9fce42af51a770ed3aeb._comment
index e402d26c3..e402d26c3 100644
--- a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync/comment_1_db632de391ce9fce42af51a770ed3aeb._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync/comment_1_db632de391ce9fce42af51a770ed3aeb._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync/comment_2_4a0931d9884054d764fde315d4fe4851._comment b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync/comment_2_4a0931d9884054d764fde315d4fe4851._comment
index 0e24014d2..0e24014d2 100644
--- a/doc/todo/wishlist:_annex.largefiles_configuration_in_webapp_and_sync/comment_2_4a0931d9884054d764fde315d4fe4851._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_configuration_in_webapp_and_sync/comment_2_4a0931d9884054d764fde315d4fe4851._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes.mdwn b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes.mdwn
index b64eb45cc..b64eb45cc 100644
--- a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes.mdwn
+++ b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes.mdwn
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_1_304431bb62b5b8a64edc37a11bbaff59._comment b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_1_304431bb62b5b8a64edc37a11bbaff59._comment
index b06008475..b06008475 100644
--- a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_1_304431bb62b5b8a64edc37a11bbaff59._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_1_304431bb62b5b8a64edc37a11bbaff59._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_2_975edca7ec87158216d9e106903dfb48._comment b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_2_975edca7ec87158216d9e106903dfb48._comment
index ba88bfb7c..ba88bfb7c 100644
--- a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_2_975edca7ec87158216d9e106903dfb48._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_2_975edca7ec87158216d9e106903dfb48._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_3_b2774d265de303143523607053811d23._comment b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_3_b2774d265de303143523607053811d23._comment
index b2bcd87eb..b2bcd87eb 100644
--- a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_3_b2774d265de303143523607053811d23._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_3_b2774d265de303143523607053811d23._comment
diff --git a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_4_d06a7c7f1a4fe78af548e2af2fbe8e2b._comment b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_4_d06a7c7f1a4fe78af548e2af2fbe8e2b._comment
index c379c735f..c379c735f 100644
--- a/doc/todo/wishlist:_annex.largefiles_support_for_mimetypes/comment_4_d06a7c7f1a4fe78af548e2af2fbe8e2b._comment
+++ b/doc/todo/wishlist__58___annex.largefiles_support_for_mimetypes/comment_4_d06a7c7f1a4fe78af548e2af2fbe8e2b._comment
diff --git a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space.mdwn b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space.mdwn
index acc8b363e..acc8b363e 100644
--- a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space.mdwn
+++ b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space.mdwn
diff --git a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space/comment_1_6813fdc7ecc98765a5d35d34163a1712._comment b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space/comment_1_6813fdc7ecc98765a5d35d34163a1712._comment
index 89fe4c069..89fe4c069 100644
--- a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space/comment_1_6813fdc7ecc98765a5d35d34163a1712._comment
+++ b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space/comment_1_6813fdc7ecc98765a5d35d34163a1712._comment
diff --git a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space/comment_2_21a249cedca1ceb80d10784004735524._comment b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space/comment_2_21a249cedca1ceb80d10784004735524._comment
index d2b29c239..d2b29c239 100644
--- a/doc/todo/wishlist:_archive_from_remote_with_the_least_free_space/comment_2_21a249cedca1ceb80d10784004735524._comment
+++ b/doc/todo/wishlist__58___archive_from_remote_with_the_least_free_space/comment_2_21a249cedca1ceb80d10784004735524._comment
diff --git a/doc/todo/wishlist:_derived_content_support.mdwn b/doc/todo/wishlist__58___derived_content_support.mdwn
index 19556a13e..19556a13e 100644
--- a/doc/todo/wishlist:_derived_content_support.mdwn
+++ b/doc/todo/wishlist__58___derived_content_support.mdwn
diff --git a/doc/todo/wishlist:_disable_automatic_commits.mdwn b/doc/todo/wishlist__58___disable_automatic_commits.mdwn
index 03ed40211..03ed40211 100644
--- a/doc/todo/wishlist:_disable_automatic_commits.mdwn
+++ b/doc/todo/wishlist__58___disable_automatic_commits.mdwn
diff --git a/doc/todo/wishlist:_display_status_of_remotes_in_the_webapp.mdwn b/doc/todo/wishlist__58___display_status_of_remotes_in_the_webapp.mdwn
index 741466994..741466994 100644
--- a/doc/todo/wishlist:_display_status_of_remotes_in_the_webapp.mdwn
+++ b/doc/todo/wishlist__58___display_status_of_remotes_in_the_webapp.mdwn
diff --git a/doc/todo/wishlist:_do_not_import_new_files.mdwn b/doc/todo/wishlist__58___do_not_import_new_files.mdwn
index 62dc6334a..62dc6334a 100644
--- a/doc/todo/wishlist:_do_not_import_new_files.mdwn
+++ b/doc/todo/wishlist__58___do_not_import_new_files.mdwn
diff --git a/doc/todo/wishlist:_do_not_import_new_files/comment_1_b41c214599d6601257a9d824cebbffcc._comment b/doc/todo/wishlist__58___do_not_import_new_files/comment_1_b41c214599d6601257a9d824cebbffcc._comment
index fbb5571cb..fbb5571cb 100644
--- a/doc/todo/wishlist:_do_not_import_new_files/comment_1_b41c214599d6601257a9d824cebbffcc._comment
+++ b/doc/todo/wishlist__58___do_not_import_new_files/comment_1_b41c214599d6601257a9d824cebbffcc._comment
diff --git a/doc/todo/wishlist:_do_not_import_new_files/comment_2_7b26171458baaf5c0057276d2d97e14c._comment b/doc/todo/wishlist__58___do_not_import_new_files/comment_2_7b26171458baaf5c0057276d2d97e14c._comment
index bedf9a54c..bedf9a54c 100644
--- a/doc/todo/wishlist:_do_not_import_new_files/comment_2_7b26171458baaf5c0057276d2d97e14c._comment
+++ b/doc/todo/wishlist__58___do_not_import_new_files/comment_2_7b26171458baaf5c0057276d2d97e14c._comment
diff --git a/doc/todo/wishlist:_do_not_import_new_files/comment_3_6f80ce6cee4519d4f69193d5086e194a._comment b/doc/todo/wishlist__58___do_not_import_new_files/comment_3_6f80ce6cee4519d4f69193d5086e194a._comment
index e66cc5ea9..e66cc5ea9 100644
--- a/doc/todo/wishlist:_do_not_import_new_files/comment_3_6f80ce6cee4519d4f69193d5086e194a._comment
+++ b/doc/todo/wishlist__58___do_not_import_new_files/comment_3_6f80ce6cee4519d4f69193d5086e194a._comment
diff --git a/doc/todo/wishlist:_do_not_import_new_files/comment_4_22a7a03c30174e42e6d8e639e31e1d34._comment b/doc/todo/wishlist__58___do_not_import_new_files/comment_4_22a7a03c30174e42e6d8e639e31e1d34._comment
index f53fb6395..f53fb6395 100644
--- a/doc/todo/wishlist:_do_not_import_new_files/comment_4_22a7a03c30174e42e6d8e639e31e1d34._comment
+++ b/doc/todo/wishlist__58___do_not_import_new_files/comment_4_22a7a03c30174e42e6d8e639e31e1d34._comment
diff --git a/doc/todo/wishlist:_do_not_import_new_files/comment_5_4294e92e2f4efb9dd10b280f5c9843f7._comment b/doc/todo/wishlist__58___do_not_import_new_files/comment_5_4294e92e2f4efb9dd10b280f5c9843f7._comment
index e312c083d..e312c083d 100644
--- a/doc/todo/wishlist:_do_not_import_new_files/comment_5_4294e92e2f4efb9dd10b280f5c9843f7._comment
+++ b/doc/todo/wishlist__58___do_not_import_new_files/comment_5_4294e92e2f4efb9dd10b280f5c9843f7._comment
diff --git a/doc/todo/wishlist:_do_round_robin_downloading_of_data.mdwn b/doc/todo/wishlist__58___do_round_robin_downloading_of_data.mdwn
index 6299899e4..6299899e4 100644
--- a/doc/todo/wishlist:_do_round_robin_downloading_of_data.mdwn
+++ b/doc/todo/wishlist__58___do_round_robin_downloading_of_data.mdwn
diff --git a/doc/todo/wishlist:_do_round_robin_downloading_of_data/comment_1_460335b0e59ad03871c524f1fe812357._comment b/doc/todo/wishlist__58___do_round_robin_downloading_of_data/comment_1_460335b0e59ad03871c524f1fe812357._comment
index 6a5fd3d53..6a5fd3d53 100644
--- a/doc/todo/wishlist:_do_round_robin_downloading_of_data/comment_1_460335b0e59ad03871c524f1fe812357._comment
+++ b/doc/todo/wishlist__58___do_round_robin_downloading_of_data/comment_1_460335b0e59ad03871c524f1fe812357._comment
diff --git a/doc/todo/wishlist:_encrypted_git_remote_on_hosting_site_from_webapp.mdwn b/doc/todo/wishlist__58___encrypted_git_remote_on_hosting_site_from_webapp.mdwn
index b7b1bad0c..b7b1bad0c 100644
--- a/doc/todo/wishlist:_encrypted_git_remote_on_hosting_site_from_webapp.mdwn
+++ b/doc/todo/wishlist__58___encrypted_git_remote_on_hosting_site_from_webapp.mdwn
diff --git a/doc/todo/wishlist:_generic_annex.cost-command.mdwn b/doc/todo/wishlist__58___generic_annex.cost-command.mdwn
index 6adf1460e..6adf1460e 100644
--- a/doc/todo/wishlist:_generic_annex.cost-command.mdwn
+++ b/doc/todo/wishlist__58___generic_annex.cost-command.mdwn
diff --git a/doc/todo/wishlist:_git_annex_diff.mdwn b/doc/todo/wishlist__58___git_annex_diff.mdwn
index 3af7bef6a..3af7bef6a 100644
--- a/doc/todo/wishlist:_git_annex_diff.mdwn
+++ b/doc/todo/wishlist__58___git_annex_diff.mdwn
diff --git a/doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment b/doc/todo/wishlist__58___git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment
index 86772e2fd..86772e2fd 100644
--- a/doc/todo/wishlist:_git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment
+++ b/doc/todo/wishlist__58___git_annex_diff/comment_1_16ccf2e1036d9e1a913db81988731b5a._comment
diff --git a/doc/todo/wishlist:_git_annex_diff/comment_2_2e8324f47b66dce385263e258e94da16._comment b/doc/todo/wishlist__58___git_annex_diff/comment_2_2e8324f47b66dce385263e258e94da16._comment
index 83501b791..83501b791 100644
--- a/doc/todo/wishlist:_git_annex_diff/comment_2_2e8324f47b66dce385263e258e94da16._comment
+++ b/doc/todo/wishlist__58___git_annex_diff/comment_2_2e8324f47b66dce385263e258e94da16._comment
diff --git a/doc/todo/wishlist:_git_annex_info_._also_return_numcopies_setting.mdwn b/doc/todo/wishlist__58___git_annex_info_._also_return_numcopies_setting.mdwn
index ac29c169f..ac29c169f 100644
--- a/doc/todo/wishlist:_git_annex_info_._also_return_numcopies_setting.mdwn
+++ b/doc/todo/wishlist__58___git_annex_info_._also_return_numcopies_setting.mdwn
diff --git a/doc/todo/wishlist:_git_annex_info_UUID.mdwn b/doc/todo/wishlist__58___git_annex_info_UUID.mdwn
index 5b9633e18..5b9633e18 100644
--- a/doc/todo/wishlist:_git_annex_info_UUID.mdwn
+++ b/doc/todo/wishlist__58___git_annex_info_UUID.mdwn
diff --git a/doc/todo/wishlist:_git_annex_info_UUID/comment_1_d0d40bfdafed47e9e8ef2f4cd5c8576f._comment b/doc/todo/wishlist__58___git_annex_info_UUID/comment_1_d0d40bfdafed47e9e8ef2f4cd5c8576f._comment
index ab94b7dea..ab94b7dea 100644
--- a/doc/todo/wishlist:_git_annex_info_UUID/comment_1_d0d40bfdafed47e9e8ef2f4cd5c8576f._comment
+++ b/doc/todo/wishlist__58___git_annex_info_UUID/comment_1_d0d40bfdafed47e9e8ef2f4cd5c8576f._comment
diff --git a/doc/todo/wishlist:_git_annex_info_UUID/comment_2._comment b/doc/todo/wishlist__58___git_annex_info_UUID/comment_2._comment
index 271c88798..271c88798 100644
--- a/doc/todo/wishlist:_git_annex_info_UUID/comment_2._comment
+++ b/doc/todo/wishlist__58___git_annex_info_UUID/comment_2._comment
diff --git a/doc/todo/wishlist:_global_progress_status.mdwn b/doc/todo/wishlist__58___global_progress_status.mdwn
index 3c6611af4..3c6611af4 100644
--- a/doc/todo/wishlist:_global_progress_status.mdwn
+++ b/doc/todo/wishlist__58___global_progress_status.mdwn
diff --git a/doc/todo/wishlist:_global_progress_status/comment_1_d915dce144071f768ee9bcdead07a0e5._comment b/doc/todo/wishlist__58___global_progress_status/comment_1_d915dce144071f768ee9bcdead07a0e5._comment
index 8a733f90b..8a733f90b 100644
--- a/doc/todo/wishlist:_global_progress_status/comment_1_d915dce144071f768ee9bcdead07a0e5._comment
+++ b/doc/todo/wishlist__58___global_progress_status/comment_1_d915dce144071f768ee9bcdead07a0e5._comment
diff --git a/doc/todo/wishlist:_global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment b/doc/todo/wishlist__58___global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment
index a75aea4c2..a75aea4c2 100644
--- a/doc/todo/wishlist:_global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment
+++ b/doc/todo/wishlist__58___global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment
diff --git a/doc/todo/wishlist:_history_of_operations.mdwn b/doc/todo/wishlist__58___history_of_operations.mdwn
index a79f500ff..a79f500ff 100644
--- a/doc/todo/wishlist:_history_of_operations.mdwn
+++ b/doc/todo/wishlist__58___history_of_operations.mdwn
diff --git a/doc/todo/wishlist:_history_of_operations/comment_1_f9a77ce83c6f39b6272d5c577ffbb9f9._comment b/doc/todo/wishlist__58___history_of_operations/comment_1_f9a77ce83c6f39b6272d5c577ffbb9f9._comment
index bb872532d..bb872532d 100644
--- a/doc/todo/wishlist:_history_of_operations/comment_1_f9a77ce83c6f39b6272d5c577ffbb9f9._comment
+++ b/doc/todo/wishlist__58___history_of_operations/comment_1_f9a77ce83c6f39b6272d5c577ffbb9f9._comment
diff --git a/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn b/doc/todo/wishlist__58___make_git_annex_reinject_work_in_direct_mode.mdwn
index ffdee8840..ffdee8840 100644
--- a/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn
+++ b/doc/todo/wishlist__58___make_git_annex_reinject_work_in_direct_mode.mdwn
diff --git a/doc/todo/wishlist:_make_partial_files_available_during_transfer.mdwn b/doc/todo/wishlist__58___make_partial_files_available_during_transfer.mdwn
index b021c9091..b021c9091 100644
--- a/doc/todo/wishlist:_make_partial_files_available_during_transfer.mdwn
+++ b/doc/todo/wishlist__58___make_partial_files_available_during_transfer.mdwn
diff --git a/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment b/doc/todo/wishlist__58___make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment
index c4c222431..c4c222431 100644
--- a/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment
+++ b/doc/todo/wishlist__58___make_partial_files_available_during_transfer/comment_2_8b1cfae6f2b61929a9c6f48ae63c921d._comment
diff --git a/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_3_1304a721da6f5133fdfa1dac507f1ecb._comment b/doc/todo/wishlist__58___make_partial_files_available_during_transfer/comment_3_1304a721da6f5133fdfa1dac507f1ecb._comment
index 8e955fd48..8e955fd48 100644
--- a/doc/todo/wishlist:_make_partial_files_available_during_transfer/comment_3_1304a721da6f5133fdfa1dac507f1ecb._comment
+++ b/doc/todo/wishlist__58___make_partial_files_available_during_transfer/comment_3_1304a721da6f5133fdfa1dac507f1ecb._comment
diff --git a/doc/todo/wishlist:_matching_options_for_branches.mdwn b/doc/todo/wishlist__58___matching_options_for_branches.mdwn
index 03086e0f9..03086e0f9 100644
--- a/doc/todo/wishlist:_matching_options_for_branches.mdwn
+++ b/doc/todo/wishlist__58___matching_options_for_branches.mdwn
diff --git a/doc/todo/wishlist:_matching_options_for_branches/comment_1_c0d442b646dc40d870b10098a0ee5408._comment b/doc/todo/wishlist__58___matching_options_for_branches/comment_1_c0d442b646dc40d870b10098a0ee5408._comment
index d606d80e1..d606d80e1 100644
--- a/doc/todo/wishlist:_matching_options_for_branches/comment_1_c0d442b646dc40d870b10098a0ee5408._comment
+++ b/doc/todo/wishlist__58___matching_options_for_branches/comment_1_c0d442b646dc40d870b10098a0ee5408._comment
diff --git a/doc/todo/wishlist:_more_info_in_commit_messages_in_general.mdwn b/doc/todo/wishlist__58___more_info_in_commit_messages_in_general.mdwn
index b5cf88bf8..b5cf88bf8 100644
--- a/doc/todo/wishlist:_more_info_in_commit_messages_in_general.mdwn
+++ b/doc/todo/wishlist__58___more_info_in_commit_messages_in_general.mdwn
diff --git a/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__.mdwn b/doc/todo/wishlist__58___more_info_in_the_standard_commit_message_of___96__sync__96__.mdwn
index 4e5e3a171..4e5e3a171 100644
--- a/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__.mdwn
+++ b/doc/todo/wishlist__58___more_info_in_the_standard_commit_message_of___96__sync__96__.mdwn
diff --git a/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment b/doc/todo/wishlist__58___more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment
index bede77efc..bede77efc 100644
--- a/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment
+++ b/doc/todo/wishlist__58___more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment
diff --git a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails.mdwn b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails.mdwn
index e50ebbde5..e50ebbde5 100644
--- a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails.mdwn
+++ b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails.mdwn
diff --git a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_1_82ee9de610a0ac55cd1c27c211079e5b._comment b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_1_82ee9de610a0ac55cd1c27c211079e5b._comment
index 3b6101ed5..3b6101ed5 100644
--- a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_1_82ee9de610a0ac55cd1c27c211079e5b._comment
+++ b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_1_82ee9de610a0ac55cd1c27c211079e5b._comment
diff --git a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_2_bea55156bd32cf9e6dd9b946ba1bb8c1._comment b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_2_bea55156bd32cf9e6dd9b946ba1bb8c1._comment
index 62d46bccd..62d46bccd 100644
--- a/doc/todo/wishlist:_move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_2_bea55156bd32cf9e6dd9b946ba1bb8c1._comment
+++ b/doc/todo/wishlist__58___move_pending_transfers_for_a_host_to_the_end_of_the_queue_when_one_fails/comment_2_bea55156bd32cf9e6dd9b946ba1bb8c1._comment
diff --git a/doc/todo/wishlist:_option_to_print_more_info_with___39__unused__39__.mdwn b/doc/todo/wishlist__58___option_to_print_more_info_with___39__unused__39__.mdwn
index 7a9b81f72..7a9b81f72 100644
--- a/doc/todo/wishlist:_option_to_print_more_info_with___39__unused__39__.mdwn
+++ b/doc/todo/wishlist__58___option_to_print_more_info_with___39__unused__39__.mdwn
diff --git a/doc/todo/wishlist:_pack_metadata_in_direct_mode.mdwn b/doc/todo/wishlist__58___pack_metadata_in_direct_mode.mdwn
index 1d52ff512..1d52ff512 100644
--- a/doc/todo/wishlist:_pack_metadata_in_direct_mode.mdwn
+++ b/doc/todo/wishlist__58___pack_metadata_in_direct_mode.mdwn
diff --git a/doc/todo/wishlist:_pack_metadata_in_direct_mode/comment_1_1a550d6977a255b789337c3d1602db04._comment b/doc/todo/wishlist__58___pack_metadata_in_direct_mode/comment_1_1a550d6977a255b789337c3d1602db04._comment
index 543e1c048..543e1c048 100644
--- a/doc/todo/wishlist:_pack_metadata_in_direct_mode/comment_1_1a550d6977a255b789337c3d1602db04._comment
+++ b/doc/todo/wishlist__58___pack_metadata_in_direct_mode/comment_1_1a550d6977a255b789337c3d1602db04._comment
diff --git a/doc/todo/wishlist:_pack_metadata_in_direct_mode/comment_2_3cc9c69d33c658058daea9cb5e4ab669._comment b/doc/todo/wishlist__58___pack_metadata_in_direct_mode/comment_2_3cc9c69d33c658058daea9cb5e4ab669._comment
index 5028636c4..5028636c4 100644
--- a/doc/todo/wishlist:_pack_metadata_in_direct_mode/comment_2_3cc9c69d33c658058daea9cb5e4ab669._comment
+++ b/doc/todo/wishlist__58___pack_metadata_in_direct_mode/comment_2_3cc9c69d33c658058daea9cb5e4ab669._comment
diff --git a/doc/todo/wishlist:_perform_fsck_remotely.mdwn b/doc/todo/wishlist__58___perform_fsck_remotely.mdwn
index f2187d912..f2187d912 100644
--- a/doc/todo/wishlist:_perform_fsck_remotely.mdwn
+++ b/doc/todo/wishlist__58___perform_fsck_remotely.mdwn
diff --git a/doc/todo/wishlist:_perform_fsck_remotely/comment_1_db92311dcdb1ef0ab0413f83e191c70c._comment b/doc/todo/wishlist__58___perform_fsck_remotely/comment_1_db92311dcdb1ef0ab0413f83e191c70c._comment
index 6bf6af23a..6bf6af23a 100644
--- a/doc/todo/wishlist:_perform_fsck_remotely/comment_1_db92311dcdb1ef0ab0413f83e191c70c._comment
+++ b/doc/todo/wishlist__58___perform_fsck_remotely/comment_1_db92311dcdb1ef0ab0413f83e191c70c._comment
diff --git a/doc/todo/wishlist:_perform_fsck_remotely/comment_2_2f0dbaf143d94290bfbebb6869eb7241._comment b/doc/todo/wishlist__58___perform_fsck_remotely/comment_2_2f0dbaf143d94290bfbebb6869eb7241._comment
index 5418ff991..5418ff991 100644
--- a/doc/todo/wishlist:_perform_fsck_remotely/comment_2_2f0dbaf143d94290bfbebb6869eb7241._comment
+++ b/doc/todo/wishlist__58___perform_fsck_remotely/comment_2_2f0dbaf143d94290bfbebb6869eb7241._comment
diff --git a/doc/todo/wishlist:_perform_fsck_remotely/comment_3_5ec2e0e248dfd4ca46aef89cc5658d18._comment b/doc/todo/wishlist__58___perform_fsck_remotely/comment_3_5ec2e0e248dfd4ca46aef89cc5658d18._comment
index 91d07b765..91d07b765 100644
--- a/doc/todo/wishlist:_perform_fsck_remotely/comment_3_5ec2e0e248dfd4ca46aef89cc5658d18._comment
+++ b/doc/todo/wishlist__58___perform_fsck_remotely/comment_3_5ec2e0e248dfd4ca46aef89cc5658d18._comment
diff --git a/doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn b/doc/todo/wishlist__58___print_locations_for_files_in_rsync_remote.mdwn
index 3876f2197..3876f2197 100644
--- a/doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn
+++ b/doc/todo/wishlist__58___print_locations_for_files_in_rsync_remote.mdwn
diff --git a/doc/todo/wishlist:_provide_a_config_option_for_using_new_hashing_scheme_in_non-bare_remotes.mdwn b/doc/todo/wishlist__58___provide_a_config_option_for_using_new_hashing_scheme_in_non-bare_remotes.mdwn
index b18eace9a..b18eace9a 100644
--- a/doc/todo/wishlist:_provide_a_config_option_for_using_new_hashing_scheme_in_non-bare_remotes.mdwn
+++ b/doc/todo/wishlist__58___provide_a_config_option_for_using_new_hashing_scheme_in_non-bare_remotes.mdwn
diff --git a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl.mdwn b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl.mdwn
index 2bfb90b54..2bfb90b54 100644
--- a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl.mdwn
+++ b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl.mdwn
diff --git a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl/comment_1_b79976afc2242791523e63831f30af71._comment b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl/comment_1_b79976afc2242791523e63831f30af71._comment
index caefee9a8..caefee9a8 100644
--- a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl/comment_1_b79976afc2242791523e63831f30af71._comment
+++ b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl/comment_1_b79976afc2242791523e63831f30af71._comment
diff --git a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl/comment_2_1741d2392006a9af9cfd1f3b847600b9._comment b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl/comment_2_1741d2392006a9af9cfd1f3b847600b9._comment
index 64d592479..64d592479 100644
--- a/doc/todo/wishlist:_recursive_directory_remote_setup__47__addurl/comment_2_1741d2392006a9af9cfd1f3b847600b9._comment
+++ b/doc/todo/wishlist__58___recursive_directory_remote_setup__47__addurl/comment_2_1741d2392006a9af9cfd1f3b847600b9._comment
diff --git a/doc/todo/wishlist:_rsync_efficiency.mdwn b/doc/todo/wishlist__58___rsync_efficiency.mdwn
index fe1848f1b..fe1848f1b 100644
--- a/doc/todo/wishlist:_rsync_efficiency.mdwn
+++ b/doc/todo/wishlist__58___rsync_efficiency.mdwn
diff --git a/doc/todo/wishlist:_rsync_efficiency/comment_1_6e7cceb9d23f0cad3d9f839dd2a04901._comment b/doc/todo/wishlist__58___rsync_efficiency/comment_1_6e7cceb9d23f0cad3d9f839dd2a04901._comment
index 35f6b885b..35f6b885b 100644
--- a/doc/todo/wishlist:_rsync_efficiency/comment_1_6e7cceb9d23f0cad3d9f839dd2a04901._comment
+++ b/doc/todo/wishlist__58___rsync_efficiency/comment_1_6e7cceb9d23f0cad3d9f839dd2a04901._comment
diff --git a/doc/todo/wishlist:_rsync_efficiency/comment_2_d87df8f1012f71248ed33f64f9ace17e._comment b/doc/todo/wishlist__58___rsync_efficiency/comment_2_d87df8f1012f71248ed33f64f9ace17e._comment
index 3acd6b74b..3acd6b74b 100644
--- a/doc/todo/wishlist:_rsync_efficiency/comment_2_d87df8f1012f71248ed33f64f9ace17e._comment
+++ b/doc/todo/wishlist__58___rsync_efficiency/comment_2_d87df8f1012f71248ed33f64f9ace17e._comment
diff --git a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__.mdwn b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__.mdwn
index 545bd861d..545bd861d 100644
--- a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__.mdwn
+++ b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__.mdwn
diff --git a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_1_e2c2047e7401cb95a82ffb686a732859._comment b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_1_e2c2047e7401cb95a82ffb686a732859._comment
index 80a245d14..80a245d14 100644
--- a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_1_e2c2047e7401cb95a82ffb686a732859._comment
+++ b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_1_e2c2047e7401cb95a82ffb686a732859._comment
diff --git a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_2_472b576afdb169b233edd01adcb2123d._comment b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_2_472b576afdb169b233edd01adcb2123d._comment
index c58f97c1c..c58f97c1c 100644
--- a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_2_472b576afdb169b233edd01adcb2123d._comment
+++ b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_2_472b576afdb169b233edd01adcb2123d._comment
diff --git a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment
index dac333174..dac333174 100644
--- a/doc/todo/wishlist:_spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment
+++ b/doc/todo/wishlist__58___spec.remotes_for_other_peer_network_data_stores___40__gnunet__44___freenet__41__/comment_3_b4ff519ece76c6c3fb29b981320e2e1c._comment
diff --git a/doc/todo/wishlist:_special_remote_Ubuntu_One.mdwn b/doc/todo/wishlist__58___special_remote_Ubuntu_One.mdwn
index b88a038ea..b88a038ea 100644
--- a/doc/todo/wishlist:_special_remote_Ubuntu_One.mdwn
+++ b/doc/todo/wishlist__58___special_remote_Ubuntu_One.mdwn
diff --git a/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment b/doc/todo/wishlist__58___special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment
index 4fb9bc95e..4fb9bc95e 100644
--- a/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment
+++ b/doc/todo/wishlist__58___special_remote_Ubuntu_One/comment_1_ab0c761030bc55e8fb75d1b344bb98b9._comment
diff --git a/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_2_17e948acb1e29793cf172cd6def4160b._comment b/doc/todo/wishlist__58___special_remote_Ubuntu_One/comment_2_17e948acb1e29793cf172cd6def4160b._comment
index 20230e3f9..20230e3f9 100644
--- a/doc/todo/wishlist:_special_remote_Ubuntu_One/comment_2_17e948acb1e29793cf172cd6def4160b._comment
+++ b/doc/todo/wishlist__58___special_remote_Ubuntu_One/comment_2_17e948acb1e29793cf172cd6def4160b._comment
diff --git a/doc/todo/wishlist:_swift_backend.mdwn b/doc/todo/wishlist__58___swift_backend.mdwn
index 28bd265fa..28bd265fa 100644
--- a/doc/todo/wishlist:_swift_backend.mdwn
+++ b/doc/todo/wishlist__58___swift_backend.mdwn
diff --git a/doc/todo/wishlist:_swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment b/doc/todo/wishlist__58___swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment
index 98a998c1c..98a998c1c 100644
--- a/doc/todo/wishlist:_swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment
+++ b/doc/todo/wishlist__58___swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment
diff --git a/doc/todo/wishlist:_swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment b/doc/todo/wishlist__58___swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment
index 97863b095..97863b095 100644
--- a/doc/todo/wishlist:_swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment
+++ b/doc/todo/wishlist__58___swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment
diff --git a/doc/todo/wishlist:_swift_backend/comment_3_bf8625b909c3a7321cae40e6f145e874._comment b/doc/todo/wishlist__58___swift_backend/comment_3_bf8625b909c3a7321cae40e6f145e874._comment
index 90af10c41..90af10c41 100644
--- a/doc/todo/wishlist:_swift_backend/comment_3_bf8625b909c3a7321cae40e6f145e874._comment
+++ b/doc/todo/wishlist__58___swift_backend/comment_3_bf8625b909c3a7321cae40e6f145e874._comment
diff --git a/doc/todo/wishlist:_swift_backend/comment_4_4d97d12ddd99834788e94648c8eebef9._comment b/doc/todo/wishlist__58___swift_backend/comment_4_4d97d12ddd99834788e94648c8eebef9._comment
index 21fa52aaf..21fa52aaf 100644
--- a/doc/todo/wishlist:_swift_backend/comment_4_4d97d12ddd99834788e94648c8eebef9._comment
+++ b/doc/todo/wishlist__58___swift_backend/comment_4_4d97d12ddd99834788e94648c8eebef9._comment
diff --git a/doc/todo/wishlist:_swift_backend/comment_5_1568f726f91d4589aef7ca9fcc3c957d._comment b/doc/todo/wishlist__58___swift_backend/comment_5_1568f726f91d4589aef7ca9fcc3c957d._comment
index 1f0ff9f63..1f0ff9f63 100644
--- a/doc/todo/wishlist:_swift_backend/comment_5_1568f726f91d4589aef7ca9fcc3c957d._comment
+++ b/doc/todo/wishlist__58___swift_backend/comment_5_1568f726f91d4589aef7ca9fcc3c957d._comment
diff --git a/doc/todo/wishlist:_traffic_accounting_for_git-annex.mdwn b/doc/todo/wishlist__58___traffic_accounting_for_git-annex.mdwn
index 4b661101d..4b661101d 100644
--- a/doc/todo/wishlist:_traffic_accounting_for_git-annex.mdwn
+++ b/doc/todo/wishlist__58___traffic_accounting_for_git-annex.mdwn
diff --git a/doc/todo/wishlist:_unify_directory_scheme_for_the_store.mdwn b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store.mdwn
index 83ce53127..83ce53127 100644
--- a/doc/todo/wishlist:_unify_directory_scheme_for_the_store.mdwn
+++ b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store.mdwn
diff --git a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_1_44da58beaaab359ecaba7fb905ca4ae1._comment b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_1_44da58beaaab359ecaba7fb905ca4ae1._comment
index 86c33d434..86c33d434 100644
--- a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_1_44da58beaaab359ecaba7fb905ca4ae1._comment
+++ b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_1_44da58beaaab359ecaba7fb905ca4ae1._comment
diff --git a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_2_bc698c501ecdb56df57171f4f3bb831a._comment b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_2_bc698c501ecdb56df57171f4f3bb831a._comment
index 5c5269f8c..5c5269f8c 100644
--- a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_2_bc698c501ecdb56df57171f4f3bb831a._comment
+++ b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_2_bc698c501ecdb56df57171f4f3bb831a._comment
diff --git a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment
index e6acad3b9..e6acad3b9 100644
--- a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment
+++ b/doc/todo/wishlist__58___unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones.mdwn b/doc/todo/wishlist__58___use_hardlinks_for_local_clones.mdwn
index 4b0694422..4b0694422 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones.mdwn
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones.mdwn
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_1_85064fafe472a5bd395d60ce8f7acb56._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_1_85064fafe472a5bd395d60ce8f7acb56._comment
index 4ef5f8414..4ef5f8414 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_1_85064fafe472a5bd395d60ce8f7acb56._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_1_85064fafe472a5bd395d60ce8f7acb56._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_2_ad51dced0c0146e1867830b93b520118._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_2_ad51dced0c0146e1867830b93b520118._comment
index 8476b4220..8476b4220 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_2_ad51dced0c0146e1867830b93b520118._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_2_ad51dced0c0146e1867830b93b520118._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_3_650ded07dfb4c0c598f6ae649e45760b._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_3_650ded07dfb4c0c598f6ae649e45760b._comment
index c2e5fa207..c2e5fa207 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_3_650ded07dfb4c0c598f6ae649e45760b._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_3_650ded07dfb4c0c598f6ae649e45760b._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_4_e0be9631d7f017dbff5baaabbd0e2d5c._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_4_e0be9631d7f017dbff5baaabbd0e2d5c._comment
index 69dc0a6ce..69dc0a6ce 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_4_e0be9631d7f017dbff5baaabbd0e2d5c._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_4_e0be9631d7f017dbff5baaabbd0e2d5c._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_5_90aacf46abdeab34ec8e402613da679d._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_5_90aacf46abdeab34ec8e402613da679d._comment
index 0aa945f6b..0aa945f6b 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_5_90aacf46abdeab34ec8e402613da679d._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_5_90aacf46abdeab34ec8e402613da679d._comment
diff --git a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_6_3971f77ef70c81e4bf94cd0cab1335ac._comment b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_6_3971f77ef70c81e4bf94cd0cab1335ac._comment
index 68794ce0d..68794ce0d 100644
--- a/doc/todo/wishlist:_use_hardlinks_for_local_clones/comment_6_3971f77ef70c81e4bf94cd0cab1335ac._comment
+++ b/doc/todo/wishlist__58___use_hardlinks_for_local_clones/comment_6_3971f77ef70c81e4bf94cd0cab1335ac._comment
diff --git a/doc/todo/wishlist:alias_system.mdwn b/doc/todo/wishlist__58__alias_system.mdwn
index 1f5012966..1f5012966 100644
--- a/doc/todo/wishlist:alias_system.mdwn
+++ b/doc/todo/wishlist__58__alias_system.mdwn
diff --git a/doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment b/doc/todo/wishlist__58__alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment
index ea8f2bd30..ea8f2bd30 100644
--- a/doc/todo/wishlist:alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment
+++ b/doc/todo/wishlist__58__alias_system/comment_1_5afad4b92f9a449d4a82a94ad31feec2._comment
diff --git a/doc/todo/wishlist__91__minor__93__:_add_time_stamps_to_annex_log_popups_in_webapp.mdwn b/doc/todo/wishlist__91__minor__93____58___add_time_stamps_to_annex_log_popups_in_webapp.mdwn
index e0b1b5f5f..e0b1b5f5f 100644
--- a/doc/todo/wishlist__91__minor__93__:_add_time_stamps_to_annex_log_popups_in_webapp.mdwn
+++ b/doc/todo/wishlist__91__minor__93____58___add_time_stamps_to_annex_log_popups_in_webapp.mdwn
diff --git a/doc/todo/wishlist__91__minor__93__:_add_time_stamps_to_annex_log_popups_in_webapp/comment_1_ec90432a7d46383071401b05243d621f._comment b/doc/todo/wishlist__91__minor__93____58___add_time_stamps_to_annex_log_popups_in_webapp/comment_1_ec90432a7d46383071401b05243d621f._comment
index 97760e739..97760e739 100644
--- a/doc/todo/wishlist__91__minor__93__:_add_time_stamps_to_annex_log_popups_in_webapp/comment_1_ec90432a7d46383071401b05243d621f._comment
+++ b/doc/todo/wishlist__91__minor__93____58___add_time_stamps_to_annex_log_popups_in_webapp/comment_1_ec90432a7d46383071401b05243d621f._comment
diff --git a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote.mdwn b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote.mdwn
index fe32f7dd7..fe32f7dd7 100644
--- a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote.mdwn
+++ b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote.mdwn
diff --git a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_1_13737dc99aa877b309f7ebe44ecbafee._comment b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_1_13737dc99aa877b309f7ebe44ecbafee._comment
index d8e3f9337..d8e3f9337 100644
--- a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_1_13737dc99aa877b309f7ebe44ecbafee._comment
+++ b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_1_13737dc99aa877b309f7ebe44ecbafee._comment
diff --git a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_2_06230669218541ac392d674bedd43176._comment b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_2_06230669218541ac392d674bedd43176._comment
index 79ebb5e7c..79ebb5e7c 100644
--- a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_2_06230669218541ac392d674bedd43176._comment
+++ b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_2_06230669218541ac392d674bedd43176._comment
diff --git a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_3_002afd775b82a0ced609c8305803a6c2._comment b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_3_002afd775b82a0ced609c8305803a6c2._comment
index 2515349a6..2515349a6 100644
--- a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_3_002afd775b82a0ced609c8305803a6c2._comment
+++ b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_3_002afd775b82a0ced609c8305803a6c2._comment
diff --git a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_4_9e8fdc41fdefcb8be0d6bae7cd4a04a9._comment b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_4_9e8fdc41fdefcb8be0d6bae7cd4a04a9._comment
index 06d16239a..06d16239a 100644
--- a/doc/todo/wishlist__91__webapp__93__:_add_an_option_to_install__SSH_key_on_remote/comment_4_9e8fdc41fdefcb8be0d6bae7cd4a04a9._comment
+++ b/doc/todo/wishlist__91__webapp__93____58___add_an_option_to_install__SSH_key_on_remote/comment_4_9e8fdc41fdefcb8be0d6bae7cd4a04a9._comment
diff --git a/doc/users/datalad.mdwn b/doc/users/datalad.mdwn
new file mode 100644
index 000000000..1aad07cf6
--- /dev/null
+++ b/doc/users/datalad.mdwn
@@ -0,0 +1,23 @@
+TODOs for DataLad
+=================
+
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
+(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0]]
+
+Done
+----
+
+[[!inline pages="todo/* and !todo/done and link(todo/done) and
+(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0]]
+
+My bugs
+=======
+
+[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
+(author(yoh) or author(mih))" sort=mtime feeds=no actions=yes archive=yes show=0  template=buglist]]
+
+Fixed
+-----
+
+[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
+(author(yoh) or author(mih))" feeds=no actions=yes archive=yes show=0  template=buglist]]
diff --git a/doc/users/mih.mdwn b/doc/users/mih.mdwn
new file mode 100644
index 000000000..1a0327a40
--- /dev/null
+++ b/doc/users/mih.mdwn
@@ -0,0 +1,23 @@
+My todos
+========
+
+[[!inline pages="todo/* and !todo/done and !link(todo/done) and
+author(mih)" sort=mtime feeds=no actions=yes archive=yes show=0]]
+
+Done
+----
+
+[[!inline pages="todo/* and !todo/done and link(todo/done) and
+author(mih)" feeds=no actions=yes archive=yes show=0]]
+
+My bugs
+=======
+
+[[!inline pages="bugs/* and !bugs/done and !link(bugs/done) and
+author(mih)" sort=mtime feeds=no actions=yes archive=yes show=0  template=buglist]]
+
+Fixed
+-----
+
+[[!inline pages="bugs/* and !bugs/done and link(bugs/done) and
+author(mih)" feeds=no actions=yes archive=yes show=0  template=buglist]]
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
index 94889864a..22c94d570 100644
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -9,18 +9,18 @@ A walkthrough of the basic features of git-annex.
 	walkthrough/renaming_files
 	walkthrough/getting_file_content
 	walkthrough/syncing
-	walkthrough/transferring_files:_When_things_go_wrong
+	walkthrough/transferring_files__58___When_things_go_wrong
 	walkthrough/removing_files
-	walkthrough/removing_files:_When_things_go_wrong
+	walkthrough/removing_files__58___When_things_go_wrong
 	walkthrough/modifying_annexed_files
 	walkthrough/using_ssh_remotes
 	walkthrough/using_special_remotes
 	walkthrough/moving_file_content_between_repositories
-	walkthrough/quiet_please:_When_git-annex_seems_to_skip_files
+	walkthrough/quiet_please__58___When_git-annex_seems_to_skip_files
 	walkthrough/using_tags_and_branches
 	walkthrough/unused_data
-	walkthrough/fsck:_verifying_your_data
-	walkthrough/fsck:_when_things_go_wrong
+	walkthrough/fsck__58___verifying_your_data
+	walkthrough/fsck__58___when_things_go_wrong
 	walkthrough/backups
 	walkthrough/automatically_managing_content
 	walkthrough/more
diff --git a/doc/walkthrough/fsck:_verifying_your_data.mdwn b/doc/walkthrough/fsck__58___verifying_your_data.mdwn
index 240014610..240014610 100644
--- a/doc/walkthrough/fsck:_verifying_your_data.mdwn
+++ b/doc/walkthrough/fsck__58___verifying_your_data.mdwn
diff --git a/doc/walkthrough/fsck:_when_things_go_wrong.mdwn b/doc/walkthrough/fsck__58___when_things_go_wrong.mdwn
index 85d9f20fe..85d9f20fe 100644
--- a/doc/walkthrough/fsck:_when_things_go_wrong.mdwn
+++ b/doc/walkthrough/fsck__58___when_things_go_wrong.mdwn
diff --git a/doc/walkthrough/quiet_please:_When_git-annex_seems_to_skip_files.mdwn b/doc/walkthrough/quiet_please__58___When_git-annex_seems_to_skip_files.mdwn
index 188ca634b..188ca634b 100644
--- a/doc/walkthrough/quiet_please:_When_git-annex_seems_to_skip_files.mdwn
+++ b/doc/walkthrough/quiet_please__58___When_git-annex_seems_to_skip_files.mdwn
diff --git a/doc/walkthrough/removing_files:_When_things_go_wrong.mdwn b/doc/walkthrough/removing_files__58___When_things_go_wrong.mdwn
index ccd2d197f..ccd2d197f 100644
--- a/doc/walkthrough/removing_files:_When_things_go_wrong.mdwn
+++ b/doc/walkthrough/removing_files__58___When_things_go_wrong.mdwn
diff --git a/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn b/doc/walkthrough/transferring_files__58___When_things_go_wrong.mdwn
index d3db8c328..d3db8c328 100644
--- a/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn
+++ b/doc/walkthrough/transferring_files__58___When_things_go_wrong.mdwn
diff --git a/doc/walkthrough/unused_data/comment_5_46acb9fbbd5ef19f65115723888f3eb6._comment b/doc/walkthrough/unused_data/comment_5_46acb9fbbd5ef19f65115723888f3eb6._comment
new file mode 100644
index 000000000..2e8af7ff5
--- /dev/null
+++ b/doc/walkthrough/unused_data/comment_5_46acb9fbbd5ef19f65115723888f3eb6._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 5"""
+ date="2016-03-14T20:33:13Z"
+ content="""
+Tom, it should suffice for your colleague to pull the new
+version from you, and then run `git annex unused` to find unused files.
+
+Now, if you have other branches or tags pointing at older versions
+of the data, those files will still be considered to be used, even if 
+the current version doesn't use them. There's a new
+`--used-refspec` option for [[git-annex unused|git-annex-unused]] that 
+you can use to specify which branches to consider to be used.
+"""]]
diff --git a/git-annex.cabal b/git-annex.cabal
index 9630948b1..1b3ce4b04 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 6.20160229
+Version: 6.20160318
 Cabal-Version: >= 1.8
 License: GPL-3
 Maintainer: Joey Hess <id@joeyh.name>
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 31c71ba72..693064045 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -44,5 +44,5 @@ main = do
 	_ <- Git.Index.override $ tmpIndex g
 	setup g
 	Git.UnionMerge.merge aref bref g
-	_ <- Git.Branch.commit "union merge" newref [aref, bref] g
+	_ <- Git.Branch.commit Git.Branch.ManualCommit False "union merge" newref [aref, bref] g
 	cleanup g
diff --git a/stack.yaml b/stack.yaml
index cb7a573a3..5f202e71d 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -23,3 +23,4 @@ resolver: lts-5.5
 extra-deps:
 - mountpoints-1.0.1
 - disk-free-space-0.1.0.1
+- process-1.3.0.0
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 261259bf4..6f49b495f 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -49,8 +49,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/build-stamp: busybox_config
 	
 $(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: git.patch
 	# This is a known-good version that the patch works with.
-	cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git reset --hard f9dc5d65ca31cb79893e1296efe37727bf58f3f3 && git am)
-	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 HAVE_CLOCK_GETTIME= prefix= DESTDIR=installed-tree
+	cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git reset --hard d9c691a759d62cef53a6cc11864a2ef4b0829244 && git am)
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 HAVE_CLOCK_GETTIME= HAVE_GETDELIM= prefix= DESTDIR=installed-tree
 	touch $@
 
 $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch
diff --git a/standalone/android/git.patch b/standalone/android/git.patch
index ecf095849..ec81aaaeb 100644
--- a/standalone/android/git.patch
+++ b/standalone/android/git.patch
@@ -1,4 +1,4 @@
-From 6134cc328f513e32895462e884487513b28029ba Mon Sep 17 00:00:00 2001
+From e0fffe80a8815e64dbc1d690c79bf006651c7642 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
 Date: Wed, 13 Aug 2014 13:50:56 -0400
 Subject: [PATCH] avoid using of chmod on android when changing config
@@ -10,17 +10,17 @@ implentations, all total shite.
  1 file changed, 4 insertions(+)
 
 diff --git a/config.c b/config.c
-index 058505c..16854b2 100644
+index 9ba40bc..a350638 100644
 --- a/config.c
 +++ b/config.c
-@@ -1634,12 +1634,14 @@ int git_config_set_multivar_in_file(const char *config_filename,
- 			MAP_PRIVATE, in_fd, 0);
+@@ -2124,12 +2124,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
  		close(in_fd);
+ 		in_fd = -1;
  
 +		/* not on android
- 		if (chmod(lock->filename, st.st_mode & 07777) < 0) {
+ 		if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
  			error("chmod on %s failed: %s",
- 				lock->filename, strerror(errno));
+ 			      get_lock_file_path(lock), strerror(errno));
  			ret = CONFIG_NO_WRITE;
  			goto out_free;
  		}
@@ -28,14 +28,14 @@ index 058505c..16854b2 100644
  
  		if (store.seen == 0)
  			store.seen = 1;
-@@ -1813,11 +1815,13 @@ int git_config_rename_section_in_file(const char *config_filename,
+@@ -2329,11 +2331,13 @@ int git_config_rename_section_in_file(const char *config_filename,
  
  	fstat(fileno(config_file), &st);
  
 +	/* not on android
- 	if (chmod(lock->filename, st.st_mode & 07777) < 0) {
+ 	if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
  		ret = error("chmod on %s failed: %s",
- 				lock->filename, strerror(errno));
+ 			    get_lock_file_path(lock), strerror(errno));
  		goto out;
  	}
 +	*/
@@ -43,5 +43,5 @@ index 058505c..16854b2 100644
  	while (fgets(buf, sizeof(buf), config_file)) {
  		int i;
 -- 
-2.1.0.rc1
+2.1.4