diff --git a/Annex.hs b/Annex.hs
--- a/Annex.hs
+++ b/Annex.hs
@@ -33,7 +33,7 @@
 ) where
 
 import "mtl" Control.Monad.Reader
-import "MonadCatchIO-transformers" Control.Monad.CatchIO
+import Control.Monad.Catch
 import Control.Concurrent
 
 import Common
@@ -77,7 +77,11 @@
 		Monad,
 		MonadIO,
 		MonadReader (MVar AnnexState),
-		MonadCatchIO,
+		MonadCatch,
+		MonadThrow,
+#if MIN_VERSION_exceptions(0,6,0)
+		MonadMask,
+#endif
 		Functor,
 		Applicative
 	)
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -25,9 +25,10 @@
 	performTransitions,
 ) where
 
-import qualified Data.ByteString.Lazy.Char8 as L
+import qualified Data.ByteString.Lazy as L
 import qualified Data.Set as S
 import qualified Data.Map as M
+import Data.Bits.Utils
 
 import Common.Annex
 import Annex.BranchState
@@ -199,7 +200,7 @@
 getHistorical date = getRef (Git.Ref.dateRef fullname date)
 
 getRef :: Ref -> FilePath -> Annex String
-getRef ref file = withIndex $ L.unpack <$> catFile ref file
+getRef ref file = withIndex $ decodeBS <$> catFile ref file
 
 {- Applies a function to modifiy the content of a file.
  -
@@ -259,7 +260,8 @@
   where
 	-- look for "parent ref" lines and return the refs
 	commitparents = map (Git.Ref . snd) . filter isparent .
-		map (toassoc . L.unpack) . L.lines
+		map (toassoc . decodeBS) . L.split newline
+	newline = c2w8 '\n'
 	toassoc = separate (== ' ')
 	isparent (k,_) = k == "parent"
 		
@@ -432,7 +434,7 @@
 			return True
   where
   	getreftransition ref = do
-		ts <- parseTransitionsStrictly "remote" . L.unpack
+		ts <- parseTransitionsStrictly "remote" . decodeBS
 			<$> catFile ref transitionsLog
 		return (ref, ts)
 
diff --git a/Annex/Exception.hs b/Annex/Exception.hs
--- a/Annex/Exception.hs
+++ b/Annex/Exception.hs
@@ -21,7 +21,7 @@
 	catchAnnex,
 ) where
 
-import qualified "MonadCatchIO-transformers" Control.Monad.CatchIO as M
+import qualified Control.Monad.Catch as M
 import Control.Exception
 
 import Common.Annex
@@ -43,7 +43,7 @@
 
 {- throw in the Annex monad -}
 throwAnnex :: Exception e => e -> Annex a
-throwAnnex = M.throw
+throwAnnex = M.throwM
 
 {- catch in the Annex monad -}
 catchAnnex :: Exception e => Annex a -> (e -> Annex a) -> Annex a
diff --git a/Annex/Journal.hs b/Annex/Journal.hs
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
@@ -13,8 +13,6 @@
 
 module Annex.Journal where
 
-import System.IO.Binary
-
 import Common.Annex
 import Annex.Exception
 import qualified Git
@@ -42,7 +40,7 @@
 	jfile <- fromRepo $ journalFile file
 	let tmpfile = tmp </> takeFileName jfile
 	liftIO $ do
-		writeBinaryFile tmpfile content
+		writeFileAnyEncoding tmpfile content
 		moveFile tmpfile jfile
 
 {- Gets any journalled content for a file in the branch. -}
@@ -54,7 +52,7 @@
  - changes. -}
 getJournalFileStale :: FilePath -> Annex (Maybe String)
 getJournalFileStale file = inRepo $ \g -> catchMaybeIO $
-	readFileStrict $ journalFile file g
+	readFileStrictAnyEncoding $ journalFile file g
 
 {- List of files that have updated content in the journal. -}
 getJournalledFiles :: JournalLocked -> Annex [FilePath]
diff --git a/Assistant/TransferSlots.hs b/Assistant/TransferSlots.hs
--- a/Assistant/TransferSlots.hs
+++ b/Assistant/TransferSlots.hs
@@ -149,7 +149,7 @@
 	 - usual cleanup. However, first check if something else is
 	 - running the transfer, to avoid removing active transfers.
 	 -}
-	go remote transferrer = ifM (liftIO $ performTransfer transferrer t $ associatedFile info)
+	go remote transferrer = ifM (liftIO $ performTransfer transferrer t info)
 		( do
 			maybe noop
 				(void . addAlert . makeAlertFiller True 
diff --git a/Assistant/TransferrerPool.hs b/Assistant/TransferrerPool.hs
--- a/Assistant/TransferrerPool.hs
+++ b/Assistant/TransferrerPool.hs
@@ -56,9 +56,9 @@
 
 {- Requests that a Transferrer perform a Transfer, and waits for it to
  - finish. -}
-performTransfer :: Transferrer -> Transfer -> AssociatedFile -> IO Bool
-performTransfer transferrer t f = catchBoolIO $ do
-	T.sendRequest t f (transferrerWrite transferrer)
+performTransfer :: Transferrer -> Transfer -> TransferInfo -> IO Bool
+performTransfer transferrer t info = catchBoolIO $ do
+	T.sendRequest t info (transferrerWrite transferrer)
 	T.readResponse (transferrerRead transferrer)
 
 {- Starts a new git-annex transferkeys process, setting up handles
diff --git a/Assistant/Types/NetMessager.hs b/Assistant/Types/NetMessager.hs
--- a/Assistant/Types/NetMessager.hs
+++ b/Assistant/Types/NetMessager.hs
@@ -12,13 +12,13 @@
 import Git.Types
 
 import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 import qualified Data.Set as S
 import qualified Data.Map as M
 import qualified Data.DList as D
 import Control.Concurrent.STM
 import Control.Concurrent.MSampleVar
 import Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as B8
 import Data.Text (Text)
 
 {- Messages that can be sent out of band by a network messager. -}
@@ -85,7 +85,7 @@
 		SendPackOutput n _ -> SendPackOutput n elided
 		s -> s
   where
-  	elided = B8.pack "<elided>"
+  	elided = T.encodeUtf8 $ T.pack "<elided>"
 logNetMessage (PairingNotification stage c uuid) =
 	show $ PairingNotification stage (logClientID c) uuid
 logNetMessage m = show m
diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -222,18 +222,18 @@
 {- Finds where the old version was installed. -}
 oldVersionLocation :: IO FilePath
 oldVersionLocation = do
-#ifdef darwin_HOST_OS
 	pdir <- parentDir <$> readProgramFile
+#ifdef darwin_HOST_OS
 	let dirs = splitDirectories pdir
 	{- It will probably be deep inside a git-annex.app directory. -}
 	let olddir = case findIndex ("git-annex.app" `isPrefixOf`) dirs of
 		Nothing -> pdir
 		Just i -> joinPath (take (i + 1) dirs)
 #else
-	olddir <- parentDir <$> readProgramFile
+	let olddir = pdir
 #endif
 	when (null olddir) $
-		error $ "Cannot find old distribution bundle; not upgrading."
+		error $ "Cannot find old distribution bundle; not upgrading. (Looked in " ++ pdir ++ ")"
 	return olddir
 
 {- Finds a place to install the new version.
diff --git a/Assistant/WebApp/Bootstrap3.hs b/Assistant/WebApp/Bootstrap3.hs
--- a/Assistant/WebApp/Bootstrap3.hs
+++ b/Assistant/WebApp/Bootstrap3.hs
@@ -177,14 +177,14 @@
                       <label .sr-only for=#{fvId view}>#{fvLabel view}
                     ^{fvInput view}
                     ^{helpWidget view}
-                  $of f@(BootstrapHorizontalForm _ _ _ _)
+                  $of BootstrapHorizontalForm _a _b _c _d
                     $if nequals (fvId view) bootstrapSubmitId
-                      <label .control-label .#{toOffset (bflLabelOffset f)} .#{toColumn (bflLabelSize f)} for=#{fvId view}>#{fvLabel view}
-                      <div .#{toOffset (bflInputOffset f)} .#{toColumn (bflInputSize f)}>
+                      <label .control-label .#{toOffset (bflLabelOffset formLayout)} .#{toColumn (bflLabelSize formLayout)} for=#{fvId view}>#{fvLabel view}
+                      <div .#{toOffset (bflInputOffset formLayout)} .#{toColumn (bflInputSize formLayout)}>
                         ^{fvInput view}
                         ^{helpWidget view}
                     $else
-                      <div .#{toOffset (addGO (bflInputOffset f) (addGO (bflLabelOffset f) (bflLabelSize f)))} .#{toColumn (bflInputSize f)}>
+                      <div .#{toOffset (addGO (bflInputOffset formLayout) (addGO (bflLabelOffset formLayout) (bflLabelSize formLayout)))} .#{toColumn (bflInputSize formLayout)}>
                         ^{fvInput view}
                         ^{helpWidget view}
                 |]
diff --git a/Assistant/WebApp/Configurators/.Local.hs.swp b/Assistant/WebApp/Configurators/.Local.hs.swp
new file mode 100644
Binary files /dev/null and b/Assistant/WebApp/Configurators/.Local.hs.swp differ
diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs
--- a/Assistant/WebApp/Configurators/Ssh.hs
+++ b/Assistant/WebApp/Configurators/Ssh.hs
@@ -91,14 +91,16 @@
 #else
 sshInputAForm :: Field WebApp WebApp Text -> SshInput -> AForm WebApp WebApp SshInput
 #endif
-sshInputAForm hostnamefield def = SshInput
-	<$> aopt check_hostname (bfs "Host name") (Just $ inputHostname def)
-	<*> aopt check_username (bfs "User name") (Just $ inputUsername def)
-	<*> areq (selectFieldList authmethods) (bfs "Authenticate with") (Just $ inputAuthMethod def)
-	<*> aopt passwordField (bfs "Password") Nothing
-	<*> aopt textField (bfs "Directory") (Just $ Just $ fromMaybe (T.pack gitAnnexAssistantDefaultDir) $ inputDirectory def)
-	<*> areq intField (bfs "Port") (Just $ inputPort def)
+sshInputAForm hostnamefield def = normalize <$> gen
   where
+	gen = SshInput
+		<$> aopt check_hostname (bfs "Host name") (Just $ inputHostname def)
+		<*> aopt check_username (bfs "User name") (Just $ inputUsername def)
+		<*> areq (selectFieldList authmethods) (bfs "Authenticate with") (Just $ inputAuthMethod def)
+		<*> aopt passwordField (bfs "Password") Nothing
+		<*> aopt textField (bfs "Directory") (Just $ Just $ fromMaybe (T.pack gitAnnexAssistantDefaultDir) $ inputDirectory def)
+		<*> areq intField (bfs "Port") (Just $ inputPort def)
+	
 	authmethods :: [(Text, AuthMethod)]
 	authmethods =
 		[ ("password", Password)
@@ -129,6 +131,12 @@
 	check_hostname = hostnamefield -- unchecked
 #endif
 
+	-- The directory is implicitly in home, so remove any leading ~/
+	normalize i = i { inputDirectory = normalizedir <$> inputDirectory i }
+	normalizedir d
+		| "~/" `T.isPrefixOf` d = T.drop 2 d
+		| otherwise = d
+
 data ServerStatus
 	= UntestedServer
 	| UnusableServer Text -- reason why it's not usable
@@ -166,7 +174,7 @@
 getEnableRsyncR :: UUID -> Handler Html
 getEnableRsyncR = postEnableRsyncR
 postEnableRsyncR :: UUID -> Handler Html
-postEnableRsyncR = enableSpecialSshRemote getsshinput enableRsyncNet enablersync
+postEnableRsyncR = enableSshRemote getsshinput enableRsyncNet enablersync
   where
 	enablersync sshdata u = redirect $ ConfirmSshR
 		(sshdata { sshCapabilities = [RsyncCapable] }) u
@@ -178,7 +186,7 @@
 getEnableSshGCryptR = postEnableSshGCryptR
 postEnableSshGCryptR :: UUID -> Handler Html
 postEnableSshGCryptR u = whenGcryptInstalled $
-	enableSpecialSshRemote getsshinput enableRsyncNetGCrypt enablegcrypt u
+	enableSshRemote getsshinput enableRsyncNetGCrypt enablegcrypt u
   where
   	enablegcrypt sshdata _ = prepSsh False sshdata $ \sshdata' ->
 		sshConfigurator $
@@ -186,13 +194,21 @@
 				error "Expected to find an encrypted git repository, but did not."
 	getsshinput = parseSshUrl <=< M.lookup "gitrepo"
 
-{- To enable a special remote that uses ssh as its transport, 
- - parse a config key to get its url, and display a form whose
- - only real purpose is to check if ssh public keys need to be
- - set up.
+getEnableSshGitRemoteR :: UUID -> Handler Html
+getEnableSshGitRemoteR = postEnableSshGitRemoteR
+postEnableSshGitRemoteR :: UUID -> Handler Html
+postEnableSshGitRemoteR = enableSshRemote getsshinput enableRsyncNet enablesshgitremote
+  where
+	enablesshgitremote sshdata u = redirect $ ConfirmSshR sshdata u
+
+	getsshinput = parseSshUrl <=< M.lookup "location"
+
+{- To enable a remote that uses ssh as its transport, 
+ - parse a config key to get its url, and display a form
+ - to prompt for its password.
  -}
-enableSpecialSshRemote :: (RemoteConfig -> Maybe SshData) -> (SshInput -> RemoteName -> Handler Html) -> (SshData -> UUID -> Handler Html) -> UUID -> Handler Html
-enableSpecialSshRemote getsshinput rsyncnetsetup genericsetup u = do
+enableSshRemote :: (RemoteConfig -> Maybe SshData) -> (SshInput -> RemoteName -> Handler Html) -> (SshData -> UUID -> Handler Html) -> UUID -> Handler Html
+enableSshRemote getsshinput rsyncnetsetup genericsetup u = do
 	m <- fromMaybe M.empty . M.lookup u <$> liftAnnex readRemoteLog
 	case (mkSshInput . unmangle <$> getsshinput m, M.lookup "name" m) of
 		(Just sshinput, Just reponame) -> sshConfigurator $ do
@@ -509,21 +525,32 @@
 
 makeSshRepo :: SshData -> Handler Html
 makeSshRepo sshdata
-	| onlyCapability sshdata RsyncCapable = setupCloudRemote TransferGroup Nothing go
-	| otherwise = makeSshRepoConnection go
+	| onlyCapability sshdata RsyncCapable = setupCloudRemote TransferGroup Nothing mk
+	| otherwise = makeSshRepoConnection mk setup
   where
-	go = makeSshRemote sshdata
+	mk = makeSshRemote sshdata
+	-- Record the location of the ssh remote in the remote log, so it
+	-- can easily be enabled elsewhere using the webapp.
+	setup r = do
+		m <- readRemoteLog
+		let c = fromMaybe M.empty (M.lookup (Remote.uuid r) m)
+		let c' = M.insert "location" (genSshUrl sshdata) $
+			M.insert "type" "git" $
+			M.insert "name" (fromMaybe (Remote.name r) (M.lookup "name" c)) c
+		configSet (Remote.uuid r) c'
 
-makeSshRepoConnection :: Annex RemoteName -> Handler Html
-makeSshRepoConnection a = setupRemote postsetup TransferGroup Nothing a
+makeSshRepoConnection :: Annex RemoteName -> (Remote -> Annex ()) -> Handler Html
+makeSshRepoConnection mk setup = setupRemote postsetup TransferGroup Nothing mk
   where
-	postsetup u = do
+	postsetup r = do
 		liftAssistant $ sendRemoteControl RELOAD
-		redirect $ EditNewRepositoryR u
+		liftAnnex $ setup r
+		redirect $ EditNewRepositoryR (Remote.uuid r)
 
 makeGCryptRepo :: KeyId -> SshData -> Handler Html
-makeGCryptRepo keyid sshdata = makeSshRepoConnection $ 
-	makeGCryptRemote (sshRepoName sshdata) (genSshUrl sshdata) keyid
+makeGCryptRepo keyid sshdata = makeSshRepoConnection mk (const noop)
+  where
+	mk = makeGCryptRemote (sshRepoName sshdata) (genSshUrl sshdata) keyid
 
 getAddRsyncNetR :: Handler Html
 getAddRsyncNetR = postAddRsyncNetR
diff --git a/Assistant/WebApp/MakeRemote.hs b/Assistant/WebApp/MakeRemote.hs
--- a/Assistant/WebApp/MakeRemote.hs
+++ b/Assistant/WebApp/MakeRemote.hs
@@ -31,13 +31,13 @@
  - This includes displaying the connectionNeeded nudge if appropariate.
  -}
 setupCloudRemote :: StandardGroup -> Maybe Cost -> Annex RemoteName -> Handler a
-setupCloudRemote = setupRemote $ redirect . EditNewCloudRepositoryR
+setupCloudRemote = setupRemote $ redirect . EditNewCloudRepositoryR . Remote.uuid
 
-setupRemote :: (UUID -> Handler a) -> StandardGroup -> Maybe Cost -> Annex RemoteName -> Handler a
+setupRemote :: (Remote -> Handler a) -> StandardGroup -> Maybe Cost -> Annex RemoteName -> Handler a
 setupRemote postsetup defaultgroup mcost getname = do
 	r <- liftAnnex $ addRemote getname
 	liftAnnex $ do
 		setStandardGroup (Remote.uuid r) defaultgroup
 		maybe noop (Config.setRemoteCost (Remote.repo r)) mcost
 	liftAssistant $ syncRemote r
-	postsetup $ Remote.uuid r
+	postsetup r
diff --git a/Assistant/WebApp/RepoList.hs b/Assistant/WebApp/RepoList.hs
--- a/Assistant/WebApp/RepoList.hs
+++ b/Assistant/WebApp/RepoList.hs
@@ -189,6 +189,11 @@
 				Just rr	| remoteLocationIsUrl (parseRemoteLocation rr g) ->
 					val True EnableSshGCryptR
 				_ -> Nothing
+		Just "git" -> 
+			case getconfig "location" of
+				Just loc | remoteLocationIsSshUrl (parseRemoteLocation loc g) ->
+					val True EnableSshGitRemoteR
+				_ -> Nothing
 		_ -> Nothing
 	  where
 	  	getconfig k = M.lookup k =<< M.lookup u m
diff --git a/Assistant/WebApp/routes b/Assistant/WebApp/routes
--- a/Assistant/WebApp/routes
+++ b/Assistant/WebApp/routes
@@ -81,6 +81,7 @@
 /config/repository/enable/IA/#UUID EnableIAR GET POST
 /config/repository/enable/glacier/#UUID EnableGlacierR GET POST
 /config/repository/enable/webdav/#UUID EnableWebDAVR GET POST
+/config/repository/enable/sshgitremote/#UUID EnableSshGitRemoteR GET POST
 
 /config/repository/reorder RepositoriesReorderR GET
 
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -536,7 +536,11 @@
 		void $ char ':'
 		if length s < 5
 			then unexpected "too short to be a namespace"
-			else hstoken
+			else do
+				t <- hstoken
+				case t of
+					(c:r) | isUpper c && "." `isInfixOf` r -> return t
+					_ -> unexpected "not a module qualified symbol"
 
 	hstoken :: Parser String
 	hstoken = do
diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,31 @@
+git-annex (5.20140529) unstable; urgency=medium
+
+  * Fix encoding of data written to git-annex branch. Avoid truncating
+    unicode characters to 8 bits. Allow any encoding to be used, as with
+    filenames (but utf8 is the sane choice). Affects metadata and repository
+    descriptions, and preferred content expressions.
+  * assistant: When there are multiple remotes giving different ways
+    to access the same repository, honor remote cost settings and use
+    the cheapest available.
+  * webapp: More robust startup when annex directory is not a git repo.
+  * initremote/enableremote: Basic support for using with regular git remotes;
+    initremote stores the location of an already existing git remote,
+    and enableremote setups up a remote using its stored location.
+  * webapp: Support for enabling known git repositories on ssh servers.
+    The repository must have been added using initremote.
+  * webapp: When setting up a ssh remote, record it using initremote,
+    so that it can be easily enabled elsewhere.
+  * webapp: When setting up a ssh remote, if the user inputs ~/foo,
+    normalize that to foo, since it's in the home directory by default.
+  * Use exceptions in place of deprecated MonadCatchIO-transformers
+    Thanks, Ben Gamari.
+  * android: Run busybox install with -s, since some versions of Android
+    prohibit making hard links.
+  * Android webapp: Fix EvilSplicer bugs that mangled the css files,
+    preventing icons from displaying, and also slightly broke the js files.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 29 May 2014 14:41:56 -0400
+
 git-annex (5.20140517) unstable; urgency=medium
 
   * webapp: Switched to bootstrap 3.
diff --git a/Command/TransferKeys.hs b/Command/TransferKeys.hs
--- a/Command/TransferKeys.hs
+++ b/Command/TransferKeys.hs
@@ -17,6 +17,7 @@
 import qualified Remote
 import Types.Key
 import Utility.SimpleProtocol (ioHandles)
+import Git.Types (RemoteName)
 
 data TransferRequest = TransferRequest Direction Remote Key AssociatedFile
 
@@ -56,13 +57,13 @@
 		fileEncoding writeh
 	go =<< readrequests
   where
-  	go (d:u:k:f:rest) = do
-		case (deserialize d, deserialize u, deserialize k, deserialize f) of
-			(Just direction, Just uuid, Just key, Just file) -> do
-				mremote <- Remote.remoteFromUUID uuid
+  	go (d:rn:k:f:rest) = do
+		case (deserialize d, deserialize rn, deserialize k, deserialize f) of
+			(Just direction, Just remotename, Just key, Just file) -> do
+				mremote <- Remote.byName' remotename
 				case mremote of
-					Nothing -> sendresult False
-					Just remote -> sendresult =<< a
+					Left _ -> sendresult False
+					Right remote -> sendresult =<< a
 						(TransferRequest direction remote key file)
 			_ -> sendresult False
 		go rest
@@ -75,13 +76,15 @@
 		hPutStrLn writeh $ serialize b
 		hFlush writeh
 
-sendRequest :: Transfer -> AssociatedFile -> Handle -> IO ()
-sendRequest t f h = do
+sendRequest :: Transfer -> TransferInfo -> Handle -> IO ()
+sendRequest t info h = do
 	hPutStr h $ intercalate fieldSep
 		[ serialize (transferDirection t)
-		, serialize (transferUUID t)
+		, maybe (serialize (fromUUID (transferUUID t)))
+			(serialize . Remote.name)
+			(transferRemote info)
 		, serialize (transferKey t)
-		, serialize f
+		, serialize (associatedFile info)
 		, "" -- adds a trailing null
 		]
 	hFlush h
@@ -116,9 +119,9 @@
 	deserialize "" = Just Nothing
 	deserialize f = Just $ Just f
 
-instance TCSerialized UUID where
-	serialize = fromUUID
-	deserialize = Just . toUUID
+instance TCSerialized RemoteName where
+	serialize n = n
+	deserialize n = Just n
 
 instance TCSerialized Key where
 	serialize = key2file
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -59,13 +59,14 @@
 start' allowauto listenhost = do
 	liftIO ensureInstalled
 	ifM isInitialized 
-		( go
-		, auto
+		( maybe notinitialized (go <=< needsUpgrade) =<< getVersion
+		, if allowauto
+			then liftIO $ startNoRepo []
+			else notinitialized
 		)
 	stop
   where
-	go = do
-		cannotrun <- needsUpgrade . fromMaybe (error "annex.version is not set.. seems this repository has not been initialized by git-annex") =<< getVersion
+	go cannotrun = do
 		browser <- fromRepo webBrowser
 		f <- liftIO . absPath =<< fromRepo gitAnnexHtmlShim
 		listenhost' <- if isJust listenhost
@@ -87,15 +88,14 @@
 							then maybe noop (`hPutStrLn` url) origout
 							else openBrowser browser htmlshim url origout origerr
 			)
-	auto
-		| allowauto = liftIO $ startNoRepo []
-		| otherwise = do
-			d <- liftIO getCurrentDirectory
-			error $ "no git repository in " ++ d
 	checkpid = do
 		pidfile <- fromRepo gitAnnexPidFile
 		liftIO $ isJust <$> checkDaemon pidfile
 	checkshim f = liftIO $ doesFileExist f
+	notinitialized = do
+		g <- Annex.gitRepo
+		liftIO $ cannotStartIn (Git.repoLocation g) "repository has not been initialized by git-annex"
+		liftIO $ firstRun listenhost
 
 {- When run without a repo, start the first available listed repository in
  - the autostart file. If none, it's our first time being run! -}
@@ -116,13 +116,16 @@
 			Annex.new =<< Git.CurrentRepo.get
 		case v of
 			Left e -> do
-				warningIO $ "unable to start webapp in " ++ d ++ ": " ++ show e
+				cannotStartIn d (show e)
 				go listenhost ds
 			Right state -> void $ Annex.eval state $ do
 				whenM (fromRepo Git.repoIsLocalBare) $
 					error $ d ++ " is a bare git repository, cannot run the webapp in it"
 				callCommandAction $
 					start' False listenhost
+
+cannotStartIn :: FilePath -> String -> IO ()
+cannotStartIn d reason = warningIO $ "unable to start webapp in repository " ++ d ++ ": " ++ reason
 
 {- Run the webapp without a repository, which prompts the user, makes one,
  - changes to it, starts the regular assistant, and redirects the
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,7 @@
 # Some additional dependencies needed by the expanded splices.
 	sed -i 's/^  Build-Depends: /  Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/no-th-tree/git-annex.cabal
 # Avoid warnings due to sometimes unused imports added for the splices.
-	sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/no-th-tree/git-annex.cabal
+	sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports -XMagicHash /i' tmp/no-th-tree/git-annex.cabal
 
 # Run on the arm system, after stage1
 no-th-webapp-stage2: 
@@ -215,7 +215,7 @@
 # Some additional dependencies needed by the expanded splices.
 	sed -i 's/^  Build-Depends: /  Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/androidtree/git-annex.cabal
 # Avoid warnings due to sometimes unused imports added for the splices.
-	sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal
+	sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports -XMagicHash /i' tmp/androidtree/git-annex.cabal
 # Cabal cannot cross compile with custom build type, so workaround.
 	sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal
 # Build just once, but link twice, for 2 different versions of Android.
diff --git a/Remote.hs b/Remote.hs
--- a/Remote.hs
+++ b/Remote.hs
@@ -25,6 +25,7 @@
 	remoteMap',
 	uuidDescriptions,
 	byName,
+	byName',
 	byNameOnly,
 	byNameWithUUID,
 	byCost,
diff --git a/Remote/Git.hs b/Remote/Git.hs
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -22,6 +22,7 @@
 import qualified Git.Construct
 import qualified Git.Command
 import qualified Git.GCrypt
+import qualified Git.Types as Git
 import qualified Annex
 import Logs.Presence
 import Annex.Transfer
@@ -50,6 +51,7 @@
 import qualified Remote.Helper.Ssh as Ssh
 import qualified Remote.GCrypt
 import Config.Files
+import Creds
 
 import Control.Concurrent
 import Control.Concurrent.MSampleVar
@@ -62,7 +64,7 @@
 	typename = "git",
 	enumerate = list,
 	generate = gen,
-	setup = error "not supported"
+	setup = gitSetup
 }
 
 list :: Annex [Git.Repo]
@@ -79,6 +81,35 @@
 			Just url -> inRepo $ \g ->
 				Git.Construct.remoteNamed n $
 					Git.Construct.fromRemoteLocation url g
+
+{- Git remotes are normally set up using standard git command, not
+ - git-annex initremote and enableremote.
+ -
+ - For initremote, the git remote must already be set up, and have a uuid.
+ - Initremote simply remembers its location.
+ -
+ - enableremote simply sets up a git remote using the stored location.
+ - No attempt is made to make the remote be accessible via ssh key setup,
+ - etc.
+ -}
+gitSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)
+gitSetup Nothing _ c = do
+	let location = fromMaybe (error "Specify location=url") $
+		Url.parseURIRelaxed =<< M.lookup "location" c
+	g <- Annex.gitRepo
+	u <- case filter (\r -> Git.location r == Git.Url location) (Git.remotes g) of
+		[r] -> getRepoUUID r
+		[] -> error "could not find existing git remote with specified location"
+		_ -> error "found multiple git remotes with specified location"
+	return (c, u)
+gitSetup (Just u) _ c = do
+	inRepo $ Git.Command.run
+		[ Param "remote"
+		, Param "add"
+		, Param $ fromMaybe (error "no name") (M.lookup "name" c)
+		, Param $ fromMaybe (error "no location") (M.lookup "location" c)
+		]
+	return (c, u)
 
 {- It's assumed to be cheap to read the config of non-URL remotes, so this is
  - done each time git-annex is run in a way that uses remotes.
diff --git a/Remote/S3.hs b/Remote/S3.hs
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -12,7 +12,8 @@
 import Network.AWS.S3Bucket hiding (size)
 import Network.AWS.AWSResult
 import qualified Data.Text as T
-import qualified Data.ByteString.Lazy.Char8 as L
+import qualified Data.Text.Encoding as T
+import qualified Data.ByteString.Lazy as L
 import qualified Data.Map as M
 import Data.Char
 import Network.Socket (HostName)
@@ -286,13 +287,13 @@
 	go conn =<< liftIO (tryNonAsync $ getObject conn $ mkobject L.empty)
   where
 	go _conn (Right (Right o)) = unless (obj_data o == uuidb) $
-		error $ "This bucket is already in use by a different S3 special remote, with UUID: " ++ L.unpack (obj_data o)
+		error $ "This bucket is already in use by a different S3 special remote, with UUID: " ++ show (obj_data o)
 	go conn _ = do
 		let object = setStorageClass (getStorageClass c) (mkobject uuidb)
 		either s3Error return =<< liftIO (sendObject conn object)
 
 	file = filePrefix c ++ "annex-uuid"
-	uuidb = L.pack $ fromUUID u
+	uuidb = L.fromStrict $ T.encodeUtf8 $ T.pack $ fromUUID u
 	bucket = fromJust $ getBucket c
 
 	mkobject = S3Object bucket file "" (getXheaders c)
diff --git a/Utility/Hash.hs b/Utility/Hash.hs
--- a/Utility/Hash.hs
+++ b/Utility/Hash.hs
@@ -18,7 +18,8 @@
 ) where
 
 import qualified Data.ByteString.Lazy as L
-import qualified Data.ByteString.Char8 as C8
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 
 #ifndef WITH_CRYPTOHASH
 import Data.Digest.Pure.SHA
@@ -66,4 +67,4 @@
 #endif
 	]
   where
-	foo = L.fromChunks [C8.pack "foo"]
+	foo = L.fromStrict $ T.encodeUtf8 $ T.pack "foo"
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -95,11 +95,9 @@
 #endif
 fixSockAddr addr = addr
 
+-- disable buggy sloworis attack prevention code
 webAppSettings :: Settings
-webAppSettings = defaultSettings
-	-- disable buggy sloworis attack prevention code
-	{ settingsTimeout = 30 * 60
-	}
+webAppSettings = setTimeout (30 * 60) defaultSettings
 
 {- Binds to a local socket, or if specified, to a socket on the specified
  - hostname or address. Selects any free port, unless the hostname ends with
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+git-annex (5.20140529) unstable; urgency=medium
+
+  * Fix encoding of data written to git-annex branch. Avoid truncating
+    unicode characters to 8 bits. Allow any encoding to be used, as with
+    filenames (but utf8 is the sane choice). Affects metadata and repository
+    descriptions, and preferred content expressions.
+  * assistant: When there are multiple remotes giving different ways
+    to access the same repository, honor remote cost settings and use
+    the cheapest available.
+  * webapp: More robust startup when annex directory is not a git repo.
+  * initremote/enableremote: Basic support for using with regular git remotes;
+    initremote stores the location of an already existing git remote,
+    and enableremote setups up a remote using its stored location.
+  * webapp: Support for enabling known git repositories on ssh servers.
+    The repository must have been added using initremote.
+  * webapp: When setting up a ssh remote, record it using initremote,
+    so that it can be easily enabled elsewhere.
+  * webapp: When setting up a ssh remote, if the user inputs ~/foo,
+    normalize that to foo, since it's in the home directory by default.
+  * Use exceptions in place of deprecated MonadCatchIO-transformers
+    Thanks, Ben Gamari.
+  * android: Run busybox install with -s, since some versions of Android
+    prohibit making hard links.
+  * Android webapp: Fix EvilSplicer bugs that mangled the css files,
+    preventing icons from displaying, and also slightly broke the js files.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 29 May 2014 14:41:56 -0400
+
 git-annex (5.20140517) unstable; urgency=medium
 
   * webapp: Switched to bootstrap 3.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@
 	libghc-dav-dev (>= 0.6.1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
 	libghc-quickcheck2-dev,
 	libghc-monad-control-dev (>= 0.3),
-	libghc-monadcatchio-transformers-dev,
+	libghc-exceptions-dev,
 	libghc-unix-compat-dev,
 	libghc-dlist-dev,
 	libghc-uuid-dev,
diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,18 +1,8 @@
-This is git-annex's bug list.
-
-[[!sidebar content="""
-[[!inline feeds=no template=bare pages=sidebar]]
-
-Categories:
-
-* [[Bugs_affecting_the_assistant|design/assistant/todo]]
-* [[Bugs_needing_more_info|moreinfo]]
-* [[Closed_bugs|bugs/done]]
-"""
-]]
+This is git-annex's bug list, including [[confirmed]], [[unconfirmed]],
+and [[moreinfo]]. Closed bugs are moved to [[done]].
 
 [[!inline pages="./bugs/* and !./bugs/*/* and !./bugs/done and !link(done) 
-and !./bugs/moreinfo and !link(moreinfo)
+and !./bugs/moreinfo and !./bugs/confirmed and !./bugs/unconfirmed
 and !*/Discussion" actions=yes postform=yes show=0 archive=yes]]
 
 [[!edittemplate template=templates/bugtemplate match="bugs/*" silent=yes]]
diff --git a/doc/bugs/127.0.0.1_references_on_remote_assistant_access.mdwn b/doc/bugs/127.0.0.1_references_on_remote_assistant_access.mdwn
deleted file mode 100644
--- a/doc/bugs/127.0.0.1_references_on_remote_assistant_access.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-### Please describe the problem.
-When I use git-annex webapp with a remote IP of a headless computer, I am sometimes redirected to a 127.0.0.1 address (with a different port as well)
-
-### What steps will reproduce the problem?
-1. Install git-annex as usual. 
-2. Open git-annex assistant from a headless machine and access the webapp with the --listen option. (e.g. git annex webapp --listen=xxx.yyy.zzz.www)
-3. Create your first local repository. Then create a second local repository.
-4. When assistant asks you if you want to merge these 2 repositories, try to select the second option (to keep them separated).
-5. You are redirected from your remote IP to 127.0.0.1 to a new port number.
-
-(I also encountered the same error at another menu or function, but I don't remember where. Sorry.) 
-
-### What version of git-annex are you using? On what operating system?
-4.20130815
-Ubuntu 13.10 64-bit (kernel 3.11.0-13-generic x86_64)
-
-### Please provide any additional information below.
-Please ask me for any additional information that may be useful.
-
-> [[dup]] of [[Hangs_on_creating_repository_when_using_--listen]]; [[done]] --[[Joey]]
diff --git a/doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04.mdwn b/doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04.mdwn
deleted file mode 100644
--- a/doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04.mdwn
+++ /dev/null
@@ -1,97 +0,0 @@
-What steps will reproduce the problem?
-
-* Start with Ubuntu 12.04
-* sudo apt-get install haskell-platform libgsasl7-dev gsasl g2hs
-* cabal install git-annex --bindir=$HOME/bin
-
-What is the expected output? What do you see instead?
-
-Expected omething like "installation successful"
-
-Actual output, after build notices:
-
-
-Loading package IfElse-0.85 ... linking ... done.
-Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libdiskfree.o ... done
-Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libmounts.o ... done
-final link ... done
-[157 of 279] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o )
-[158 of 279] Compiling Assistant.Monad  ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o )
-
-Assistant/Monad.hs:86:16:
-    Couldn't match expected type `Assistant a'
-                with actual type `Reader AssistantData a'
-    Expected type: (AssistantData -> a) -> Assistant a
-      Actual type: (AssistantData -> a) -> Reader AssistantData a
-    In the expression: reader
-    In an equation for `getAssistant': getAssistant = reader
-
-Assistant/Monad.hs:93:15:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: st <- reader threadState
-    In the expression:
-      do { st <- reader threadState;
-           liftIO $ runThreadState st a }
-
-Assistant/Monad.hs:99:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           liftIO $ io $ runAssistant d a }
-
-Assistant/Monad.hs:105:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ runAssistant d a }
-
-Assistant/Monad.hs:110:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ \ v -> runAssistant d $ a v }
-
-Assistant/Monad.hs:115:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ \ v1 v2 -> runAssistant d (a v1 v2) }
-
-Assistant/Monad.hs:120:12:
-    Couldn't match expected type `Assistant a0'
-                with actual type `Reader r0 a1'
-    In the return type of a call of `reader'
-    In the first argument of `(>>=)', namely `reader v'
-    In the expression: reader v >>= liftIO . io
-cabal: Error: some packages failed to install:
-git-annex-3.20121112 failed during the building phase. The exception was:
-ExitFailure 1
-
-
-What version of git-annex are you using? On what operating system?
-
-git annex 3.20121112
-Ubuntu 12.04 (current "long term support", all packages up to date)
-
-Please provide any additional information below.
-
-No idea how important this is for git-annex in general but reporting in case it is. Thank you for working on git annex!
-
-> I was able to reproduce this build error when I force installed
-> an old version of the haskell mtl library. So git-annex needs version
-> 2.1.1 to build, and I have adjusted the build dependencies appropriately.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/3.20121113_build_error___39__not_in_scope_getAddBoxComR__39__.mdwn b/doc/bugs/3.20121113_build_error___39__not_in_scope_getAddBoxComR__39__.mdwn
deleted file mode 100644
--- a/doc/bugs/3.20121113_build_error___39__not_in_scope_getAddBoxComR__39__.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-What steps will reproduce the problem?
-
-Building from latest source, Cabal update, cabal install --only dependencies, cabal configure, Cabal build
-
-What is the expected output? What do you see instead?
-
-Error message from build
-
-...
-
-Loading package DAV-0.2 ... linking ... done.
-
-Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libdiskfree.o ... done
-
-Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libmounts.o ... done
-
-final link ... done
-
-
-Assistant/Threads/WebApp.hs:47:1: Not in scope: `getAddBoxComR'
-
-Assistant/Threads/WebApp.hs:47:1: Not in scope: `getEnableWebDAVR'
-
-
-What version of git-annex are you using? On what operating system?
-
-Latest version via git from git-annex.branchable.com
-
-Debian Squeeze (6.0.6)
-
-Please provide any additional information below.
-
-> I noticed this earlier and fixed it. [[done]] --[[Joey]]
diff --git a/doc/bugs/4.20130601_xmpp_sync_error.mdwn b/doc/bugs/4.20130601_xmpp_sync_error.mdwn
deleted file mode 100644
--- a/doc/bugs/4.20130601_xmpp_sync_error.mdwn
+++ /dev/null
@@ -1,125 +0,0 @@
-4.20130601 xmpp sync error.
-
-setup: A debian machine, with indirect fresh annex, android galaxy s3 with a
-fresh direct annex, both running ga-20130601.
-
-steps:
-- Start assistant on both, add jabber account to both.
-- Add box.com account on desktop with no encryption, (now correctly shows up on android, wasn't the case with 20130521).
-- Add hello.txt on desktop repo, filename is now visible on android, but content is not.
-- Add greeting.txt on desktop, nothing shows up on android, content still missing for hello.txt
-- Webapp shows uploading messages, but no errors.
-- Manually checking box.com confirms that files have been uploaded.
-
-debian desktop daemon.log:
-
-    [2013-06-02 17:57:03 CEST] main: starting assistant version 4.20130601
-    (scanning...) [2013-06-02 17:57:03 CEST] Watcher: Performing startup scan
-    (started...) [2013-06-02 17:57:52 CEST] XMPPClient: Pairing with myJabberAccount in progress
-    [2013-06-02 17:57:53 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    [2013-06-02 17:58:03 CEST] XMPPClient: Pairing with myJabberAccount in progress
-    [2013-06-02 17:58:52 CEST] main: Syncing with box.com 
-    warning: Not updating non-default fetch respec
-	
-	Please update the configuration manually if necessary.
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 17:59:53 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    [2013-06-02 18:00:02 CEST] Committer: Adding hello.txt
-
-    (testing WebDAV server...)
-    add hello.txt (checksum...) [2013-06-02 18:00:02 CEST] Committer: Committing changes to git
-    [2013-06-02 18:00:02 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    Already up-to-date.
-    [2013-06-02 18:00:03 CEST] Committer: Committing changes to git
-    fatal: The remote end hung up unexpectedly
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:00:03 CEST] XMPPSendPack: Syncing with myJabberAccount 
-
-    
-100%          1.0 B/s 0s
-                        
-[2013-06-02 18:00:19 CEST] Transferrer: Uploaded hello.txt
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:01:53 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:02:04 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:03:53 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:05:10 CEST] Committer: Adding greeting.txt
-    ok
-    (Recording state in git...)
-    (Recording state in git...)
-
-    (Recording state in git...)
-    add greeting.txt (checksum...) [2013-06-02 18:05:10 CEST] Committer: Committing changes to git
-    [2013-06-02 18:05:10 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    Already up-to-date.
-    [2013-06-02 18:05:11 CEST] Committer: Committing changes to git
-
-    
-100%          9.0 B/s 0s
-                        
-[2013-06-02 18:05:24 CEST] Transferrer: Uploaded greeting.txt
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:06:13 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    ok
-    (Recording state in git...)
-    (Recording state in git...)
-
-    (Recording state in git...)
-    fatal: The remote end hung up unexpectedly
-
-Thanks as always.
-
-
-Android daemon.log:
-    [2013-06-02 17:53:07 CEST] main: starting assistant version 4.20130601-g7483ca4
-    (scanning...) [2013-06-02 17:53:07 CEST] Watcher: Performing startup scan
-    (started...) [2013-06-02 17:57:51 CEST] XMPPClient: Pairing with myJabberAccount in progress
-    [2013-06-02 17:57:52 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    Already up-to-date.
-    [2013-06-02 17:58:00 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 17:58:00 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 17:58:02 CEST] XMPPClient: Pairing with myJabberAccount in progress
-    [2013-06-02 17:58:07 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 17:58:07 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 17:58:15 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 18:00:02 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    [2013-06-02 18:00:03 CEST] XMPPReceivePack: Unable to download files from your other devices. 
-    [2013-06-02 18:00:04 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    Merge made by the 'recursive' strategy.
-     hello.txt | 1 +
-     1 file changed, 1 insertion(+)
-     create mode 120000 hello.txt
-    [2013-06-02 18:00:05 CEST] Committer: Committing changes to git
-    [2013-06-02 18:00:06 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    Already up-to-date.
-    [2013-06-02 18:00:14 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 18:00:14 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 18:00:25 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 18:02:03 CEST] Committer: Committing changes to git
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:02:04 CEST] XMPPReceivePack: Unable to download files from your other devices. 
-    [2013-06-02 18:02:04 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 18:02:04 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    [2013-06-02 18:02:13 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 18:02:15 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 18:02:24 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:04:04 CEST] XMPPReceivePack: Unable to download files from your other devices. 
-    [2013-06-02 18:05:10 CEST] XMPPReceivePack: Syncing with myJabberAccount 
-    [2013-06-02 18:06:12 CEST] Committer: Committing changes to git
-    [2013-06-02 18:06:13 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 18:06:21 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    [2013-06-02 18:06:21 CEST] XMPPSendPack: Syncing with myJabberAccount 
-    [2013-06-02 18:06:29 CEST] XMPPSendPack: Unable to download files from your other devices. 
-    fatal: The remote end hung up unexpectedly
-    [2013-06-02 18:07:10 CEST] XMPPReceivePack: Unable to download files from your other devices. 
-
-
-thanks
-
-> Since this seems clearly a lack of box.com being configured 
-> to be used on the Android, I'm closing the bug: [[done]]. 
-> If I'm wrong, write back, and I'll reopen ;) --[[Joey]]
diff --git a/doc/bugs/400_mode_leakage.mdwn b/doc/bugs/400_mode_leakage.mdwn
deleted file mode 100644
--- a/doc/bugs/400_mode_leakage.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-git-annex tends to preserve files that are added to an annex with
-a mode such as 400. (Happens to me sometimes with email attachments.) 
-As these files are rsynced around, and end up on eg, a
-publically visible repo with a webserver frontend, or a repo that is
-acessible to a whole group of users, they will not be readable. 
-
-I think it would make sense for git-annex to normalize file permissions
-when adding them. Of course, there's some tension here with generally
-storing file metadata when possible. Perhaps the normalization should only
-ensure that group and other have read access?
-
-(Security: We can assume that a repo that is not intended to be public is
-in a 700 directory. And since git-annex cannot preserve file modes when
-files transit through a special remote, using modes to limit access to
-individual files is not wise.)
-
---[[Joey]]
-
-> Revisiting this, git-annex already honors core.sharedrepository settings,
-> so I just needed to set it to `world` to allow everyone to read.
-> 
-> There was a code path in direct mode where that didn't work; fixed that.
-> 
-> [[done]]
-> --[[Joey]] 
diff --git a/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes.mdwn b/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+
+Some time in may 2014, git-annex stopped working with previous versions of git-annex.
+
+### What steps will reproduce the problem?
+
+Trying to sync with the server fails with:
+
+    git-annex-shell: Not a git-annex or gcrypt repository.
+
+With older versions (e.g. 5.20140412), it's even worse:
+
+    Remote marcos does not have git-annex installed; setting annex-ignore
+    This could be a problem with the git-annex installation on the remote. Please make sure that git-annex-shell is available in PATH when you ssh into the remote. Once you have fixed the git-annex installation, run: git config remote.marcos.annex-ignore false
+
+Basically, if git-annex-shell is missing, newer versions of git-annex just crash and burn instead of going the more gentle, backward-compatible way...
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex from debian sid (5.20140517) on the "client" side and from jessie (5.20140421) on the "server".
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+ssh server
+git init books
+exit
+git remote add server server:books
+git annex sync server
+# End of transcript or log.
+"""]]
+
+If this is intended behavior, it seems to me the major version of git annex should be bumped, at the very least... -- [[anarcat]]
diff --git a/doc/bugs/Add_another_repository_on_USB_drive_causes_sync_loop.mdwn b/doc/bugs/Add_another_repository_on_USB_drive_causes_sync_loop.mdwn
deleted file mode 100644
--- a/doc/bugs/Add_another_repository_on_USB_drive_causes_sync_loop.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-What steps will reproduce the problem?
-
-Mount USB drive formatted as FAT
-Make directory for repository in it.
-Set up another repository and choose to sync it with the existing one.
-
-What is the expected output? What do you see instead?
-The files should transfer from the main repository to the directory on the USB drive.
-This happens, but afterwards a new sync happens from the USB drive repository back to the other existing repositories, because the file date of all the files on the USB drive has been set to today.
-Further, git seemed to keep the USB key locked so umount was impossible until after killing it.
-
-What version of git-annex are you using? On what operating system?
-4.20130405
-Linux
-
-Please provide any additional information below.
-
-
-> Reproduced the core bug, which is that the assistant saw symlink standin
-> files as new files, and annexed them. Now it doesn't, and I have
-> it running on FAT with no trouble; can even rename symlink standin files
-> and it commits symlink changes. Calling this [[done]]. --[[Joey]]
diff --git a/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn b/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn
deleted file mode 100644
--- a/doc/bugs/Adding_box.com_remote_on_Android_fails_for_me.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-### Please describe the problem.
-
-After submitting the form in the webapp for adding a box.com remote, I get:
-
-   Internal Server Error - WEBDAV failed to write file: "Unauthorized": user error
-
-### What steps will reproduce the problem?
-
-Fill in the box.com add remote form. Username=username, password=password, "share..."=checked, directory=annex, Encryption="Encrypt all data" and hit the "Add repository" button.
-
-### What version of git-annex are you using? On what operating system?
-
-  git-annex version 4.20130513-g5185533 on Android 4.2.2
-
-### Please provide any additional information below.
-
-Didn't find a .git/annex/debug.log
-
-> This error seems entirely consistent with you entering the wrong password.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Adding_git_ssh_remote_fails.mdwn b/doc/bugs/Adding_git_ssh_remote_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/Adding_git_ssh_remote_fails.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-While trying to add a ssh remote, the webapp promts the error:
-
-    Reinitialized existing shared Git repository in /home/chris/annex-test/
-    git-annex: please specify a description of this repository
-
-resp.
-
-    Initialized empty shared Git repository in /home/chris/annex-test-2/
-    git-annex: please specify a description of this repository
-
-### What steps will reproduce the problem?
-
-Adding a ssh git remote.
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130704-gaf18656 linux-amd64 and android
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-only successful ssh key generation in daemon.log
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; bad installation. --[[Joey]]
diff --git a/doc/bugs/Adding_second_remote_repository_over_ssh_fails.mdwn b/doc/bugs/Adding_second_remote_repository_over_ssh_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/Adding_second_remote_repository_over_ssh_fails.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-What steps will reproduce the problem?
-
-Create a local and "remote server" repository
-
-Create another local repositorty and keep it seperate from the first one. Fails while creating second repository on the remote.
-
-What is the expected output? What do you see instead?
-
-Expected to get two seperate repositories on the client and server. Only first one works.
-
-Got an error:
-
-    Failed to make repository
-
-    Something went wrong setting up the repository on the remote server.
-
-    Transcript: fatal: unrecognized command 'sh -c 'mkdir -p '"'"'second'"'"'&&cd '"'"'second'"'"'&&git init --bare --shared&&git annex init&&mkdir -p ~/.ssh&&if [ ! -e ~/.ssh/git-annex-shell ]; then (echo '"'"'#!/bin/sh'"'"';echo '"'"'set -e'"'"';echo '"'"'if [ "x$SSH_ORIGINAL_COMMAND" != "x" ]; then'"'"';echo '"'"'exec git-annex-shell -c "$SSH_ORIGINAL_COMMAND"'"'"';echo '"'"'else'"'"';echo '"'"'exec git-annex-shell -c "$@"'"'"';echo '"'"'fi'"'"') > ~/.ssh/git-annex-shell; fi&&chmod 700 ~/.ssh/git-annex-shell&&touch ~/.ssh/authorized_keys&&chmod 600 ~/.ssh/authorized_keys&&echo '"'"'command="GIT_ANNEX_SHELL_DIRECTORY='"'"'"'"'"'"'"'"'second'"'"'"'"'"'"'"'"' ~/.ssh/git-annex-shell",no-agent-forwarding,no-port-forwarding,no-X11-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvoTn+XBdlw/mQlu+NScAeuddUJqJaVXH6KUsO09OddnUvzv4W185ezbAjXfWDgN7ou0Q0xQzwiCzdoSl7T3USJQ1ywTG5Xt2sBV3RIqxyReNA7Nz0yhwWhZBJcFzof34ezNIsi9NVgEJcK2JEs2XqhO5wK5nxEDeays7ti2bqY6V21iOWSy9hlzjD4VTWTEFxQkDp4BCzDpPN934ztOtInwI8ayiTRJZlNQ+ej/AaA+/zOBWNvIFc/96iuMLKY6lLFThw1jNj5r5N7yPaysLdnwTJ3irtCzDygCpD4mau4frrOPvG90ZdcdrQSfIjRtM9nPZ5jIpohfvz0dIfgNFz marvin@marvin-U-100 '"'"' >>~/.ssh/authorized_keys'' git-annex-shell: git-shell failed
-
-
-What version of git-annex are you using? On what operating system?
-
-4.20130413-g5747bf4 ubuntu 12.10 local
-
-3.20120629 debian wheezy remote (also tried 4.20130413-g5747bf4)
-
-Please provide any additional information below.
-
-> This bug would appear to be the same as a bug I fixed today.
-> 
-> Except this last bit:
-
-**Also noticed if a user has no full name set in unix account, creating
-remote repository always fails**
-
-> So, I'm going to repurpose this bug to track that problem. --[[Joey]]
-
-[[!meta title="assistant can fail to make git repository if remote server is lacking GECOS"]]
-
->> [[done]]; git-annex always checks for missing gecos and enables
->> a workaround. This does mean the server needs to be upgraded in order
->> for the fix to work. --[[Joey]]
diff --git a/doc/bugs/Addurl_with_quvi_not_working.mdwn b/doc/bugs/Addurl_with_quvi_not_working.mdwn
deleted file mode 100644
--- a/doc/bugs/Addurl_with_quvi_not_working.mdwn
+++ /dev/null
@@ -1,74 +0,0 @@
-### Please describe the problem.
-
-When adding a video with "addurl", git-annex claims that quvi does not know how to download the url. When using "quvi get" on the same url the video gets downloaded.
-
-This seems to be independent of the video hosting site and occured on all I tested.
-
-### What steps will reproduce the problem?
-
-Download a video with
-
-    git annex addurl "[URL]"
-
-and do the same with
-
-    quvi get "[URL]"
-
-.
-
-
-### What version of git-annex are you using? On what operating system?
-
-OS: Archlinux, fully updated
-
-    git-annex version: 5.20131118-gc7e5cde
-    build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-    remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 5
-    upgrade supported from repository versions: 0 1 2 4
-
-
-### Please provide any additional information below.
-
-# Git-annex:
-
-    user@asus aaa [master] % git annex addurl "https://www.youtube.com/watch?v=TUrQsK5ouSg"
-    quvi v0.9.5
-      built on 2013-11-12 17:02:06 +0000 for x86_64-unknown-linux-gnu
-        with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
-      configuration: --prefix=/usr
-    libquvi v0.9.4
-      built on 2013-11-12 16:58:23 +0000 for x86_64-unknown-linux-gnu
-        with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
-      configuration: --prefix=/usr
-    libquvi-scripts v0.9.20131104
-      configuration: --prefix=/usr --with-nsfw --with-geoblocked
-    
-    Copyright (C) 2012,2013  Toni Gundogdu <legatvs@gmail.com>
-    quvi comes with ABSOLUTELY NO WARRANTY.  You may redistribute copies of
-    quvi under the terms of the GNU Affero General Public License version 3
-    or later. For more information, see <http://www.gnu.org/licenses/agpl.html>.
-    
-    To contact the developers, please mail to <quvi-devel@lists.sourceforge.net>
-    
-    Copyright (C) 2012,2013  Toni Gundogdu <legatvs@gmail.com>
-    quvi comes with ABSOLUTELY NO WARRANTY.  You may redistribute copies of
-    quvi under the terms of the GNU Affero General Public License version 3
-    or later. For more information, see <http://www.gnu.org/licenses/agpl.html>.
-    
-    To contact the developers, please mail to <quvi-devel@lists.sourceforge.net>
-    git-annex: quvi does not know how to download url https://www.youtube.com/watch?v=TUrQsK5ouSg
-
-# Quvi:
-
-    user@asus aaa [master] % quvi get "https://www.youtube.com/watch?v=TUrQsK5ouSg"
-    file: GitAnnex Assistant Hak5 14223.mp4  [media]                                                       
-      content length: 162.2Mi  content type: video/mp4  mode: resume
-    copy: --=-  100%   488.9Ki/s  00:05:37
-
-> git annex 5.20131127 is the first to support quvi 0.9. 
-> (And only if built on a system with that version of quvi installed).
-> Upgrade. [[done]] --[[Joey]]
diff --git a/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn b/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn
deleted file mode 100644
--- a/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-This follows up to the [comment made by
-Laszlo](http://git-annex.branchable.com/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/#comment-f26d3b6b45bb66601ecfaa883ace161c)
-on the [recent
-poll](http://git-annex.branchable.com/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/).
-
-I too need to be able to select the directory on the remote drive that the
-annex will be synced to.
-
-If I just add a remote drive via the web app, it syncs the repository to
-`/mnt/usb/annex`, and it looks like it just creates a bare repository in
-that folder. I need the repository to be synced to something like
-`/mnt/usb/subfolder/myspecifiedfoldername` and I need that remote to be a
-full repository.
-
-My use case is that I use the USB drive to keep annexes in sync between two
-computers. I have multiple annexes that need to be synced between the two
-computers, and none of them are in a directory called `annex`. I also need
-to be able to plug the drive into other computers and access the files
-directly, without doing a `git clone` or anything like that. I have all of
-this setup and working fine with just plain old git annex, but the web app
-does not seem to support creating new repositories with this workflow.
-
-I think it makes a lot of sense to allow the web application to add a new
-remote that is simply a directory. People like me could specify the path of
-the directory to be on the mounted USB drive. Others may want to add a
-remote that is a mounted network share or something like that.
-
-> [[done]], the webapp now has a "Add another repository" option,
-> and you can just enter the path to whatever place you like inside a USB
-> drive.  --[[Joey]]
diff --git a/doc/bugs/Android___91__Terminal_session_finished__93__.mdwn b/doc/bugs/Android___91__Terminal_session_finished__93__.mdwn
--- a/doc/bugs/Android___91__Terminal_session_finished__93__.mdwn
+++ b/doc/bugs/Android___91__Terminal_session_finished__93__.mdwn
@@ -30,4 +30,4 @@
 
 Samsung Galaxy Tab 3 (GT-P5210) running Android 4.2.2 (without root access).
 
-> [[done|dup]] --[[Joey]]
+> [[dup|done]] --[[Joey]]
diff --git a/doc/bugs/Android_app_permission_denial_on_startup.mdwn b/doc/bugs/Android_app_permission_denial_on_startup.mdwn
deleted file mode 100644
--- a/doc/bugs/Android_app_permission_denial_on_startup.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-### Please describe the problem.
-
-Android app barfs on startup.
-
-### What steps will reproduce the problem?
-
-Download/install/start Android app :)
-
-### What version of git-annex are you using? On what operating system?
-
-Just downloaded the .apk (Friday May 3rd).  Android 4.2.2 on Google/LG Nexus 4 
-
-### Please provide any additional information below.
-
-See this [screenshot](https://docs.google.com/file/d/0B8tqeaAn45VORU1ET1ZpTWxLTjQ/edit?usp=sharing).
-Feel free to ping me on IRC if you need additional info or want to test a fix.
-
-> [[done]]; now comprehensively fixed. --[[Joey]]
diff --git a/doc/bugs/Android_can__39__t_sync_files_with_utf-8_characters_in_names.mdwn b/doc/bugs/Android_can__39__t_sync_files_with_utf-8_characters_in_names.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/Android_can__39__t_sync_files_with_utf-8_characters_in_names.mdwn
@@ -0,0 +1,36 @@
+### Please describe the problem.
+I have a repo where some files have utf-8 characters in their names. They are copied without problems between linux-running pcs, but on Android I only get a small, 206 bytes files with the hash data.
+
+### What steps will reproduce the problem?
+Add some files with utf-8 characters in names, try to sync to Android
+
+### What version of git-annex are you using? On what operating system?
+PC side: tried 5.20140412ubuntu1 from ubuntu repo and standalone tarball 5.20140517-gee56d21, both on Ubuntu Trusy
+Android side: Android 4.4.2 on Nexus 7
+
+### Please provide any additional information below.
+Part of daemon.log I believe is related to this. Lines starting with Number followed by dot are the filenames, but truncated at first non-ascii character.
+I suspect empty lines before the "rsync failed" represent files with names that start with non-ascii character.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+02. Wyspa W
+  rsync failed -- run git annex again to resume file transfer
+
+05. Ponad Krain
+  rsync failed -- run git annex again to resume file transfer
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Android_daily_build_missing_webapp.mdwn b/doc/bugs/Android_daily_build_missing_webapp.mdwn
deleted file mode 100644
--- a/doc/bugs/Android_daily_build_missing_webapp.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-
-The daily Android build is missing the webapp, raising a bug in case this is unexpected.
-
-### What steps will reproduce the problem?
-
-Down the daily APK, it is 9MB.
-
-### What version of git-annex are you using? On what operating system?
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Probably several of them were. I've fixed the cabal file, re-running
-> android build now. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn b/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn
deleted file mode 100644
--- a/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-#### What steps will reproduce the problem?
-
-I've posted some code here:
-   https://gist.github.com/4552036
-
-
-#### What is the expected output? What do you see instead?
-
-I think I've found three bugs.  If they aren't bugs then there is a usage issue that could do with some documentation improvements.
-
-Problem 1 - With 3 local annexes git-annex doesn't seem to search properly for them  (See code)
-
-Problem 2 - Even after a sync an annex thinks another (local) annex has a file, even after it has been dropped  (See code)
-
-SCARY bug - `whereis` seems to think that a locally dropped file still exists  (See code) 
-
-
-#### What version of git-annex are you using? On what operating system?
-
-git-annex version: 3.20130114
-
-OS: OSX 10.6.8
-
-
-#### Please provide any additional information below.
-
-> [[done]]; see comments --[[Joey]] 
diff --git a/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default.mdwn b/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default.mdwn
deleted file mode 100644
--- a/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-### Please describe the problem.
-
-I'm trying to use the assistant to replicate the basic dropbox functionality of having a synced folder between two machines. Instead of actually syncing file contents by default the assistant just creates broken symlinks.
-
-### What steps will reproduce the problem?
-
-I've setup two repositories with each other as ssh remotes and ran the assistant on each after setting them in direct mode. I can create files on each of the repositories and have them show up on the other but all that shows up is a broken link. Actual contents don't get transferred. If I do a "git annex get" I can get the contents just fine. I tried setting annex.numcopies to 2 and that didn't work either.
-
-What I'm missing here is some setting to tell the assistant "sync the contents of every new file". What it's doing instead is unacceptable. If I have the file in both repositories and change it in one, the other repository gets it's previous version of the file replaced by a broken symlink. From my point of view for the assistant to be a dropbox replacement it should never, under any circumstances, create a broken symlink in the sync folder. I had understood that that's what direct mode was, but it's not behaving that way right now at least.
-
-### What version of git-annex are you using? On what operating system?
-
-My basic setup for testing is two Ubuntu 12.04 LTS machines running git-annex 4.20130501
-
-> [[done]], broken ~/.config/git-annex/program file, which is now detected
-> and worked around. --[[Joey]]
diff --git a/doc/bugs/Assistant_lost_dbus_connection_spamming_log.mdwn b/doc/bugs/Assistant_lost_dbus_connection_spamming_log.mdwn
deleted file mode 100644
--- a/doc/bugs/Assistant_lost_dbus_connection_spamming_log.mdwn
+++ /dev/null
@@ -1,88 +0,0 @@
-## what
-After starting the assistant, daemon.log is being spammed with "accept: unsupported operation (Function not implemented)" due to dbus failing.
-
-## version
-[[!format sh """
-$ git-annex version
-git-annex version: 5.20131224-g6ca5271
-"""]]
-(The armel standalone)
-
-## question
-Is this detrimental to the assistant?
-
-## partial daemon.log
-[[!format sh """
-[2014-01-04 23:03:34 PST] main: starting assistant version 5.20131224-g6ca5271
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-[                                                                                                       
-2f0a 1i 4ld-eb0du1 s-t 0of4 a ai2dl3de: d0w;3a :tf3ca5hl  lPoiSnnT g]d  ibTrarecacknt sotfroey r mS/tcva
-olnifeingt/Egrirto-raMnensesxa g(e/ v=a r\"/rsuenrCvliiceenst/:h oumneasb/lger etgo/ .dceotnefrimgi/ngei 
-
-xi s tl o(sNto  dsbuucsh  cfoinlnee cotri odni;r efcatlolriyn)g)
-back to polling (SocketError {socketErrorMessage = "connect: does not exist (No such file or directory)"
-                                                                                                        
-Already up-to-date.                                                                                     
-accept: unsupported operation (Function not implemented)
-(scanning...) [2014-01-04 23:03:36 PST] Watcher: Performing startup scan                                
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-Everything up-to-date                                                                                   
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-accept: unsupported operation (Function not implemented)
-                                                                                                        
-  lost dbus connection; falling back to polling (SocketError {socketErrorMessage = "connect: does not exist (No such file or directory)", socketErrorFatal = True, socketErrorAddress = Just (Address "unix:path=/var/run/dbus/system_bus_socket")})
-"""]]
-
-> [[done]]; This turned out to not be dbus related, but the http server failing,
-> and I fixed that bug.
-> 
-> AFAICS the user running git-annex did not have their own dbus daemon
-> running, and that's why the low-volume dbus messages come up. 
-> Probably because this is an embedded device, and so no desktop
-> environment. git-annex only uses dbus for detecting network connection
-> changes and removable media mounts. None of which probably matter in an
-> embedded environment. --[[Joey]]
diff --git a/doc/bugs/Assistant_stalls_when_adding__47__creating_repo_on_ArchLinux.mdwn b/doc/bugs/Assistant_stalls_when_adding__47__creating_repo_on_ArchLinux.mdwn
deleted file mode 100644
--- a/doc/bugs/Assistant_stalls_when_adding__47__creating_repo_on_ArchLinux.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-### Please describe the problem.
-
-I am experiencing a weird issue with any install I've had on this one (and only) ArchLinux machine: all of aur/git-annex 4.20130516-1, aur/git-annex-bin-4.20130909-1, aur/git-annex-standalone-4.20130909-1 and a Cabal install just stall when trying to create the initial Git annex repo in the webapp.
-
-When started, it offers me to create the annex in ~/annex/ or ~/Desktop/annex/, where ~ gets turned into /home/USER when I press “Make repository”, but nothing else happens. This is regardless of if that repo exists when I try to create it or start the webapp.
-
-If I start the webapp from an existing annex (now in ~/annex), it seems to work a bit better, but any other remote (SSH) server that I try to add fails. I just get a fleeting Bootstrap message box when I click “Check this server”, and nothing in the logs of eithr git annex webapp or the ssh logs of the server.
-
-If an annex exists, but I start the webapp from another directory, it just behaves as if none were found.
-
-Calls to git annex assistant --autostart complain that "Nothing listed in /home/omehani/.config/git-annex/autostart". I have checked the permissions on that directory, and tried deleting it to let git-annex recreate it, which it did, to no avail.
-
-
-### What steps will reproduce the problem?
-
-Install any of the git-annex packages available from AUR
-
-### What version of git-annex are you using? On what operating system?
-
-* up-to-date ArchLinux, Linux cancey 3.10.10-1-ARCH #1 SMP PREEMPT Fri Aug 30 11:30:06 CEST 2013 x86_64 GNU/Linux
-* aur/git-annex 4.20130516-1, aur/git-annex-bin-4.20130909-1, aur/git-annex-standalone-4.20130909-1 or through Cabal (on 2013-09-12)
-
-### Please provide any additional information below.
-
-The following is the output of webapp --debug. Nothing actually appears when trying to add/edit a repo.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-~/annex (master)$ git annex webapp --debug
-[2013-09-16 10:26:55 EST] read: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","show-ref","git-annex"]
-[2013-09-16 10:26:55 EST] read: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","show-ref","--hash","refs/heads/git-annex"]
-[2013-09-16 10:26:55 EST] read: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","log","refs/heads/git-annex..27c891f84f6ea7a10c68c0dd696ab84d88ef0cec","--oneline","-n1"]
-[2013-09-16 10:26:55 EST] read: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","log","refs/heads/git-annex..d0a1cb518045af01b443694aa2cd9af6386de38a","--oneline","-n1"]
-[2013-09-16 10:26:55 EST] read: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","log","refs/heads/git-annex..3ff23e23d74ace008b03143120e84f07e52ed8ee","--oneline","-n1"]
-[2013-09-16 10:26:55 EST] chat: git ["--git-dir=/home/omehani/annex/.git","--work-tree=/home/omehani/annex","cat-file","--batch"]
-[2013-09-16 10:26:55 EST] logging to /home/omehani/annex/.git/annex/daemon.log
-[2013-09-16 10:26:55 EST] logging to /home/omehani/annex/.git/annex/daemon.log
-Launching web browser on file:///home/omehani/annex/.git/annex/webapp.html
-START /usr/lib/firefox/firefox "/home/omehani/annex/.git/annex/webapp.html"
-
-(process:2699): GLib-CRITICAL **: g_slice_set_config: assertion `sys_page_size == 0' failed
-
-
-# End of transcript or log.
-"""]]
-
-Running git annex from a different directory.
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-~$ git annex webapp --debug
-Launching web browser on file:///tmp/webapp3934.html
-START /usr/lib/firefox/firefox "/tmp/webapp3934.html"
-
-(process:4008): GLib-CRITICAL **: g_slice_set_config: assertion `sys_page_size == 0' failed
-
-# End of transcript or log.
-"""]]
-
-Trying the autostart:
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-~$ git annex assistant --autostart --debug
-git-annex: Nothing listed in /home/omehani/.config/git-annex/autostart
-
-
-# End of transcript or log.
-"""]]
-
-> workaround is in place [[done]] --[[Joey]]
diff --git a/doc/bugs/Assistant_uses_obsolete_GDU_volume_monitor.mdwn b/doc/bugs/Assistant_uses_obsolete_GDU_volume_monitor.mdwn
deleted file mode 100644
--- a/doc/bugs/Assistant_uses_obsolete_GDU_volume_monitor.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-### What steps will reproduce the problem?
-
-Run `git annex assistant`.
-
-
-### What is the expected output? What do you see instead?
-
-git-annex complains:
-
-     dbus failed; falling back to mtab polling (ClientError {clientErrorMessage =
-        "Call failed: The name org.gtk.Private.GduVolumeMonitor was not provided
-        by any .service files", clientErrorFatal = False})
-
-This is because the `gvfs-gdu-volume-monitor` daemon has been obsoleted and removed from GNOME 3.6 (maybe even earlier).
-
-git-annex should start using `gvfs-udisks2-volume-monitor` at bus name `org.gtk.Private.UDisks2VolumeMonitor`.
-
-Alternatively, git-annex should stop relying on any per-user services, and use kernel interfaces directly when available. (This way, monitoring could work even if the user wasn't logged in and/or didn't have a DBus session bus.)
-
-  * On all Linux kernels since 2.6.15, the `/proc/self/mounts` file is pollable – you can use **select(), poll() or epoll** to detect new mounted filesystems, without having to rely on periodic checks. (Run `findmnt -p` to see it in action.)
-
-  * On BSD systems, kqueue on `/etc/mtab`.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex 3.20130102 on Linux 3.7.1, GNOME 3.7
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn b/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn
deleted file mode 100644
--- a/doc/bugs/Auto_update_not_updating_to_newest_version.mdwn
+++ /dev/null
@@ -1,70 +0,0 @@
-### Please describe the problem.
-
-I assume this is an assistant problem.
-
-My git-annex version on Mac OS seems to lag significantly behind current releases. I was today informed that it was updated to 5.20131221-g00d1673. Given that there are at least two newer versions I expected it to be updated to the newest one.
-
-There also seems no way to trigger a check for a new version.
-
-### What steps will reproduce the problem?
-
-Install on Mac. Observe over some days and see it not update.
-
-
-### What version of git-annex are you using? On what operating system?
-
-5.20131221-g00d1673,
-Mac OS
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-[2014-01-10 14:46:44 CET] main: starting assistant version 5.20131221-g00d1673
-[2014-01-10 14:46:44 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
-(scanning...) [2014-01-10 14:46:44 CET] Watcher: Performing startup scan
-(started...) [2014-01-10 14:47:02 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-10 14:47:02 CET] Watcher: Performing startup scan
-(started...) 
-[2014-01-10 14:48:44 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-10 14:48:44 CET] Watcher: Performing startup scan
-(started...) 
-[2014-01-10 14:49:35 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-10 14:49:35 CET] Watcher: Performing startup scan
-(started...) [2014-01-10 14:52:44 CET] UpgradeWatcher: Upgrading git-annex
-
-[2014-01-10 14:52:44 CET] main: starting assistant version 5.20131221-g00d1673
-[2014-01-10 14:52:44 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
-(scanning...) [2014-01-10 14:52:45 CET] Watcher: Performing startup scan
-(started...) [2014-01-10 14:53:13 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-10 14:53:13 CET] Watcher: Performing startup scan
-(started...) 
-[2014-01-15 15:22:29 CET] main: starting assistant version 5.20131221-g00d1673
-[2014-01-15 15:22:30 CET] Cronner: Consistency check in progress
-(scanning...) [2014-01-15 15:22:30 CET] Watcher: Performing startup scan
-(started...) 
-(scanning...) [2014-01-15 15:23:05 CET] Watcher: Performing startup scan
-[2014-01-15 15:23:05 CET] Committer: Committing changes to git
-(Recording state in git...)
-(started...) [2014-01-15 15:23:06 CET] main: Syncing with box.com 
-
-[2014-01-15 15:23:28 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-15 15:23:28 CET] Watcher: Performing startup scan
-(started...) [2014-01-15 16:23:30 CET] NetWatcherFallback: Syncing with box.com 
-[2014-01-15 17:23:31 CET] NetWatcherFallback: Syncing with box.com 
-[2014-01-15 18:23:32 CET] NetWatcherFallback: Syncing with box.com 
-[2014-01-16 16:42:15 CET] NetWatcherFallback: Syncing with box.com 
-[2014-01-16 16:56:33 CET] UpgradeWatcher: Upgrading git-annex
-
-[2014-01-16 16:56:33 CET] main: starting assistant version 5.20131221-g00d1673
-[2014-01-16 16:56:33 CET] Cronner: Consistency check in progress
-[2014-01-16 16:56:33 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20131221-g00d1673 
-(scanning...) [2014-01-16 16:56:33 CET] Watcher: Performing startup scan
-(started...) fsck dvi2bitmap ok
-[2014-01-16 16:58:14 CET] main: starting assistant version 5.20131221-g00d1673
-(scanning...) [2014-01-16 16:58:14 CET] Watcher: Performing startup scan
-(started...) 
-
-# End of transcript or log.
-"""]]
diff --git a/doc/bugs/Automatic_upgrades_should_be_cryptographically_signed.mdwn b/doc/bugs/Automatic_upgrades_should_be_cryptographically_signed.mdwn
deleted file mode 100644
--- a/doc/bugs/Automatic_upgrades_should_be_cryptographically_signed.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-All builds of git-annex should be cryptographically signed.  Especially the automatic upgrades.
-
-Signing doesn't minimise the likelihood of unwanted software being installed, but it helps reduce it.
-
-*Please* Joey...
diff --git a/doc/bugs/Backup_repository_doesn__39__t_get_all_files.mdwn b/doc/bugs/Backup_repository_doesn__39__t_get_all_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Backup_repository_doesn__39__t_get_all_files.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-[[!meta title="assistant should try sending old/deleted versions of files to backup repositories"]]
-
-### Please describe the problem.
-Backup group repositories don't download all "unused" files when running the webapp.
-
-
-### What steps will reproduce the problem?
-Run the webapp, set up two local repositories:
-
-1 - Use this for testing, set to manual type
-
-2 - Use for backups, set to full backup type
-
-Create some files, change them, etc.  See that files and history get transferred from #1 --> #2
-
-Change #2 to being "don't sync".  For example, you are running out of disk space, or are off the network.
-
-Edit a file in #1 a couple of times.  Now change #2 to synchronise.
-
-Now, #2 will reflect #1 in the current state.
-
-Stop the annex assistant.
-
-Change #2 to being indirect mode.  Try to checkout a previous revision. There will be broken symlinks.  git annex get will fail with "no copies of this file" type errors.
-
-
-My expectation (incorrectly?) was that all the "history" of my files would be automatically transferred to the backup group repos.  It seems only the git commits are transferred, but the "unused" file content isn't.
-
---- 
-
-What this tells me is that any changes that occur whilst I am not networked are entirely localised to my machine.  If this is the design expectation, can we squash commits before sending them?  There seems to be no point in having commits pointing to file content that has no chance of being accessed.
-
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 5.20131130-gc25be33
-
-
-> This was fixed in 5.20140127; the assistant now does a daily sweep of
-> unused files to move them to backup repositories when possible. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/Bootstrap3_icons_missing_on_Android.mdwn b/doc/bugs/Bootstrap3_icons_missing_on_Android.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/Bootstrap3_icons_missing_on_Android.mdwn
@@ -0,0 +1,7 @@
+I’m running git-annex 5.20140517-gee56d21 on Android 4.3.
+
+A number of icons seem to be missing since the bootstrap3 update:
+
+<img src="http://heh.fi/tmp/git-annex-missing-icons.png" alt="git-annex missing icons" width="540">
+
+[[!tag confirmed done]]
diff --git a/doc/bugs/Build-depends_needs___39__hxt__39___added_-_3.20121127.mdwn b/doc/bugs/Build-depends_needs___39__hxt__39___added_-_3.20121127.mdwn
deleted file mode 100644
--- a/doc/bugs/Build-depends_needs___39__hxt__39___added_-_3.20121127.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-What steps will reproduce the problem?
-
-Install git-annex via cabal - either from Hackage or as a manual install.  (i.e. <http://git-annex.branchable.com/install/cabal/>)
-
-What is the expected output? What do you see instead?
-
-Expect a clean install.
-
-However, get the following error:
-
-    Assistant/Install.hs:24:8:
-        Could not find module `Data.AssocList'
-        It is a member of the hidden package `hxt-9.3.1.1'.
-        Perhaps you need to add `hxt' to the build-depends in your .cabal file.
-        Use -v to see a list of the files searched for.
-
-
-What version of git-annex are you using? On what operating system?
-
-git-annex: 3.20121127
-OS: Mac OSX 10.6.8
-
-Please provide any additional information below.
-
-The fix seems to be as simple as adding 'htx' to the 'git-annex.cabal' file:
-
-    Executable git-annex
-      Main-Is: git-annex.hs
-      Build-Depends: MissingH, hslogger, directory, filepath,
-       unix, containers, utf8-string, network (>= 2.0), mtl (>= 2.1.1),
-       bytestring, old-locale, time,
-       -- Added htx here
-       hxt,
-       pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
-
-> I removed the need for hxt, which was accidental. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Build_error_on_Linux.mdwn b/doc/bugs/Build_error_on_Linux.mdwn
deleted file mode 100644
--- a/doc/bugs/Build_error_on_Linux.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-### Please describe the problem.
-Building on Linux, with a particular combination of flags, failed due to missing `async`.
-
-### What steps will reproduce the problem?
-1. Configure with the following flag combination
-
-        cryptohash -quvi -feed tdfa -testsuite -android production -dns -xmpp -pairing -webapp -assistant dbus inotify -webdav s3
-
-2. Attempt to build and you'll get an error on line 16 of `Utility/Batch.hs` because `Control.Concurrent.Async` isn't available.
-
-### What version of git-annex are you using? On what operating system?
-Version 4.20131024 on Linux
-
-### Please provide any additional information below.
-
-This is the patch I applied to `git-annex.cabal`:
-
-                 CPP-Options: -DWITH_KQUEUE
-                 C-Sources: Utility/libkqueue.c
-     
-    +  if os(linux)
-    +    Build-Depends: async
-    +
-       if os(linux) && flag(Dbus)
-         Build-Depends: dbus (>= 0.10.3)
-         CPP-Options: -DWITH_DBUS
-
-> Feel async is core enough it should depend on it unconditionally.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Build_error_on_Mac_OSX_10.6.mdwn b/doc/bugs/Build_error_on_Mac_OSX_10.6.mdwn
deleted file mode 100644
--- a/doc/bugs/Build_error_on_Mac_OSX_10.6.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-While following the instructions given at the OSX build page , I get this error:
-
-$ make
-ghc -O2 -Wall -ignore-package monads-fd -fspec-constr-count=5 --make git-annex
-
-Utility/JSONStream.hs:14:8:
-    Could not find module `Text.JSON':
-      Use -v to see a list of the files searched for.
-make: *** [git-annex] Error 1
-
-> Updated the instructions. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Building_on_OpenBSD.mdwn b/doc/bugs/Building_on_OpenBSD.mdwn
deleted file mode 100644
--- a/doc/bugs/Building_on_OpenBSD.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-### Please describe the problem.
-Hi!
-I just tried to build git-annex through cabal on OpenBSD and encountered some issues.
-
-First I had to install a certain commit of network-info that fixes some compile-time errors (https://github.com/jystic/network-info/issues/6)
-Then I had to disable WebDAV in git-annex because DAV wouldn't build (I don't use webdav anyway)
-
-After this git-annex still failed to build, though configure works.
-### What steps will reproduce the problem?
-Compiling on openbsd through cabal
-
-### What version of git-annex are you using? On what operating system?
-git-annex-5.20131130 on OpenBSD 5.4
-
-### Please provide any additional information below.
-
-[[!format sh """
-The error in question:
-[312 of 389] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o )
-
-Assistant/Pairing/Network.hs:101:21:
-    Not in scope: type constructor or class `IPv4'
-
-Assistant/Pairing/Network.hs:102:21:
-    Not in scope: data constructor `IPv4'
-
-Assistant/Pairing/Network.hs:104:21:
-    Not in scope: type constructor or class `IPv6'
-
-Assistant/Pairing/Network.hs:105:21:
-    Not in scope: data constructor `IPv6'
-
-Assistant/Pairing/Network.hs:108:32:
-    Not in scope: data constructor `IPv4'
-
-Assistant/Pairing/Network.hs:109:47:
-    Not in scope: data constructor `IPv6'
-"""]]
-
-> [[done]]; see comment --[[Joey]]
diff --git a/doc/bugs/Cabal_cannot_solve_dependencies.mdwn b/doc/bugs/Cabal_cannot_solve_dependencies.mdwn
deleted file mode 100644
--- a/doc/bugs/Cabal_cannot_solve_dependencies.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-### Please describe the problem.
-
-This is a follow up of [[Problems building on Mac OS X]].
-As of 4.20130521.1, cabal still cannot resolve the dependencies.
-
-### What steps will reproduce the problem?
-
-    cabal update
-    cabal install git-annex-4.20130521.1 --user --only-dependencies
-
-### Please provide any additional information below.
-
-[[!format sh """
-Resolving dependencies...
-cabal: Could not resolve dependencies:
-trying: git-annex-4.20130521.1
-trying: git-annex-4.20130521.1:+webapp
-trying: yesod-form-1.3.0
-trying: yesod-core-1.2.1
-rejecting: yesod-default-1.2.0 (conflict: git-annex-4.20130521.1:webapp =>
-yesod-default(<1.2))
-rejecting: yesod-default-1.1.3.2, 1.1.3.1, 1.1.3, 1.1.2, 1.1.1, 1.1.0.2,
-1.1.0.1, 1.1.0 (conflict: yesod-core==1.2.1, yesod-default => yesod-core>=1.1
-&& <1.2)
-rejecting: yesod-default-1.0.1.1, 1.0.1, 1.0.0 (conflict: yesod-core==1.2.1,
-yesod-default => yesod-core>=1.0 && <1.1)
-rejecting: yesod-default-0.6.1 (conflict: yesod-core==1.2.1, yesod-default =>
-yesod-core>=0.10.1 && <0.11)
-rejecting: yesod-default-0.5.0 (conflict: yesod-core==1.2.1, yesod-default =>
-yesod-core>=0.9.4 && <0.10)
-rejecting: yesod-default-0.4.1, 0.4.0, 0.3.1 (conflict: yesod-core==1.2.1,
-yesod-default => yesod-core>=0.9 && <0.10
-"""]]
-
-> At the risk of closing early again, I have uploaded a .2 with
-> hints for the version of yesod-form and yesod-static. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Cabal_dependency_monadIO_missing.mdwn b/doc/bugs/Cabal_dependency_monadIO_missing.mdwn
deleted file mode 100644
--- a/doc/bugs/Cabal_dependency_monadIO_missing.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-Just issuing the command `cabal install` results in the following error message.
-
-    Command/Add.hs:54:3:
-        No instance for (Control.Monad.IO.Control.MonadControlIO
-                           (Control.Monad.State.Lazy.StateT Annex.AnnexState IO))
-          arising from a use of `handle' at Command/Add.hs:54:3-24
-
-Adding the dependency for `monadIO` to `git-annex.cabal` should fix this?  
--- Thomas
-
-> No, it's already satisfied by `monad-control` being listed as a
-> dependency in the cabal file. Your system might be old/new/or broken,
-> perhaps it's time to provide some details about the version of haskell
-> and of `monad-control` you have installed? --[[Joey]] 
-
->> Closing as apparently user error or a broken system.
->> If you see this problem please do say. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Calls_to_rsync_don__39__t_always_use__annex-rsync-options.mdwn b/doc/bugs/Calls_to_rsync_don__39__t_always_use__annex-rsync-options.mdwn
deleted file mode 100644
--- a/doc/bugs/Calls_to_rsync_don__39__t_always_use__annex-rsync-options.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-What steps will reproduce the problem?
-
-Add a rsync special remote - one that you need a username/password to access (stored in text file $HOME/.rsync.password):
-
-    $ git annex initremote myrsync type=rsync rsyncurl=rsync://username@rsync.example.com/myrsync encryption=none
-    $ git annex describe myrsync "rsync server"
-    $ git config remote.myrsync.annex-rsync-options "--password-file=$HOME/.rsync.password"
-
-Copy a file to the remote:
-
-    $ git annex -d copy my-file --to myrsync
-
-What is the expected output? What do you see instead?
-
-Expect to see the file copied over to the rsync remote, but the check doesn't use the annex-rsync-options and asks for a password.  The debug output is:
-
-    copy my-file (checking myrsync...) [2012-10-28 01:01:01 EST] call: sh ["-c","rsync --quiet 'rsync://username@rsync.example.com/myrsync/[...SNIP...]' 2>/dev/null"]
-
-However the actual copy does use annex-rsync-options and the copy works:
-
-    [2012-10-28 01:01:05 EST] read: rsync ["--password-file=/home/blah/.rsync.password","--progress","--recursive","--partial","--partial-dir=.rsync-partial","/home/blah/annex/.git/annex/tmp/rsynctmp/12345/","rsync://username@rsync.example.com/myrsync"]
-
-
-What version of git-annex are you using? On what operating system?
-
-git-annex: 3.20121017
-
-OS: Ubuntu 12.04
-
-Please provide any additional information below.
-
-I think this fix is as easy as including the annex-rsync-options wherever rsync is called.
-
-> I belive there was only the one place this was neglected. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn b/doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn
deleted file mode 100644
--- a/doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-Hi there,
-
-After updating to 3.20111203 (on Arch Linux) I noticed I was not able to use `git annex get` from a SSH remote (server running Arch Linux, same version of git-annex): "requested key is not present". Same behavior with current master (commit 6cf28585). I had no issue with the previous version (3.20111122).
-
-On this server, I was able to track down the issue using `git-annex-shell inannex` and `strace`:
-
-    $ strace -f -o log git-annex-shell inannex ~/photos-annex.git WORM-s369360-m1321602916--2011-11-17.jpg   
-    $ echo $?
-    1
-    $ tail -n20 log
-    [...]
-    25623 chdir("/home/schnouki/git-annex") = 0
-    25623 stat("/home/schnouki/photos-annex.git/annex/objects/082/676/WORM-s369360-m1321602916--2011-11-17.jpg/WORM-s369360-m1321602916--2011-11-17.jpg", {st_mode=S_IFREG|0400, st_size=369360, ...}) = 0
-    25623 open("annex/objects/082/676/WORM-s369360-m1321602916--2011-11-17.jpg/WORM-s369360-m1321602916--2011-11-17.jpg", O_RDONLY) = -1 ENOENT (No such file or directory)
-    [...]
-
-Note there is a call to `stat()` with the full path to the requested file, and *then* a call to `open()` with a relative path -- which calls this call to fail, and git-annex-shell to return 1. With 3.20111122, there was no call to `stat()`, just a successful call to `open()` with a full absolute path.
-
-Using `git bisect` I was able to determine that this bug appeared in commit 64672c62 ("refactor"). Reverting it makes `git-annex-shell` work as expected, but I'm sure there are better ways to fix this. However I don't know enough Haskell to do it myself.
-
-Could you please try to fix this in a future version?
-
-> Thanks for a very good bug report. 
-> 
-> I've fixed this stupid mistake introduced in the code refactoring.
-> [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/Can__39__t_rename___34__here__34___repository.mdwn b/doc/bugs/Can__39__t_rename___34__here__34___repository.mdwn
deleted file mode 100644
--- a/doc/bugs/Can__39__t_rename___34__here__34___repository.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-Trying to rename the "here" repository fails
-
-### What steps will reproduce the problem?
-* Start git-annex webapp in the console (for the first time, or remove old annex directory + .config/git-annex)
-* In the browser window that opens click "Make repository"
-* The "here" repository should show up in the dashboard
-* Go to settings and select edit
-* Change the repository name (e.g. to here2) and click save changes
-* You should be back at the dashboard and the repository name is still "here"
-
-
-### What version of git-annex are you using? On what operating system?
-* git-annex version: 4.20130601
-* build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-* built using cabal
-* on Ubuntu 13.04 32bit
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2013-06-12 22:22:57 CEST] main: starting assistant version 4.20130601
-(scanning...) [2013-06-12 22:22:57 CEST] Watcher: Performing startup scan
-(started...) 
-
-# End of transcript or log.
-"""]]
-
-> Made text field for this repository disabled. The current repository has no remote name to edit. [[done]] --[[Joey]]
diff --git a/doc/bugs/Can__39__t_set_repositories_directory.mdwn b/doc/bugs/Can__39__t_set_repositories_directory.mdwn
deleted file mode 100644
--- a/doc/bugs/Can__39__t_set_repositories_directory.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-Can't set the repository directory
-
-
-At beginning during the webapp installation
-
-
-0.0.1 for OS X 10.8.2
-
-
-user error (git ["--git-dir=/Users/filippo/Desktop/annex/.git","--work-tree=/Users/filippo/Desktop/annex","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 128)
-
-[[!tag moreinfo assistant]]
-
-> [[done]]; based on the comment, this was a broken git email issue, which
-> git-annex now works around. --[[Joey]]
diff --git a/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9.mdwn b/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9.mdwn
deleted file mode 100644
--- a/doc/bugs/Can__39__t_set_up_rsync.net_repo_on_OS_X_10.9.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-### Please describe the problem.
-
-I can't seem to add the rsync.net remote on an OS X 10.9 machine running git-annex assistant version 5.20140128-g0ac94c3. The process complains about a missing `/usr/libexec/ssh-askpass` in the logs, and after a few retries rsync.net locks me out. This program doesn't exist on my system.
-
-### What steps will reproduce the problem?
-
-1. Click "Add another repository"
-2. Pick rsync.net
-3. Enter the credentials I got in the email from rsync.net
-4. Click "Use this rsync repository"
-
-The resulting logs will state that `/usr/libexec/ssh-askpass` can't be found.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex assistant version 5.20140128-g0ac94c3 on OS X 10.9.1.
-
-### Please provide any additional information below.
-
-I think I have found a workaround in creating that program as a shell script which echoes my password to stdout, but can't test right now because rsync.net have wisely ratelimited my password login attempts. (-:
-
-I'll update this page if I can confirm the workaround works.
-
-(I fully intend to roll that password as soon as I'm in, so no worries about a stale password falling into evildoers' hands.)
diff --git a/doc/bugs/Can__39__t_start_it_on_Debian_Wheezy.mdwn b/doc/bugs/Can__39__t_start_it_on_Debian_Wheezy.mdwn
deleted file mode 100644
--- a/doc/bugs/Can__39__t_start_it_on_Debian_Wheezy.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-### Please describe the problem.
-After install I dont get any link to start the program even though can start it from terminal.
-
-### What steps will reproduce the problem?
-$ sudo apt-get install git-annex
---->After install...
-$ git annex assistant
-$ git annex webapp
---->Seems like syntax of the command is not correct, I get the help to write the command correctly.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 3.20120629
-Debian Wheezy 64bits XFCE
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-I don't know where is that log
-
-# End of transcript or log.
-"""]]
-
-> Wheezy was released before git-annex had the webapp. If you want it,
-> install the backport. [[done]] --[[Joey]]
diff --git a/doc/bugs/Cannot_build_the_latest_with_GHC_7.6.1.mdwn b/doc/bugs/Cannot_build_the_latest_with_GHC_7.6.1.mdwn
deleted file mode 100644
--- a/doc/bugs/Cannot_build_the_latest_with_GHC_7.6.1.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-What steps will reproduce the problem?
-
-cabal install git-annex
-
-What is the expected output? What do you see instead?
-
-I get this:
-
-    Assistant/WebApp/Configurators/Local.hs:55:11:
-    `fieldEnctype' is not a (visible) field of constructor `Field'
-
-What version of git-annex are you using? On what operating system?
-
-20121127
-
-Please provide any additional information below.
-
-> [[done]]; see comments. --[[Joey]] 
diff --git a/doc/bugs/Cannot_copy_to_a_git-annex_remote.mdwn b/doc/bugs/Cannot_copy_to_a_git-annex_remote.mdwn
deleted file mode 100644
--- a/doc/bugs/Cannot_copy_to_a_git-annex_remote.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-What steps will reproduce the problem?
-
-I really have no way to reproduce.  I have these two annex repository, both living on CentOS 6.3 machines, using SSH to copy from one to the other.  Everything has always worked fine, and I've copied hundreds of gigabytes and tens of thousands of files so far without a problem.
-
-What is the expected output? What do you see instead?
-
-I do "git copy --to storage FILE" and it says "Copying FILE... failed".  That's it.
-
-How do I fix things so that I can copy again?  Nothing that I tried had any effect on the problem.
-
-Thanks!
-
-> Thanks to Jim's smart correlation of this with another bug, I've fixed
-> them both. [[done]] --[[Joey]]
diff --git a/doc/bugs/Check_for_minimum_Git_version.mdwn b/doc/bugs/Check_for_minimum_Git_version.mdwn
deleted file mode 100644
--- a/doc/bugs/Check_for_minimum_Git_version.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-### Please describe the problem.
-
-git-annex does not check for the minimum version of Git that it requires, and therefore it sometimes uses flags which my installed Git does not recognize.
-This happens when converting some indirect repositories to direct ones on an older server.
-
-### What steps will reproduce the problem?
-
-git annex direct
-
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 5.20131130
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-direct iTunes/iTunes Media/iTunes U/Statistics 110_ Probability/Strategic Practice and Homework 9.pdf ok
-direct iTunes/iTunes Media/iTunes U/Statistics 110_ Probability/Syllabus.pdf ok
-direct  error: unknown switch `B'
-usage: git checkout [options] <branch>
-   or: git checkout [options] [<branch>] -- <file>...
-
-# End of transcript or log.
-"""]]
-
-> git-annex checks the git version at compile time and arranges to use
-> commands that will work with that version of git at run time.
-> 
-> Adding a runtime check for a minimum git version would slow every git-annex
-> command down and so I don't want to do it. It's up to the user to not
-> built git-annex with a new version of git and then try to use it with an
-> old version of git.
-> 
-> `git checkout -B` seems to have been added to git quite a long time ago
-> (2010), in version 1.7.1.1. I've made git-annex check at compile
-> time if being built with such an old version and refuse to build.
-> [[done]]. --[[Joey]]
diff --git a/doc/bugs/Committer_crashed.mdwn b/doc/bugs/Committer_crashed.mdwn
deleted file mode 100644
--- a/doc/bugs/Committer_crashed.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-# What steps will reproduce the problem?
-
-Editing a text file with vim
-
-#What is the expected output? What do you see instead?
-
-    # On branch master
-    # Changes not staged for commit:
-
-    #   (use "git add <file>..." to update what will be committed)
-    #   (use "git checkout -- <file>..." to discard changes in working directory)
-    #
-    #       typechange: test
-    #
-    # Untracked files:
-    #   (use "git add <file>..." to include in what will be committed)
-    #
-    #       .test.swp
-
-    no changes added to commit (use "git add" and/or "git commit -a")
-
-    /.test.swp still has writers, not adding
-
-    Committer crashed: ./test~: createLink: does not exist (No such file or directory)
-
-# What version of git-annex are you using? On what operating system?
-
-3.20130107 prebuilt tar ball on Debian testing
-
-> Could also fail in `getFileStatus`. In either case it's a race
-> with the file being deleted while it's still in the process of being
-> locked down. Fixed this [[done]] --[[Joey]]
diff --git a/doc/bugs/Compile_needs_more_than_1.5gb_of_memory.mdwn b/doc/bugs/Compile_needs_more_than_1.5gb_of_memory.mdwn
deleted file mode 100644
--- a/doc/bugs/Compile_needs_more_than_1.5gb_of_memory.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-What steps will reproduce the problem?
-
-> cabal install git-annex
-
-What is the expected output? What do you see instead?
-
-> I would expect a working git-annex on my little linode. I have a linode 768 and trouble building the latest version. The process get's killed because of an out of memory condition.
-
-What version of git-annex are you using? On what operating system?
-
-> git-annex version: 4.20130314
-> Ubuntu 12.04
-
-Please provide any additional information below.
-
-[[done]]
diff --git a/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn b/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn
deleted file mode 100644
--- a/doc/bugs/Complete_failure_trying_to_unannex_a_large_annex.mdwn
+++ /dev/null
@@ -1,56 +0,0 @@
-I really don't know what's happened here, I just did `git annex unannex .` in a very large annex:
-
-    unannex Inbox/Lolcat.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Lolcat.jpg (Recording state in git...)
-    ok
-    unannex Inbox/May 2012 Photo Stream/120502_0004.JPG (Recording state in git...)
-    ok
-    unannex Inbox/May 2012 Photo Stream/120518_0005.JPG (Recording state in git...)
-    ok
-    unannex Inbox/May 2012 Photo Stream/120523_0006.JPG (Recording state in git...)
-    ok
-    unannex Inbox/May 2012 Photo Stream/120523_0007.JPG (Recording state in git...)
-    ok
-    unannex Inbox/My boyfriend of 7 years and I are both physicists. Here's how he proposed to me. - Imgur.jpg (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121102_0035.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121102_0036.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121102_0037.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121102_0038.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121102_0039.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121103_0040.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121104_0041.JPG (Recording state in git...)
-    ok
-    unannex Inbox/Nov 2012 Photo Stream/121105_0042.JPG (Recording state in git...)
-    error: bad index file sha1 signature
-    fatal: index file corrupt
-    git-annex: failed to read sha from git write-tree
-    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121105_0042.JPG"] failed
-    Vulcan:~/Pictures $ ga unannex .
-    unannex Inbox/Nov 2012 Photo Stream/121109_0043.JPG error: bad index file sha1 signature
-    fatal: index file corrupt
-
-    git-annex: fd:12: hClose: resource vanished (Broken pipe)
-    failed
-    git-annex: pre-commit: 1 failed
-    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121109_0043.JPG"] failed
-    Vulcan:~/Pictures $ ga -F unannex .
-    unannex Inbox/Nov 2012 Photo Stream/121124_0044.JPG error: bad index file sha1 signature
-    fatal: index file corrupt
-
-    git-annex: fd:12: hClose: resource vanished (Broken pipe)
-    failed
-    git-annex: pre-commit: 1 failed
-    git-annex: git commit [Param "-q",Params "-m",Param "content removed from git annex",Param "--",File "Inbox/Nov 2012 Photo Stream/121124_0044.JPG"] failed
-
-I guess now I'll just try to unlink the symlinks by hand, and drop the `.git` directory?
-
-> [[done]]; per my comment this seems like a corrupt git repository.
-> --[[Joey]]
diff --git a/doc/bugs/Conflicting_archive_descriptions.mdwn b/doc/bugs/Conflicting_archive_descriptions.mdwn
deleted file mode 100644
--- a/doc/bugs/Conflicting_archive_descriptions.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-This is confusing:
-
-"Next we come to the archive repositories.The archive repositories coordinate together, so that each file is archived in only one place. **When you move files into a folder named "archive"**, they'll be moved to an archive repository, and removed from all your client repositories. This is handy if you have old files you don't need anymore, but want to keep archived for later. When you copy or move a file out of an "archive" folder, it'll be retrieved from the archive repository."
-
-"The small archive repositories are like other archive repositories, but smaller. While archive repositories normally accumulate every file they can, small archive repositories only accumulate files **once you put them in an "archive" directory.**"
-
-Based upon those descriptions, I don't know what the difference is.
-
-> Improved wording to not imply that files are only put into archive
-> repositories once the files are moved to archive directories.
-> (Which is how small archive repositories work.)
-> 
-> If you're still confused about it, see
-> <http://git-annex.branchable.com/assistant/archival_walkthrough/>
-> 
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/ControlPath_too_long_for_Unix_domain_socket.mdwn b/doc/bugs/ControlPath_too_long_for_Unix_domain_socket.mdwn
deleted file mode 100644
--- a/doc/bugs/ControlPath_too_long_for_Unix_domain_socket.mdwn
+++ /dev/null
@@ -1,53 +0,0 @@
-What steps will reproduce the problem?
-Pairing an existing git annex repository with a fresh repository on another computer in the git-annex webapp
-
-
-What is the expected output? What do you see instead?
-Expected result is that the two machines sync correctly.
-
-What i see are some "ControlPath <data>  too long for unix domain socket" errors from ssh, but the computers do actually sync properly. 
-
-Even though the data is synced properly, either the sender(or both of the clients) don't actually realize this. And the queue circles, all the transfers are being redone constantly(On every start of git-annex webapp on the original repository at least).
-
-
-What version of git-annex are you using? On what operating system?
-Latest git master as of this post. Debian sid and Ubuntu 12.04
-
-
-Please provide any additional information below.
-
-
-stdout snippet from git-annex webapp:
-
-
-    ControlPath "/home/alansmithee/Desktop/annex/.git/annex/ssh/alansmithee@git-annex-debbook.local-alansmithee.dxpXHVCkLhsxvWaH" too long for Unix domain socket
-    SHA256-s51233--0b4c59b3ab03b1ca6d95d4084fa6ff7220cf26695b6e3dd575f78af3dec6b701
-           51233 100%    5.43MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-    sent 30 bytes  received 51385 bytes  102830.00 bytes/sec
-    total size is 51233  speedup is 1.00
-    ok
-    (Recording state in git...)
-
-    ControlPath "/home/alansmithee/Desktop/annex/.git/annex/ssh/alansmithee@git-annex-debbook.local-alansmithee.9ZQwEjraTxi20B6W" too long for Unix domain socket
-    SHA256-s47883982--4b7cbb49506dcdd223a9db7b400cc41fc2e3ebbf5b2b17b75c9334bb949b6754
-        47883982 100%    1.34MB/s    0:00:34 (xfer#1, to-check=0/1)
-
-    sent 30 bytes  received 47889978 bytes  1388116.17 bytes/sec
-    total size is 47883982  speedup is 1.00
-    ok
-    (Recording state in git...)
-
-
-This data appears on both the sending and receiving git-annex stdout. At least for the initial sync. For later syncs it only appears on the sender, though the client system is using a lot of resources.
-
-> I've made git-annex detect if the control path would be too long,
-> and disable ssh connection caching. It also tries a relative path
-> to the file, which tends to make it shorter, and I think would
-> keep ssh connection caching working in your example.
-> 
-> Please test and see if it works, and also if the "looping" problem
-> still happens. --[[Joey]]
-
->> Closing; I'm pretty sure the looping is just transfer retrying, to be
->> expected if they fail. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Could_not_find_module_Data.Default.mdwn b/doc/bugs/Could_not_find_module_Data.Default.mdwn
deleted file mode 100644
--- a/doc/bugs/Could_not_find_module_Data.Default.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-**What steps will reproduce the problem?**
-
-Manually building git-annex from git.
-
-**What is the expected output? What do you see instead?**
-
-    $ cabal update
-    ...
-    $ cabal install --only-dependencies
-    ...
-    $ cabal configure
-    ...
-    $ cabal build
-    Building git-annex-3.20120826...
-    Preprocessing executable 'git-annex' for git-annex-3.20120826...
-    
-    Utility/Yesod.hs:15:8:
-        Could not find module `Data.Default'
-        It is a member of the hidden package `data-default-0.5.0'.
-        Perhaps you need to add `data-default' to the build-depends in your .cabal file.
-        Use -v to see a list of the files searched for.
-    $
-
-**What version of git-annex are you using? On what operating system?**
-
-commit e7d728672a5fc923be9ab1d6fe4b65f2058b49c7
-Arch Linux
-
-**Please provide any additional information below.**
-
-When I add data-default to git-annex.cabal's Build-Deps it works fine.
-
-> Thanks, [[done]]. --[[Joey]]
diff --git a/doc/bugs/Could_not_read_from_remote_repository.mdwn b/doc/bugs/Could_not_read_from_remote_repository.mdwn
--- a/doc/bugs/Could_not_read_from_remote_repository.mdwn
+++ b/doc/bugs/Could_not_read_from_remote_repository.mdwn
@@ -24,3 +24,5 @@
 """]]
 
 [[!meta title="xmpp syncing sometimes fails"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/Could_not_resolve_dependencies.mdwn b/doc/bugs/Could_not_resolve_dependencies.mdwn
deleted file mode 100644
--- a/doc/bugs/Could_not_resolve_dependencies.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-I'm not able to install git-annex with cabal.
-
-What steps will reproduce the problem?
-
-    bbigras@bbigras-VirtualBox:~$ cabal update
-    Downloading the latest package list from hackage.haskell.org
-    bbigras@bbigras-VirtualBox:~$ cabal install git-annex --bindir=$HOME/bin
-    Resolving dependencies...
-    cabal: Could not resolve dependencies:
-    trying: git-annex-3.20130207 (user goal)
-    trying: git-annex-3.20130207:+webdav
-    trying: git-annex-3.20130207:+webapp
-    trying: git-annex-3.20130207:+assistant
-    trying: yesod-1.1.8.2 (dependency of git-annex-3.20130207:+assistant)
-    trying: yesod-auth-1.1.5.2 (dependency of yesod-1.1.8.2)
-    trying: authenticate-1.3.2.4 (dependency of yesod-auth-1.1.5.2)
-    trying: xml-conduit-1.1.0.1 (dependency of authenticate-1.3.2.4)
-    next goal: DAV (dependency of git-annex-3.20130207:+webdav)
-    rejecting: DAV-0.3 (conflict: xml-conduit==1.1.0.1, DAV => xml-conduit>=1.0 &&
-    <=1.1)
-    rejecting: DAV-0.2, 0.1, 0.0.1, 0.0 (conflict: git-annex-3.20130207:webdav =>
-    DAV(>=0.3))
-    bbigras@bbigras-VirtualBox:~$
-
-
-What version of git-annex are you using? On what operating system?
-
-Ubuntu 12.10 x86_64
-
-cabal-install version 0.14.0
-using version 1.14.0 of the Cabal library
-
-> The Haskell DAV library needs to be updated to build with
-> the newer version of xml-conduit. Library skew of this sort 
-> is common when using cabal.
-> 
-> You can work around this by building git-annex without webdav:
-> `cabal configure --flags=-WebDAV`
-> 
-> This is not a git-annex bug. [[done]] --[[Joey]]
diff --git a/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn b/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn
deleted file mode 100644
--- a/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn
+++ /dev/null
@@ -1,43 +0,0 @@
-What steps will reproduce the problem?
-
-I create a new annex, added in a bunch of files.
-
-I cloned this annex to another machine, where I already had those files, so I copied them into a directory named "foo", did "git annex add foo", and then did "git rm -r foo", and git commit'd my clone of the annex.
-
-Then I try to "git annex sync" with the remote.
-
-What is the expected output? What do you see instead?
-
-I don't know, I've never used git-annex before.  This is what I get each time:
-
-    Hermes ~/Products/tmp/Movies (master) $ ga sync
-    git-annex-shell: Prelude.(!!): index too large
-
-What version of git-annex are you using? On what operating system?
-
-It's the 'master' as of yesterday: c504f4025fec49e62601fbd4a3cd8f1270c7d221
-
-I'm on OS X 10.8.2, using GHC 7.6.1.  The annex in question has 38G in a few hundred files.
-
-Please provide any additional information below.
-
-I'm willing to help track this down!
-
-> I've got it, October 9th's release 
-> included commit bc649a35bacbecef93e378b1497f6a05b30bf452, which included a
-> change to a `segment` function. It was supposed to be a
-> rewrite in terms of a more general version, but it introduced a bug
-> in what it returned in an edge case and this in turn led git-annex-shell's
-> parameter parser to fail in a code path that was never reachable before.
-> 
-> It'd fail both when a new repo was running `git-annex-shell configlist`,
-> and in `git-annex-shell commit`, although this latter crash was less
-> noticible and I'm sure you saw the former.
-> 
-> Fixed the reversion; fixed insufficient guards around the partial code
-> (which I cannot see a way to entirely eliminate sadly; look at
-> GitAnnexShell.hs's `partitionParams` and weep or let me know if you have 
-> any smart ideas..); added a regression test to check the non-obvious
-> behavior of segment with an empty segment. I'll be releasing a new
-> version with this fix as soon as I have bandwidth, ie tomorrow.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Crash_when_adding_jabber_account_.mdwn b/doc/bugs/Crash_when_adding_jabber_account_.mdwn
deleted file mode 100644
--- a/doc/bugs/Crash_when_adding_jabber_account_.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-*What steps will reproduce the problem?*
-
-1. Start git-annex webapp
-2. Configuration
-3. Configure Jabber Account
-4. Insert user and pass
-5. Click "User this account"
-
-Tryed 4 times, all the same.
-
-
-*What is the expected output? What do you see instead?*
-
-On Chrome I get "Error 101 (net::ERR_CONNECTION_RESET): The connection was reset." or "Error 324 (net::ERR_EMPTY_RESPONSE): The server closed the connection without sending any data."
-
-On the terminal where git-annex was running I get "Segmentation fault (core dumped)"
-
-
-*What version of git-annex are you using? On what operating system?*
-
-git-annex version: I downloaded 3.20130107 (twice to be sure), but for some reason 'git-annex version' reports 3.20130102 
-
-OS: Ubuntu 12.04.1 LTS 3.2.0-35-generic-pae #55-Ubuntu SMP Wed Dec 5 18:04:39 UTC 2012 i686 i686 i386 GNU/Linux
-
-
-*Please provide any additional information below.*
-
-On dmesg: 
-[45773.212717] git-annex[26779]: segfault at b724e840 ip 09699150 sp b4cfd038 error 7 in git-annex[8048000+1762000]
-
-[[!tag /design/assistant]]
-> [[done]], see comments --[[Joey]] 
diff --git a/doc/bugs/Creating_a_box.com_repository_fails.mdwn b/doc/bugs/Creating_a_box.com_repository_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/Creating_a_box.com_repository_fails.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-### Please describe the problem.
-
-Adding a repository on box.com, using the assistant, fails with an error message (as seen in the log below).
-
-### What steps will reproduce the problem?
-
-Start up the assistant. Create a new empty repository. Enable consistency checking as suggested. Click add another repository, select box.com, fill in your credentials, keep shared ticked and encrypt all selected, click add repository. Error message appears.
-
-
-### What version of git-annex are you using? On what operating system?
-
-5.20140117.1 from ppa of François Marier
-
-ubuntu 13.10 (saucy), i686
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2014-01-26 20:40:10 CET] main: starting assistant version 5.20140117.1
-[2014-01-26 20:40:10 CET] Cronner: You should enable consistency checking to protect your data. 
-(Recording state in git...)
-(scanning...) [2014-01-26 20:40:10 CET] Watcher: Performing startup scan
-(started...) [2014-01-26 20:41:10 CET] Cronner: Consistency check in progress
-
-(Recording state in git...)
-(encryption setup) (shared cipher) (testing WebDAV server...)
-26/Jan/2014:20:41:24 +0100 [Error#yesod-core] InternalIOException <socket: 32>: hPutBuf: illegal operation (handle is closed) @(yesod-core-1.2.3:Yesod.Core.Class.Yesod ./Yesod/Core/Class/Yesod.hs:471:5)
-
-# End of transcript or log.
-"""]]
-
-> Seems that [DAV-0.6 is badly broken](http://bugs.debian.org/737902).
-> I have adjusted the cabal file to refuse to build with that broken
-> version.
-> 
->> Update: Had to work around additional breakage in DAV-0.6. It's
->> fully tested and working now, although not yet uploaded to Debian
->> unstable. [[done]] --[[Joey]]
diff --git a/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn b/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn
--- a/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn
+++ b/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn
@@ -16,3 +16,4 @@
 Please provide any additional information below.
 
 [[!tag /design/assistant]]
+[[!tag confirmed]]
diff --git a/doc/bugs/DS__95__Store_not_gitignored.mdwn b/doc/bugs/DS__95__Store_not_gitignored.mdwn
deleted file mode 100644
--- a/doc/bugs/DS__95__Store_not_gitignored.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-What steps will reproduce the problem?
-
-Create a new git repo on OS X.  create a .gitignore file containing the line ".DS_Store".  Check it into git.  do "git annex init" to make the directory into a git annex repo.  do "git annex direct" to put it in direct mode.  do "git annex assistant" to start the assistant and watch it with "git annex webapp".
-
-Open the directory in the finder.  Drag in some files and watch the assistant as it checks them in.  Play with your window's viewing preferences, maybe view things as "icons" so that the finder is forced to store metadata about where you dragged the icons in the window in the .DS_Store file.  As you do this, watch the webapp.  .DS_Store will start to be checked into git annex, and rechecked in frequently as it is updated.  Git annex assistant is not respecting the .gitignore file.  Is there some other way to tell git annex assistant that certain files should be ignored than .gitignore?
-
-
-What is the expected output? What do you see instead?
-
-.DS_Store files are ignored by the assistant.
-
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 3.20130124
-
-OS X Lion
-
-Please provide any additional information below.
-
-> Assistant does not support .gitignore yet. Requires an efficient query
-> interface for ignores, which git does not provide.
->
-> However, I've added a special case, OSX only ignore for .DS_Store files.
-> [[done]] --[[Joey]] 
-
diff --git a/doc/bugs/Daemon_stops_working_on_mounted_CIF_share.mdwn b/doc/bugs/Daemon_stops_working_on_mounted_CIF_share.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/Daemon_stops_working_on_mounted_CIF_share.mdwn
@@ -0,0 +1,10 @@
+### Please describe the problem.
+If have a directory - mounted CIF share (windows server with domain). 
+If i run "git annex assistant" or "git annex watch" daemon starts fine and works at first, but then after some time stops doing anything: no messages in .git/annex/daemon.log, process hangs in ps aux. 
+
+If i try to "cat .git/annex/daemon.pid" I get "permission denied". And permission is denied for everyone: root, from other windows machines, etc. 
+
+If i then kill daemon process and start daemon again everything repeats.
+
+### What version of git-annex are you using? On what operating system?
+Standalone git-annex 5.20140421-g515d251 on CentOS 6.5
diff --git a/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn b/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn
deleted file mode 100644
--- a/doc/bugs/Detection_assumes_that_shell_is_bash.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-###What steps will reproduce the problem?###
-
-"Adding a remote server using ssh" and try to add a remote server where the account has ex. tcsh as loginshell
-
-###What is the expected output? What do you see instead?###
-
-To discover remote programs, it dumps away some born-shell code like:
-"echo git-annex-probe loggedin;if which git-annex-shell; then echo git-annex-probe git-annex-shell; fi;if which rsync; then echo git-annex-probe rsync; fi;if which ~/.ssh/git-annex-shell; then echo git-annex-probe ~/.ssh/git-annex-shell; fi"
-
-just wrap it with a bash -c '..' and you know that its interpreted by bash.
-
-###What version of git-annex are you using? On what operating system?###
-
-git-annex version: 3.20121017
-
-###Please provide any additional information below.###
-
-Not everyone has bash as there login-shell.
-
-[[!tag /design/assistant]]
-
-> [[done]]; assistant now uses sh -c "sane shell stuff here" to work
-> around csh. (There are systems without bash, but probably fewer without sh)
-> --[[Joey]]
diff --git a/doc/bugs/Difficult_to_troubleshoot_XMPP_login_failures.mdwn b/doc/bugs/Difficult_to_troubleshoot_XMPP_login_failures.mdwn
deleted file mode 100644
--- a/doc/bugs/Difficult_to_troubleshoot_XMPP_login_failures.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-### Please describe the problem.
-
-I have a jabber account on `jabber.ccc.de`. When trying to log in to that account, I get "Unable to connect to the Jabber server. Maybe you entered the wrong password? (Error message: AuthenticationFailure)" I've typed the password enough times that I'm relatively certain that I've typed it correctly at least once. It's difficult to see behind this error message. This is the only thing that shows up in the debug log:
-
-    [2013-05-26 21:40:16 EDT] read: host ["-t","SRV","--","_xmpp-client._tcp.jabber.ccc.de"]
-    [2013-05-26 21:40:16 EDT] read: host ["-t","SRV","--","_xmpp-client._tcp.jabber.ccc.de"]
-
-It'd be great if this error were a wee bit more verbose.
-
-> The XMPP library has been updated to include the actual error message from the server.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Direct_mode_keeps_re-checksuming_duplicated_files.mdwn b/doc/bugs/Direct_mode_keeps_re-checksuming_duplicated_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Direct_mode_keeps_re-checksuming_duplicated_files.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-##What steps will reproduce the problem?
-
-    mkdir test
-    git init
-    git annex init "test"
-    echo "test" > a
-    echo "test" > b
-    git annex add a b
-    git annex sync
-    git annex direct
-    git annex sync | grep add
-    git annex sync | grep add
-
-##What is the expected output? What do you see instead?
-
-The last two syncs shouldn't need to add or checksum anything.
-Firstly, the output is very confusing because the files have already been added.
-Secondly, the sync can take quite a while if you have lots of duplicates or a lot of files that are incidentally similar.
-
-##What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130227 on Archlinux
-
-> [[done]]; fixed inode caching code to support multiple files for the
-> same content. --[[Joey]] 
diff --git a/doc/bugs/Direct_mode_repositories_end_up_with_unstaged_changes.mdwn b/doc/bugs/Direct_mode_repositories_end_up_with_unstaged_changes.mdwn
deleted file mode 100644
--- a/doc/bugs/Direct_mode_repositories_end_up_with_unstaged_changes.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-### Please describe the problem.
-
-After running two repositories syncing with one another in direct mode "git status" shows unstaged changes in both.
-
-### What steps will reproduce the problem?
-
-1. Create two direct mode repositories with each other as ssh remotes
-2. Run "git annex assistant" on each
-3. Create files on each and they get synced
-4. Run "git status"
-
-In my current repository the output is:
-
-[[!format sh """
-$ git status
-# On branch master
-# Changes not staged for commit:
-#   (use "git add <file>..." to update what will be committed)
-#   (use "git checkout -- <file>..." to discard changes in working directory)
-#
-#	typechange: fromgolias
-#	typechange: fromwintermute
-#
-no changes added to commit (use "git add" and/or "git commit -a")
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-
-[[!format sh """
-$ git annex version
-git-annex version: 4.20130516.1
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-local repository version: 4
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-
-$ lsb_release -a
-No LSB modules are available.
-Distributor ID:	Ubuntu
-Description:	Ubuntu 12.04.2 LTS
-Release:	12.04
-Codename:	precise
-"""]]
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Direct_mode_repositories_still_use_symlinks_sometimes.mdwn b/doc/bugs/Direct_mode_repositories_still_use_symlinks_sometimes.mdwn
--- a/doc/bugs/Direct_mode_repositories_still_use_symlinks_sometimes.mdwn
+++ b/doc/bugs/Direct_mode_repositories_still_use_symlinks_sometimes.mdwn
@@ -30,3 +30,7 @@
 Release:	12.04
 Codename:	precise
 """]]
+
+[[!meta title="git-annex does not guarantee modified files are available when merging with a new version of a repository"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn b/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn
deleted file mode 100644
--- a/doc/bugs/Discrepancy_between_git_annex_add_and_git_annex_watch.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-### Please describe the problem.
-
-`git annex add` does not add dotfiles (as per the man page) while `git annex watch` does (nothing on the man page). It's not a bug, but rather a surprise (at least to me).
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-git init dotfiles
-cd dotfiles
-git annex init "my dotfiles"
-echo test > test.txt
-echo dottest > .dotest.txt
-git annex add
-git commit -a -m "initial dots"
-git annex whereis .dotest.txt # no answer, as expected
-git annex watch
-git annex whereis .dotest.txt # answers that .dotest.txt is here
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20131101, ubuntu 12.04 with all updates.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Improved documentation. [[done]] --[[Joey]]
diff --git a/doc/bugs/Displayed_copy_speed_is_wrong.mdwn b/doc/bugs/Displayed_copy_speed_is_wrong.mdwn
deleted file mode 100644
--- a/doc/bugs/Displayed_copy_speed_is_wrong.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-When copying data to my remote, I regularly see speeds in excess of 100 MB/s on my home DSL line.
-
-    2073939 100%  176.96MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-This is definitely not correct.
-
-> Closing, as rsync does this to show you when it's making your life
-> faster than it would be w/o rsync. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn b/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn
deleted file mode 100644
--- a/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-I just noticed that if you move a git-annex symlink to a location ignored by git, it simply works.  Upon committing that change, however, part of git-annex's `fix` function apparently tries to `git-add` the symlink.  This fails because the new, ignored location requires a `git-add --force`.
-
-Considering that git proper doesn't fail or warn, I think git-annex shouldn't either.
-
-This is the error message:
-
-	$ git mv annexed-file ignored-dir/
-	$ git commit
-	fix ignored-dir/annexed-file ok
-	(Recording state in git...)
-	The following paths are ignored by one of your .gitignore files:
-	ignored-dir
-	Use -f if you really want to add them.
-	fatal: no files added
-	Command xargs ["-0","git","--git-dir=/home/[...]/repo/.git","--work-tree=/home/[...]/repo","add","--"] failed; exit code 123
-
-	git-annex: user error (Command xargs ["-0","git","--git-dir=/home/[...]/repo/.git","--work-tree=/home/[...]/repo","add","--"] failed; exit code 123)
-	failed
-	git-annex: 1 failed
-
-> Weird edge case.. ok, fixed. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Every_new_file_gets_symlinked_to_a_git_object.mdwn b/doc/bugs/Every_new_file_gets_symlinked_to_a_git_object.mdwn
deleted file mode 100644
--- a/doc/bugs/Every_new_file_gets_symlinked_to_a_git_object.mdwn
+++ /dev/null
@@ -1,78 +0,0 @@
-### Please describe the problem.
-Every file I add to a watched repository (by git-annex assistant) becomes symlinked, and sub-subsequently write protected.
-
-Sorry if I'm missing something obvious.
-
-### What steps will reproduce the problem?
-1) Fresh install
-2) create directory, init repo and git-annex
-3) git annex assistant
-4) add a file
-5) ls -lsa to see the symlinked file
-6) trying to write to the file throws a write-protected error
-
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130725-g8140f7c  
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP  
-local repository version: 3  
-default repository version: 3  
-supported repository versions: 3 4  
-upgrade supported from repository versions: 0 1 2
-
-Using the generic linux distribution with ./runshell on Ubuntu 13.04 (I saw this same behaviour from the ubuntu package, i.e. apt-get install git-annex)
-
-
-### Please provide any additional information below.
-
-Here is the output from my ls -lsa
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
- 4 drwxrwxr-x  3 jetaggart jetaggart  4096 Jul 27 20:38 .
-16 drwx------ 60 jetaggart jetaggart 16384 Jul 27 20:44 ..
- 4 drwxrwxr-x  7 jetaggart jetaggart  4096 Jul 27 20:38 .git
- 4 lrwxrwxrwx  1 jetaggart jetaggart   188 Jul 27 20:38 another.org -> .git/annex/objects/Qm/j7/SHA256E-s11--9484d4be897ca66ad4c9bbf299d12adfe37e089bbca1daecbbb49c375a9cf1e9.org/SHA256E-s11--9484d4be897ca66ad4c9bbf299d12adfe37e089bbca1daecbbb49c375a9cf1e9.org
- 4 lrwxrwxrwx  1 jetaggart jetaggart   186 Jul 27 20:33 blah.org -> .git/annex/objects/kj/q5/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.org/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.org
-12 -rw-rw-r--  1 jetaggart jetaggart   119 Jul 27 20:37 todo.org
-
-
-# End of transcript or log.
-"""]]
-
-Here is the daemon.log
-
-[[!format sh """
-
-[2013-07-27 20:32:55 BST] main: starting assistant version 4.20130725-g8140f7c
-(scanning...) [2013-07-27 20:32:55 BST] Watcher: Performing startup scan
-(started...) 
-[2013-07-27 20:33:52 BST] Committer: Adding blah.org
-add blah.org (checksum...) ok
-[2013-07-27 20:33:52 BST] Committer: Committing changes to git
-(Recording state in git...)
-(Recording state in git...)
-[2013-07-27 20:35:59 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:36:01 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:37:52 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:37:55 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:38:44 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:38:46 BST] Committer: Adding another.org
-add another.org (checksum...) ok
-[2013-07-27 20:38:46 BST] Committer: Committing changes to git
-(Recording state in git...)
-(Recording state in git...)
-[2013-07-27 20:38:51 BST] Committer: Committing changes to git
-(Recording state in git...)
-[2013-07-27 20:38:56 BST] Committer: Committing changes to git
-(Recording state in git...)
-
-# End of transcript or log.
-"""]]
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name.mdwn b/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+
+git-annex build on Windows does not complete when user name has a space in it
+
+### What steps will reproduce the problem?
+
+Build git-annex from scratch as described on the Windows page of the guide when running as user Joe Blogs
+
+
+### What version of git-annex are you using? On what operating system?
+
+Windows 7 Prof, Cygwin install on 28/5/2014
+
+### Please provide any additional information below.
+
+The problem arises in escapeDosPaths of EvilLinker: windows usernames can have spaces in them which also need escaping
+
+[[!tag confirmed]]
diff --git a/doc/bugs/Fails_to_create_remote_repo_if_no_global_email_set.mdwn b/doc/bugs/Fails_to_create_remote_repo_if_no_global_email_set.mdwn
deleted file mode 100644
--- a/doc/bugs/Fails_to_create_remote_repo_if_no_global_email_set.mdwn
+++ /dev/null
@@ -1,55 +0,0 @@
-### Please describe the problem.
-Trying to create repo on ssh server failed because git didn't know my email.
-
-There were other issues I encountered:
-
- - While connecting to the server assistant says that there will be a password prompt, but doesn't tell that one should expect it to appear in the terminal.
-
- - When creating keys it says that I will be prompted for key password again, but it asks for password to remote server (I understood it wanted a password for its new key pair).. there is no telling for what those password prompts in terminal are for
-
- - It actually requires password for remote server multiple times before it starts to use its own keys
-
- - When failed to test the server or create the repo there the "Retry" button doesn't work (does nothing)
-
- - Maybe it should strip leading ~ from repo name?
-
- - Local pairing with annex 3.20121112ubuntu4 from Ubuntu 13.04  sort of works, but not quite.. it syncs the files, but assistant on Ubuntu doesn't show the name for repo on Gentoo (matching versions are important?)
-
- - When pairing it doesn't check if localhost has running sshd
-
- - I think that was the reason why progress bars were showing pending transfers even after the status message about syncing was green after starting sshd (synced, already up-to-date)
-
-### What steps will reproduce the problem?
-Create repo on remote ssh server without global git settings.
-
-### What version of git-annex are you using? On what operating system?
-git-annex-4.20130601, Gentoo amd64
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-Initialized empty shared Git repository in /home/reinis/~/Annex/Lit/
-init  
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: unable to auto-detect email address (got 'reinis@RD-HC.(none)')
-
-git-annex: user error (git ["--git-dir=/home/me/~/Annex/Lit","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] efailed
-xited 128)
-git-annex: init: 1 failed
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; I've made git-annex detect such broken systems and configure them so git will work. (sigh!) --[[Joey]]
diff --git a/doc/bugs/Finding_an_Unused_file.mdwn b/doc/bugs/Finding_an_Unused_file.mdwn
deleted file mode 100644
--- a/doc/bugs/Finding_an_Unused_file.mdwn
+++ /dev/null
@@ -1,152 +0,0 @@
-### Please describe the problem.
-
-SHA256E makes it difficult or impossible to find the original filename
-
-### What steps will reproduce the problem?
-
-I have these unused files:
-
-    $ git annex unused
-    unused . (checking for unused data...) (checking master...) (checking backupbook/HEAD...) (checking b
-    aster...) (checking lang/a-...) (checking lang/master...) 
-      Some annexed data is no longer used by any files:
-        NUMBER  KEY
-        1       SHA256-s9107031--2611c08c9822179c443f001f0bd7ecadf29adcd28edfa4cd1d8938d289cd3950
-        2       SHA256E-s31131336--58c48adad8e5f091981549dfbb2d9ec1003c8c46d1a660673fabefe722358f9b.flac
-        3       SHA256-s9941549--db12950459ba039e6e6f6102a0811213c11a717d140d6e2f169049b958a5e047
-        4       SHA256-s11544438--174514684e03035cc741fa397a1b46f925899bd29189a98173f8f2a136d95ace
-        5       SHA256E-s23445007--4659fae3eda6db7c528af6439fafab1496c740d02bdb67892450a8a2208fb29b.flac
-        6       SHA256E-s47080709--7d331788ae7fee16bccce060c62cafa3cdafc9e0a2b387c0843cfe5871f51fa6.flac
-        7       SHA256E-s33262563--3280607d6d397f84a02542c5ab2e5a9c44d60256b330e3d075078694f0c7f709.flac
-        8       SHA256-s6522640--a1fa374afd62e8c85a115f18f78e679722f63980191c1e11ef84a49ae86f5b4f
-        9       SHA256E-s29266138--27e792d64b6d4a4d44bdafe6867ca25ba79480d1b650cf385e67ff28a1fc5c31.flac
-        10      SHA256-s14568326--023eb9fcefc063ee3ea495f4d382a8feac795d0e1a81c585781f5d369db2e00c
-        11      SHA256-s11907175--73b66220bdbf0ca92209605b93d95d5f9e8247745f9c4367ff20cb53e11c24ac
-        12      SHA256-s9193267--e159038b78c1b239d4cb8eeb892c7acf0e7b82feac7f5b5808dad477605e8478
-        13      SHA256E-s39329047--880ffab99c4b4c48224f409acb0cd797737e4ee70eacdba9bc7d7628ba3d05d7.flac
-        14      SHA256E-s31400468--17ad7b13757d4e4d6e5d193d8295a30f566e00eea82bc19f50dc14b2bbf79ef3.flac
-        15      SHA256E-s51514687--f83eb092ddcdf35e7f729bfa2cc0914b404de60f0b42f69f207cf01766061f16.flac
-        16      SHA256E-s36235648--54e3f893b498b205b0b96bd87d5f14c71712e891c518070a0e1c730d92b3b0ac.flac
-        17      SHA256-s10001177--35afb0b91c8b9f711b2d3b0fe7433ecc3bb13aece78c6170a47323c94233133d
-        18      SHA256-s11830142--3dabe97ccbb68045d9ea82036ddf7211a3925a1bf682e05a32bcdf9b07bec676
-        19      SHA256E-s23102994--f848ed216e6ba17e6b539f31caa5af36266c367ed55dcff243445848b01fbeef.flac
-        20      SHA256E-s38505547--967763ddd42daf782afa9299e67cb5c834153cb20242b50115dda566b24a68c4.flac
-        21      SHA256-s11874975--14774a404526c4b68ede146f527202c59a4bee88376707c93df7da3bdb5345f2
-        22      SHA256-s10188700--18fd4ee62c2b3b1d8944eae528b59de2a45d493a291440edc9b30881ba10ece3
-        23      SHA256E-s53024109--eba924a26f7c602b60a83f208b2204ef3b570fd92ff39fbc067eeaec7c443ab6.flac
-        24      SHA256-s11315225--0a8d2165166995e819e8c78302c45b1eeca9b79a5d77a3574885cbf8e18f265a
-        25      SHA256-s12249573--79b9e551051232079f24902078e1fe5b7daed684e8acaa7cf29c191404a7c3c7
-        26      SHA256E-s47991289--79cfd8db5b3cbe7f50c335bfe0d148c38ff36dbc97b17ea3aff23d642bd5d167.flac
-        27      SHA256E-s76961343--80e91f73e2f3ae6790d752d380118b3fadc223f9f1449354daa0095b5713986c.flac
-        28      SHA256E-s44706648--ce782096aa5c0d58a12f7cbd6dbfe032fa7b0b4810219e23f906bd7fa0d96336.flac
-        29      SHA256-s9393784--1e0e0190030352b3583ce515cd6dfb0db9f2ae39809a462099482947193bfd0f
-        30      SHA256E-s11534608--bfcc0fdcb1ed112b1737d4fe7d2aa88511187d4c1c132bf1b7ab2cda9a7d90ad.flac
-        31      SHA256E-s27916580--1f196e1b6312421f9d9bcd227a3885a5dec299fc47748cd34d5e59fe26374187.flac
-        32      SHA256-s12099941--0a33af0293acb7cffa1727cc04efa4d7abb29a39e8f2165bfd565e2b18879430
-        33      SHA256E-s35578262--01d6f6022161bcaa825cb353012f85bacf3dcb930337ba506fc94b663b0d8043.flac
-        34      SHA256E-s38880984--fa326bd0db5c9e400a4256e77acd488fede23ec714aeab7deb6952091a09e318.flac
-        35      SHA256E-s27784704--a426f885d79d88d8b42b8a23ce267fb1c1855e8f7ff6833ec9ea61860b3c6819.flac
-        36      SHA256-s11827390--17c1e84815805ea7e01555fdfa038a643a97621b84073679d5c649c020750652
-        37      SHA256E-s16632423--9735e37261624360f6a54fd1bc8a893cb5344afdc910e6b9e00c5791036759b0.flac
-        38      SHA256-s10809006--7dd7ff078bdf4571bee6ab06213df970f427a8a2af476d4511a9c08ed0fb814d
-        39      SHA256E-s33043364--3603942143fa4b1c0082ab7ba1db9b536621402eea3ac94e08ef0197062a2ef6.flac
-        40      SHA256E-s33278052--62e1038e26894c6c014af4e77d2d9f79074ff4fc1ca9ca8c16fcc98eee5277c7.flac
-        41      SHA256E-s47299134--0b604bff3ce12d077691d6e6428648da879c021537c094c72633209d5302fd97.flac
-        42      SHA256E-s14882445--16c6aa4aaf8e60da617701281dfdfa372cb049636ae0f10f5aefcd8ce6c472af.flac
-        43      SHA256E-s18168736--dfd7bfe9a433daef89f6f0015dfddaf7ac3611dd31813b0aed049171ac008323.flac
-        44      SHA256-s10060170--9e3b638c4f397d8dbaa2fa9fc2bfacf6f9e93f00c80ee1fdd26971d25aff86ce
-        45      SHA256E-s25630107--26fedc816dee58cb999cd2be8a58f3e8726ff056ba9c2abfbb9d149e7a92a230.flac
-        46      SHA256-s9148609--3f29a2ae1ebd2e4857bb5c92aefb2f50f39a5a984e14645f658d15795a7c72a5
-        47      SHA256-s10576861--7d95469441ef205616ed795012d8a4c59acc00be00aca66bcacd8b041c2499c5
-        48      SHA256E-s23806802--8725d04f04925f4cd456bdb2108a48682cf51a498d97af9f71c58a412b8db9ab.flac
-        49      SHA256E-s43187837--e83648296fa4553556596464efd4ab313529c0062071c9a40113fecede7a5de6.flac
-        50      SHA256-s10384945--055a01b7e06f3165dddd10beb3e98ba4ca47b35abf9d5b2f26187bf07b9aa401
-        51      SHA256E-s54253300--b011eea8ec7ea51f22e0fe09645ffe83183e9589a9784ebc2d6dd0c559f07322.flac
-        52      SHA256-s10335583--008c17c1a994884c6b9c52e10d17373b9160136ffab940992ef0f9d08eac45c1
-        53      SHA256-s9769970--b36fcb01d9df7627106e3a3c283944457f3e282ab62878c186162d465530cfbc
-        54      SHA256-s10329964--dc4d82e085af3ade48d33cf828f8e7eecc27d4c33c448965e1b8bb59832ec473
-        55      SHA256-s10625243--2494e2ef2c64fc77dcb063f7b58079ad668cf46862b7f11eb28943d45f21b8dd
-        56      SHA256E-s44585111--e35b0774729ccf547cd62e652425579781e3cbd76b33a17a0127bdbedb90606a.flac
-        57      SHA256E-s42060728--9e0a533e640086fadefad7167d37d5b3c5de899e1ac5890bfd7a88524701ff14.flac
-        58      SHA256E-s30013479--ae34a897e2f0e1124f04396e75dd41749511ce9930a2891ae3a066597ad518c5.flac
-        59      SHA256E-s38896704--ca6211442c33d9c44b997bef8f1079f07cdd2eb0e9e3c1de1eda9ae8a705f137.flac
-        60      SHA256-s13044938--8714a1db8781daa9f3993128dcda5a5ca904e075723cf38a11bc5e3695cf126f
-        61      SHA256-s8814622--ba374e92c53ddb83605e2b500647117a00e4c6c463653cb0dd0311b76627c2ec
-        62      SHA256E-s14900839--e94089b89629561ebf771543236f31439af1e6fcdce7ff56b9a183041e95e7ea.flac
-        63      SHA256E-s27370218--a4717cf0615cda099ea5740194da8b4e349f2f38f6ebbf5f6111ced7f56d1736.flac
-        64      SHA256E-s57686070--6d02689ccf91317bdfa4d8694ccbf7a9ccf00a7e00b92733769194908b4087d9.flac
-        65      SHA256-s8707306--7f05e3e3dc4336eb7012d5bbb6d3d65047552901858ee4967e4a70d100fd1deb
-        66      SHA256E-s42482194--bb7a968ec9bc0a8813974af9173c38cb39a43aa7d0c2aec203ddb358119e1f25.flac
-        67      SHA256E-s31951334--b19789a9bbb98cb25df7b8a1b6d8856256bc2851cd892c91dddba7cf736542c5.flac
-        68      SHA256E-s35901187--8eae2684aa3566b632a1797bd09d112dd5f438c98b649c000d71640983a549f2.flac
-        69      SHA256E-s40659631--f6ca3227b14c7c050877ce4cc1218fea7582426649cd68fc82a74cae5d6962b4.flac
-        70      SHA256E-s41415180--9c6f0000da119bd70422fe9529c41efb3103ca943697bdfb685f119f6b5ae6fd.flac
-        71      SHA256E-s52313976--e4a59c65e05bd9450ef595b3c08365810205731952e45a68ee0c89bc76fbd9fc.flac
-        72      SHA256E-s44925214--eabc5f7172d5c2e094ff84a5ecce784c172b175c8eeca861aa3996749668ea42.flac
-      (To see where data was previously used, try: git log --stat -S'KEY')
-      
-      To remove unwanted data: git-annex dropunused NUMBER
-      
-    ok
-
-And running:
-
-    $ git log --stat -S'SHA256-s13044938--8714a1db8781daa9f3993128dcda5a5ca904e075723cf38a11bc5e3695cf126f'
-    commit 767a63a54784139f13d69d12fcfbee8f6ca3df41
-    Author: Matthew Forrester <matt@keyboardwritescode.com>
-    Date:   Fri Aug 23 21:38:31 2013 +0100
-    
-        Remove Roger Shah - Openminded! as there is another copy in Unsorted with correct? filenames
-    
-     Amazon/Roger Shah/Openminded!/1114 - Shine (Album Mix).mp3 | 1 -
-     1 file changed, 1 deletion(-)
-    
-    commit 6b04002c03287fb8918bdcdeaae393e862bebd4e
-    Author: Matthew Forrester <matt@keyboardwritescode.com>
-    Date:   Thu Aug 8 21:30:14 2013 +0100
-    
-        Initial checkin
-    
-     Amazon/Roger Shah/Openminded!/1114 - Shine (Album Mix).mp3 | 1 +
-     1 file changed, 1 insertion(+)
-
-Works but I cannot find out how to get the `.flac` files working:
-
-
-`$ git log --stat -S'SHA256E-s38896704--ca6211442c33d9c44b997bef8f1079f07cdd2eb0e9e3c1de1eda9ae8a705f137.flac'`
-
-`$ git log --stat -S'SHA256E-s38896704--ca6211442c33d9c44b997bef8f1079f07cdd2eb0e9e3c1de1eda9ae8a705f137'`
-
-`$ git log --stat -S'SHA256-s38896704--ca6211442c33d9c44b997bef8f1079f07cdd2eb0e9e3c1de1eda9ae8a705f137'`
-
-
-None of which give answers. I don't know if I'm doing it wrong (though I __think__ I'm doing what the instructions say), but I can't make it work.
-
-
-### What version of git-annex are you using? On what operating system?
-
-$ uname -a
-Linux fozz-desktop 3.8.0-31-generic #46-Ubuntu SMP Tue Sep 10 19:56:49 UTC 2013 i686 i686 i686 GNU/Linux
-
-$ git annex version
-git-annex version: 3.20121112ubuntu2
-local repository version: 3
-default repository version: 3
-supported repository versions: 3
-upgrade supported from repository versions: 0 1 2
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> If `git log -S` does not find the key, then it was not used for any
-> commit currently in the git repository. Which is certainly possible;
-> for example `git annex add file; git rm file`.
-> 
-> This is a dup of [[todo/wishlist: option to print more info with 'unused']]; [[done]] --[[Joey]] 
diff --git a/doc/bugs/GPG_can__39__t_handle_some_files.mdwn b/doc/bugs/GPG_can__39__t_handle_some_files.mdwn
deleted file mode 100644
--- a/doc/bugs/GPG_can__39__t_handle_some_files.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-
-It looks like GPG is being used in text mode, or at least isn't overriding the GPG config.
-
-### What steps will reproduce the problem?
-
-Have a binary file with long lines, and attempt to copy it into git-annex.
-
-This will happen:
-
-    $ git-annex copy 09\ Into\ The\ Dissonance.mp3 -t rsync.net_annex
-    copy 09 Into The Dissonance.mp3 (gpg) (checking rsync.net_annex...) (to rsync.net_annex...) gpg: can't handle text lines longer than 19995 characters
-    failed
-    git-annex: copy: 1 failed
-
-A workaround is to remove "textmode" from your gpg.conf, but git-annex should force this.
-
-### What version of git-annex are you using? On what operating system?
-
-7ae625363bcb6e1fc8b3733c1d7814aca05a2368 on Ubuntu 13.04 x86_64
-
-> The sheer number of ways gpg offers of shooting yourself in the foot..
-> Ok [[done]] --[[Joey]] 
diff --git a/doc/bugs/GPG_passphrase_repeated_prompt.mdwn b/doc/bugs/GPG_passphrase_repeated_prompt.mdwn
--- a/doc/bugs/GPG_passphrase_repeated_prompt.mdwn
+++ b/doc/bugs/GPG_passphrase_repeated_prompt.mdwn
@@ -22,3 +22,4 @@
 Not sure if I'm just missing a setting for GPG, but I would think I should only need to use the web app to configure the remote server.
 
 [[!tag /design/assistant]]
+[[!tag confirmed]]
diff --git a/doc/bugs/GPG_problem_on_Mac.mdwn b/doc/bugs/GPG_problem_on_Mac.mdwn
deleted file mode 100644
--- a/doc/bugs/GPG_problem_on_Mac.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-### Please describe the problem.
-Adding a box.com repository fails with an Internal server error and the message "user error (gpg ["--quiet","--trust-model","always","--batch","--passphrase-fd","48","--symmetric","--force-mdc"] exited 2)"
-
-Looking at the logfile it seems like git-annex is looking for gpg (gpg-agent) in /usr/local/MacGPG2/bin/. On my system it is in /usr/local/bin (installed using homebrew). I do not have the directory /usr/local/MacGPG2/.
-
-Not sure if what the git-annex philosophy is: detect the location of such external programs or ship them together with git-annex.
-
-### What steps will reproduce the problem?
-Add a box.com repository (I assume every repository type that uses gpg will fail in the same way) on a Mac.
-
-
-### What version of git-annex are you using? On what operating system?
-* git-annex version 4.20130626-g2dd6f84 (from https://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/)
-* Mac OS 10.8.4
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-(Recording state in git...)
-
-(encryption setup) (shared cipher) (testing WebDAV server...)
-(gpg) gpg: error running `/usr/local/MacGPG2/bin/gpg-agent': probably not installed
-gpg: DBG: running `/usr/local/MacGPG2/bin/gpg-agent' for testing failed: Configuration error
-gpg: can't connect to the agent: IPC connect call failed
-gpg: problem with the agent: No agent running
-27/Jun/2013:13:41:37 +0200 [Error#yesod-core] user error (gpg ["--quiet","--trust-model","always","--batch","--passphrase-fd","21","--symmetric","--force-mdc"] exited 2) @(yesod-core-1.1.8.3:Yesod.Internal.Core ./Yesod/Internal/Core.hs:550:5)
-# End of transcript or log.
-"""]]
-
-> [[done]]; I've updated the OSX autobuild to 
-> use a gpg that doesn't fail when gpg-agent is missing. --[[Joey]]
diff --git a/doc/bugs/Git-Annex_requires_all_repositories_to_repair.mdwn b/doc/bugs/Git-Annex_requires_all_repositories_to_repair.mdwn
--- a/doc/bugs/Git-Annex_requires_all_repositories_to_repair.mdwn
+++ b/doc/bugs/Git-Annex_requires_all_repositories_to_repair.mdwn
@@ -1,2 +1,3 @@
 I recently had my git-annex repository die and it needed to be repaired. Two of my repositories are external hard drives. When I tried to use git-annex repair, it would churn for some hours, then error because the external hard drives were not plugged in. When I brought the two hard drives home from the various places that they are (safely) stored, it all worked fine, but it would have been great if git-annex repair could somehow do what it could with what was connected and do the rest as and when the other drives are plugged in. This must only become more of a problem as git-annex is used for longer, as one may have a handful of USB keys storing a little on each.
 
+[[moreinfo]]
diff --git a/doc/bugs/Git_annex_add_fails_on_read-only_files.mdwn b/doc/bugs/Git_annex_add_fails_on_read-only_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Git_annex_add_fails_on_read-only_files.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-### Please describe the problem.
-
-Git annex cannot add/import files in folders without w or x permission
-
-Note that (as stated in the comments) this might not be a bug. The problem might somewhere within Git, because Git does not manage file permissions very well. I was just hoping that I could import large directory trees into git-annex with a simple call to "git annex import"; now it seems I have to fix their permissions first.
-
-### What steps will reproduce the problem?
-
-    $ cd /tmp
-    $ mkdir -p folder/subfolder
-    $ echo "some text" > folder/subfolder/some_file.txt
-    $ chmod 500 folder/subfolder
-    $ mkdir annex
-    $ cd annex
-    $ git init
-    $ git annex init "Testing git annex"
-    $ git annex import ../folder
-    Fails
-    $ chmod 600 ../folder/subfolder
-    $ git annex import ../folder
-    Fails
-    $ chmod 700 ../folder/subfolder
-    $ git annex import ../folder
-    Works. Subfolder now has 755 permissions
-
-### What version of git-annex are you using? On what operating system?
-
-    git-annex version: 4.20131106
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA CryptoHash
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-    remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-
-    git version 1.8.4.3
-
-> Based on the new example, I don't consider this to be a bug.
-> I don't think that `git annex import` should disregard directory
-> permissions when importing files from them.
-> 
-> One very good reason not to
-> eg, chmod the directory itself is that if it did, running `git annex
-> import` on a git-annex repository would defeat git-annex's own use of
-> directory permissions to prevent deletion of the files in that
-> repository!
-> 
-> So, [[done]] --[[Joey]]
diff --git a/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn b/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn
deleted file mode 100644
--- a/doc/bugs/Hanging_on_install_on_Mountain_lion.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-### Please describe the problem.
-
-In trying to install git-annex on my mac OSX Mountain Lion, the program is hanging when I open the program.
-
-### What steps will reproduce the problem?
-
-Open the DMG, drag the app to applications folder, double-click on the application. Web browser opens with a localhost url. The webpage says "Starting webapp..." and doesn't go anywhere. Initialization seems to fail and I need to force quit the application.
-
-### What version of git-annex are you using? On what operating system?
-
-I'm not totally sure (since it hangs and I can't check a version number, but since I just downloaded it now and the homepage says the latest version is "version 4.20130621" which was released 2 days and 13 hours ago, I assume that is it. 
-
-I'm using OSX 10.8.4.
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Fixed root cause. [[done]] --[[Joey]]
diff --git a/doc/bugs/Hangs_on_creating_repository_when_using_--listen.mdwn b/doc/bugs/Hangs_on_creating_repository_when_using_--listen.mdwn
deleted file mode 100644
--- a/doc/bugs/Hangs_on_creating_repository_when_using_--listen.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-### Please describe the problem.
-When using the git-annex webapp with the --listen paramter it as usual asks one to create a new repository on first startup. Selecting a repository location here and clicking "Make repository" button leads to a never ending loading browser and some git zombies. 
-
-### What steps will reproduce the problem?
-Two machines needed
-
-1. On machine one: git-annex webapp --listen=\<machine1-public-ip\>:34561 (you can choose another port as well)
-2. On machine two: use a browser to go to the url the last step gave you
-3. Click on make repository
-
-
-### What version of git-annex are you using? On what operating system?
-* git-annex version: 4.20130601
-* build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-* built using cabal
-* on Ubuntu 13.04 32bit
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2013-06-12 21:59:37 CEST] main: starting assistant version 4.20130601
-WebApp crashed: unable to bind to local socket
-[2013-06-12 21:59:37 CEST] WebApp: warning WebApp crashed: unable to bind to local socket
-
-  dbus failed; falling back to mtab polling (ClientError {clientErrorMessage = "runClient: unable to determine DBUS address", clientErrorFatal = True})
-
-  No known network monitor available through dbus; falling back to polling
-(scanning...) [2013-06-12 21:59:37 CEST] Watcher: Performing startup scan
-(started...) 
-
-
-# End of transcript or log.
-"""]]
-
-> The problem is that, when a port is specified, it is used for each web
-> server started, and the process of making a new repository unavoidably
-> requires it to start a second web server instance. This would also affect
-> switching between existing repositories in the webapp. I don't see
-> any way to make it not crash here, except for ignoring the port it was told
-> to use when something else is already listening there. --[[Joey]] 
-
-[[!tag /design/assistant]]
-
->> --listen no longer accepts a port. Use the new HTTPS support instead.
->> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Hard_links_not_synced_in_direct_mode.mdwn b/doc/bugs/Hard_links_not_synced_in_direct_mode.mdwn
--- a/doc/bugs/Hard_links_not_synced_in_direct_mode.mdwn
+++ b/doc/bugs/Hard_links_not_synced_in_direct_mode.mdwn
@@ -123,3 +123,4 @@
 """]]
 
 
+> [[confirmed]] (but may be out of scope for git-annex) --[[Joey]] 
diff --git a/doc/bugs/Incorrect_symlink_path_in_simple_submodule_use_case.mdwn b/doc/bugs/Incorrect_symlink_path_in_simple_submodule_use_case.mdwn
deleted file mode 100644
--- a/doc/bugs/Incorrect_symlink_path_in_simple_submodule_use_case.mdwn
+++ /dev/null
@@ -1,72 +0,0 @@
-### Please describe the problem.
-When creating a simple "parent" git repo, creating another "child" repo with an annexed file, then adding the child repo as a submodule of the parent, the symlink path of the large file contained by the submodule is incorrect.
-
-
-### What steps will reproduce the problem?
-Here are the exact steps for this simple use case (I have removed unrelated output for brevity, and setting up the repos is error-free):
-
-    # Create "parent" repo
-    $ mkdir parent
-    $ cd parent/
-    $ git init
-    $ touch parent_start
-    $ git add parent_start
-    $ git commit -a -m 'New parent repo'
-    $ cd ../
-    
-    # Create "child" repo
-    $ mkdir child
-    $ cd child/
-    $ git init
-    $ touch child_start
-    $ git add child_start
-    $ git commit -a -m 'New child repo'
-    $ git annex init
-    $ cp ~/Desktop/some_big_file child_big_file
-    $ git annex add child_big_file
-    $ git commit -a -m 'Added big file'
-    $ cd ../
-    
-    # Add "child" repo as a submodule of "parent" repo
-    $ cd parent/
-    $ git submodule add ../child ./submodule
-    $ git commit -m 'Added submodule'
-    
-    # Try to get annexed file
-    $ cd submodule/
-    $ git annex init
-    $ git annex get
-    $ ls ./
-    -rw-r--r--	.git
-    lrwxr-xr-x	child_big_file -> .git/annex/objects/F5/f2/SHA256E-s1117253--ce17632dfd9c61a0a8c1384d25fb3a8a197f8056f224e15fbcad89904a82c5fd/SHA256E-s1117253--ce17632dfd9c61a0a8c1384d25fb3a8a197f8056f224e15fbcad89904a82c5fd
-    -rw-r--r--	child_start
-    
-    # As you can see above, the child_big_file symlink path is incorrect (the ".git/annex/..." location is not a directory, and should instead be "../.git/modules/submodule/annex/...")
-    
-    # Show the actual location of the annexed file
-    $ cd ../
-    $ ls .git/modules/submodule/annex/objects/F5/f2/SHA256E-s1117253--ce17632dfd9c61a0a8c1384d25fb3a8a197f8056f224e15fbcad89904a82c5fd
-    -r--r--r--	SHA256E-s1117253--ce17632dfd9c61a0a8c1384d25fb3a8a197f8056f224e15fbcad89904a82c5fd
-
-
-### What version of git-annex are you using? On what operating system?
-Mac OS X Mountain Lion. git-annex files are from within the downloadable git-annex assistant.
-
-    $ sw_vers -productVersion
-    10.8.5
-    $ git --version
-    git version 1.7.12.4 (Apple Git-37)
-    $ git-annex version
-    git-annex version: 4.20131105-g136b030
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-    remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-
-
-Thanks for your help :)
-
-> This is a duplicate of [[Git_annexed_files_symlink_are_wrong_when_submodule_is_not_in_the_same_path]] [[done]] --[[Joey]]   
diff --git a/doc/bugs/Incorrect_version_on_64_Standalone_Build.mdwn b/doc/bugs/Incorrect_version_on_64_Standalone_Build.mdwn
deleted file mode 100644
--- a/doc/bugs/Incorrect_version_on_64_Standalone_Build.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-    $ wget https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz
-    $ tar xvzf git-annex-standalone-amd64.tar.gz
-    $ cd git-annex.linux
-    $ ./git-annex version
-    git-annex version: 4.20130324
-
-Shouldn't that be `4.20130405`?
-
-The md5sum of the build I downloaded is `aabbb3aa2397be206cae86f33db9eef4`.
-
-> [[done]]; new version will look like eg `4.20130410-gc149c67` --[[Joey]] 
diff --git a/doc/bugs/Install_of_git-annex-3.20121112_fails.mdwn b/doc/bugs/Install_of_git-annex-3.20121112_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/Install_of_git-annex-3.20121112_fails.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-What steps will reproduce the problem?
-
-- rm -rf ~/.ghc/ && cabal update && cabal install git-annex --bindir=$HOME/bin
-
-What is the expected output? What do you see instead?
-
-- I would like to have the latest release installed
-
-What version of git-annex are you using? On what operating system?
-
-- git-annex-3.20121112
-- Ubuntu 12.04 LTS
-- The Glorious Glasgow Haskell Compilation System, version 7.4.1
-
-Please provide any additional information below.
-
-I use it heavily on 4 machines since a month and I really like it.
-
-> closing since this is a cabal library problem, and not something that
-> can be fixed by any change to git-annex. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn
deleted file mode 100644
--- a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-What steps will reproduce the problem?
-
-* Start with a clean setup.
-* Allow webapp to start; use it to create annex in ~/Documents/annex That works.
-* Go to add remote repo. Removable drive.
-* Select "/Volumes/G-DRIVE slim". Click next.
-
-What is the expected output? What do you see instead?
-Expected is something like "done". What I see is
-
-Internal Server Error
-
-git config [Param "annex.uuid",Param "6898F314-7817-4CD5-B1C3-588C55522A3B"] failed
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version 3.20130107, OS X Mountain Lion. No MacPorts/homebrew/fink installed. gcc / git are installed.
-
-Please provide any additional information below.
-
-Maybe something to do with the drive name having spaces? "/Volumes/git-annex" worked fine.
-
-> Good thought in the comment. I was able to reproduce the failure
-> if the removable drive already had an "annex" directory that was not
-> a git repo. I've made it handle this case. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__.mdwn b/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__.mdwn
--- a/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__.mdwn
+++ b/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__.mdwn
@@ -17,3 +17,4 @@
 
 The man page lists how to configure rate limiting for rsync, not sure how to do it for this
 
+[[!tag confirmed]]
diff --git a/doc/bugs/Issue_on_OSX_with_some_system_limits.mdwn b/doc/bugs/Issue_on_OSX_with_some_system_limits.mdwn
--- a/doc/bugs/Issue_on_OSX_with_some_system_limits.mdwn
+++ b/doc/bugs/Issue_on_OSX_with_some_system_limits.mdwn
@@ -24,3 +24,4 @@
 > since we use FSEvents there instead. --[[Joey]] 
 
 [[!tag /design/assistant]]
+[[!tag confirmed]]
diff --git a/doc/bugs/JSON_output_broken_with___34__git_annex_sync__34__.mdwn b/doc/bugs/JSON_output_broken_with___34__git_annex_sync__34__.mdwn
deleted file mode 100644
--- a/doc/bugs/JSON_output_broken_with___34__git_annex_sync__34__.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-What steps will reproduce the problem?
-
-    $ git annex -j sync | json_reformat
-
-What is the expected output? What do you see instead?
-
-Expecting valid JSON, instead this happens:
-
-    $ git annex -j sync | json_reformat
-    lexical error: invalid char in json text.
-              {"command":"commit","file":""# On branch master nothing to c
-                         (right here) ------^
-    $
-
-
-What version of git-annex are you using? On what operating system?
-
-Newest standalone (3.20121126), Linux i386. The "json_reformat" program is from the "yajl-tools" .deb package.
-
-> [[done]]; I've updated the --json documentation to note that it only
-> works with some query commands. --[[Joey]] 
diff --git a/doc/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport.mdwn b/doc/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport.mdwn
deleted file mode 100644
--- a/doc/bugs/Jabber__47__xmpp_not_supported_on_Debian_Wheezy_backport.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-### Please describe the problem.
-I've installed Git-annex via the backport, everything looks fine. But when I go to Configuration>Configure jabber account I've got this message :
-
-[[!format sh """
- Jabber not supported
- This build of git-annex does not support Jabber. Sorry !
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-5.20140117~bpo70+1 and Debian Wheezy with lxde
-
-> Build dependency problem. Fixed and backport updated. [[done]] --[[Joey]]
diff --git a/doc/bugs/Killing_the_assistant_daemon_leaves_ssh_mux_sessions_behind.mdwn b/doc/bugs/Killing_the_assistant_daemon_leaves_ssh_mux_sessions_behind.mdwn
deleted file mode 100644
--- a/doc/bugs/Killing_the_assistant_daemon_leaves_ssh_mux_sessions_behind.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-### Please describe the problem.
-
-If the assistant daemon is killed, ssh mux sessions are left behind. Incidentally there may be a better way to stop the assistant daemon besides "killall git-annex" but I haven't found it in the docs.
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-$ ps aux | grep mux
-$ git-annex assistant
-$ date > fromwintermute # Just causing a change that needs to be pushed, any will do
-$ ps aux | grep mux
-pedrocr  32665  0.0  0.0   6396   948 ?        Ss   11:06   0:00 ssh: /home/pedrocr/testsync/.git/annex/ssh/golias.git-annex [mux]
-$ killall git-annex
-$ ps aux | grep mux
-pedrocr  32665  0.0  0.0   6396   948 ?        Ss   11:06   0:00 ssh: /home/pedrocr/testsync/.git/annex/ssh/golias.git-annex [mux]
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-
-[[!format sh """
-$ git annex version
-git-annex version: 4.20130516.1
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-local repository version: 4
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-$ lsb_release -a
-No LSB modules are available.
-Distributor ID:	Ubuntu
-Description:	Ubuntu 12.04.2 LTS
-Release:	12.04
-Codename:	precise
-"""]]
-
-
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Last_two_versions_didn__39__t_show_up_on_hackage.mdwn b/doc/bugs/Last_two_versions_didn__39__t_show_up_on_hackage.mdwn
deleted file mode 100644
--- a/doc/bugs/Last_two_versions_didn__39__t_show_up_on_hackage.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-### Please describe the problem.
-I don't know how the packages at hackage are managed, but the last version there is 4.20130601 while in the mean time there have been two other releases.
-
-### What steps will reproduce the problem?
-Check [[http://hackage.haskell.org/packages/archive/git-annex/]]
-
-> Thanks for reporting. Turns out that hackage was rejecting
-> it since it doesn't know about the OS name for the hurd. Since I 
-> am not sure I have the right name either, I have removed those bits
-> and re-uploaded.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Local_files_not_found.mdwn b/doc/bugs/Local_files_not_found.mdwn
deleted file mode 100644
--- a/doc/bugs/Local_files_not_found.mdwn
+++ /dev/null
@@ -1,50 +0,0 @@
-### Please describe the problem.
-
-I have a git annex repo which cannot find the files with whereis, even though the files and contents are there. I have changed ownership of all the files. I am not sure, but I think that is when the problem was introduced. The current user that is invoking git annex owns and can access all files in the repository/annex)
-
-Creating a new repository from scratch works just fine.
-
-
-### What steps will reproduce the problem?
-
-    # (in my current, somehow corrupt annex)
-    $ echo hello > testfile
-    $ git annex add testfile
-    add testfile (checksum...) ok
-    (Recording state in git...)
-    $ git commit -am testfile
-    [master 73ed120] testfile
-     1 file changed, 1 insertion(+)
-     create mode 120000 testfile
-    $ git annex whereis testfile
-    whereis testfile (0 copies) failed
-    git-annex: whereis: 1 failed
-    
-    
-    # The contents exists though
-    $ ls -l testfile
-    lrwxrwxrwx 1 ftp ftp 176 May 13 09:43 testfile -> .git/annex/objects/P5/4q/SHA256-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03/SHA256-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
-    $ cat .git/annex/objects/P5/4q/SHA256-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03/SHA256-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
-    hello
-    $ sha256sum testfile
-    5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03  testfile
-
-
-    # the file can be found when unlocking/locking
-    $ git annex unlock testfile
-    unlock testfile (copying...) ok
-    $ git annex lock testfile
-    lock testfile ok
-    (Recording state in git...)
-
-### What version of git-annex are you using? On what operating system?
-I ran Debian squeeze, with git annex 3.20120629~bpo60+2 when the problem was introduced. I just upgraded to wheezy, but the same problem exists with 3.20120629 from wheezy.
-
-I also manually installed 4.20130501 from unstable, which also showed the same problem.
-
-
-### Please provide any additional information below.
-
-I am not sure what information to supply, please provide pointers on what information might be useful.
-
-> [[done]] per comment --[[Joey]]
diff --git a/doc/bugs/Local_network___40__ssh__41___fails_to_pair__47__sync.mdwn b/doc/bugs/Local_network___40__ssh__41___fails_to_pair__47__sync.mdwn
--- a/doc/bugs/Local_network___40__ssh__41___fails_to_pair__47__sync.mdwn
+++ b/doc/bugs/Local_network___40__ssh__41___fails_to_pair__47__sync.mdwn
@@ -173,3 +173,5 @@
 ssh: connect to host Inspiron-14z.local port 22: Connection refused
 fatal: The remote end hung up unexpectedly
 """]]
+
+[[moreinfo]]
diff --git a/doc/bugs/Log_rotation_loses_large_logs.mdwn b/doc/bugs/Log_rotation_loses_large_logs.mdwn
deleted file mode 100644
--- a/doc/bugs/Log_rotation_loses_large_logs.mdwn
+++ /dev/null
@@ -1,69 +0,0 @@
-### Please describe the problem.
-
-I have a large git-annex repository created using the assistant. It has thousands of files in it and is about 50GB in size.
-Yesterday I added a number of new files, and I also created a new "removable drive" repository for it to sync to.
-
-During these operations I could see a large amount of data being added to the git-annex log files.
-I left my computer on overnight to finish the sync.
-
-Today I went to check the log files but there was no useful information in them.
-
-Looking at the source I suspect I had a single log file > 1 Megabyte in size, which caused the rotation to occur repeatedly until it rolled off the end.
-However, I would have preferred if this large logfile had been kept for more than a couple of hours.
-
-See file contents below
-
-### What steps will reproduce the problem?
-
-See above
-
-### What version of git-annex are you using? On what operating system?
-
-Debian Wheezy, git-annex version: 5.20140210~bpo70+2 from wheezy-backports
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-When I look at the log files now, I see the following:
--rw-r--r--    1 pgl users     443 Mar  5 21:48 daemon.log
--rw-r--r--    1 pgl users     443 Mar  5 21:47 daemon.log.1
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.10
--rw-r--r--    1 pgl users      69 Mar  5 07:29 daemon.log.2
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.3
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.4
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.5
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.6
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.7
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.8
--rw-r--r--    1 pgl users      81 Mar  5 01:16 daemon.log.9
-
-Looking at some of these log files.
-
-pgl@....:/....../.git/annex$ cat daemon.log.3
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.4
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.5
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.6
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.7
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.8
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-pgl@....:/....../.git/annex$ cat daemon.log.9
-[2014-03-05 01:16:15 GMT] SanityCheckerHourly: Rotated logs due to size: 1026416
-
-# End of transcript or log.
-"""]]
-
-> Changed log rotation to only rotate 1 log per hour max,
-> unless the total size of the log files is larger than the 
-> free disk space on the filesystem containing them.
-> 
-> This way, runaway log growth will still be contained,
-> but logs will generally rotate slowly enough to give plenty of time
-> to see what's in them. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Lost_S3_Remote.mdwn b/doc/bugs/Lost_S3_Remote.mdwn
deleted file mode 100644
--- a/doc/bugs/Lost_S3_Remote.mdwn
+++ /dev/null
@@ -1,59 +0,0 @@
-Somehow I've lost my S3 remote... git-annex knows it's there, but its not associating it with the git remote in .git/config
-
-    $ git-annex whereis pebuilder.iso 
-    whereis pebuilder.iso (3 copies) 
-      	3b6fc6f6-3025-11e1-b496-33bffbc0f3ed -- housebackup (external seagate drive on /mnt/back/RemoteStore)
-   	6b1326d8-2abb-11e1-8f43-979159a7f900 -- synology
-   	9b297772-2ab2-11e1-a86f-2fd669cb2417 -- Amazon S3
-    ok
-
-Amazon S3 is the description from the remote.  My .git/config file contains this block:
-
-    [remote "cloud"]
-      annex-s3 = true
-      annex-uuid = 9b297772-2ab2-11e1-a86f-2fd669cb2417
-      annex-cost = 70
-
-The UUID matches... But I cannot access it... see below:
-
-    [39532:39531 - 0:626] 08:20:38 [vivitron@tronlap:o +3] ~/annex/ISO 
-    $ git-annex get pebuilder.iso --from=cloud
-    git-annex: there is no git remote named "cloud"
-    
-    [39532:39531 - 0:627] 08:20:56 [vivitron@tronlap:o +3] ~/annex/ISO 
-    $ git-annex get pebuilder.iso --from="Amazon S3"
-    git-annex: there is no git remote named "Amazon S3"
-    
-    [39532:39531 - 0:628] 08:21:01 [vivitron@tronlap:o +3] ~/annex/ISO 
-    $ git-annex get pebuilder.iso --from=9b297772-2ab2-11e1-a86f-2fd669cb2417
-    git-annex: there is no git remote named "9b297772-2ab2-11e1-a86f-2fd669cb2417"
-
-    [39532:39531 - 0:629] 08:21:08 [vivitron@tronlap:o +3] ~/annex/ISO 
-    $ 
-
-git remote lists "cloud" as a remote:
-
-    $ git remote
-    all
-    cloud
-    cs
-    es3
-    origin
-
-git-annex status lists S3 support:
-
-    $ git-annex status
-    supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-    supported remote types: git S3 bup directory rsync web hook
-
-
-
-I appreciate any help....  I've tested versions 3.20111211, 3.20111231, and 3.20120105
-
-    $ git --version
-    git version 1.7.8.1
-
-
-
-> [[done]]; I've fixed the build system so this confusing thing cannot
-> happen anymore. --[[Joey]]
diff --git a/doc/bugs/Lost_S3_Remote/comment_1_6e80e6db6671581d471fc9a54181c04c._comment b/doc/bugs/Lost_S3_Remote/comment_1_6e80e6db6671581d471fc9a54181c04c._comment
deleted file mode 100644
--- a/doc/bugs/Lost_S3_Remote/comment_1_6e80e6db6671581d471fc9a54181c04c._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 1"
- date="2012-01-06T03:04:35Z"
- content="""
-Despite `status` listing S3 support, your git-annex is actually built with S3stub, probably because it failed to find the necessary S3 module at build time. Rebuild git-annex and watch closely, you'll see \"** building without S3 support\". Look above that for the error and fix it.
-
-It was certainly a bug that it showed S3 as supported when built without it. I've fixed that.
-"""]]
diff --git a/doc/bugs/Lost_S3_Remote/comment_2_c99c65882a3924f4890e500f9492b442._comment b/doc/bugs/Lost_S3_Remote/comment_2_c99c65882a3924f4890e500f9492b442._comment
deleted file mode 100644
--- a/doc/bugs/Lost_S3_Remote/comment_2_c99c65882a3924f4890e500f9492b442._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 2"
- date="2012-01-06T03:08:28Z"
- content="""
-BTW, you'll want to \"make clean\", since the S3stub hack symlinks a file into place and it will continue building with S3stub even if you fix the problem until you clean.
-"""]]
diff --git a/doc/bugs/Lost_S3_Remote/comment_3_1e434d5a20a692cd9dc7f6f8f20f30dd._comment b/doc/bugs/Lost_S3_Remote/comment_3_1e434d5a20a692cd9dc7f6f8f20f30dd._comment
deleted file mode 100644
--- a/doc/bugs/Lost_S3_Remote/comment_3_1e434d5a20a692cd9dc7f6f8f20f30dd._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M"
- nickname="Dustin"
- subject="Thank you!"
- date="2012-01-06T03:38:27Z"
- content="""
-make clean and rebuild worked...  Thank you
-"""]]
diff --git a/doc/bugs/Makefile_is_missing_dependancies.mdwn b/doc/bugs/Makefile_is_missing_dependancies.mdwn
deleted file mode 100644
--- a/doc/bugs/Makefile_is_missing_dependancies.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-<pre>
-From e45c73e66fc18d27bdf5797876fbeb07786a4af1 Mon Sep 17 00:00:00 2001
-From: Jimmy Tang <jtang@tchpc.tcd.ie>
-Date: Tue, 22 Mar 2011 22:24:07 +0000
-Subject: [PATCH] Touch up Makefile to depend on StatFS.hs
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 08e2f59..4ae8392 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,7 +15,7 @@ SysConfig.hs: configure.hs TestConfig.hs
-        hsc2hs $<
-        perl -i -pe 's/^{-# INCLUDE.*//' $@
- 
--$(bins): SysConfig.hs Touch.hs
-+$(bins): SysConfig.hs Touch.hs StatFS.hs
-        $(GHCMAKE) $@
- 
- git-annex.1: doc/git-annex.mdwn
--- 
-1.7.4.1
-
-</pre>
-
-
-StatFS.hs never gets depended on and compiled, the makefile was just missing something
-
-> Thanks, [[done]]! Interested to hear if StatFS.hs works on OSX (no warning) or
-> is a no-op (with warning). --[[Joey]] 
-
->> 
->> for now it gives a warning, it looks like it should be easy enough to add OSX
->> support, I guess it's a case of just digging around documentation to find the equivalent
->> calls/headers. I'll give it a go at making this feature work on OSX and get back to you.
->> 
-
-<pre>
-jtang@exia:~/develop/git-annex $ make
-hsc2hs StatFS.hsc
-StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
-StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
-StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
-</pre>
diff --git a/doc/bugs/Manual_mode_weirdness.mdwn b/doc/bugs/Manual_mode_weirdness.mdwn
deleted file mode 100644
--- a/doc/bugs/Manual_mode_weirdness.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-### Please describe the problem.
-
-I have an annex which contains all my photos. There are repositories on my laptop and my home server as well as an s3 backup (for which syncing is currently disabled). I switched the copy on my laptop to manual mode via 'git annex vicfg' (this correctly shows up in the webapp). I then proceeded to drop several folders (each containing a year's worth of photos). This works fine, however the assistant immediately starts downloading the dropped files from the server! Numcopies is set to 1 and the problem exists with the server in both the 'transfer' and 'backup' groups (haven't tried others).
-
-### What steps will reproduce the problem?
-
-1. Create a repo with some files.
-2. Create a bare-git remote on another machine.
-3. Make sure the assistant is running for the repo in question. 
-4. Switch your local copy to manual mode.
-5. Drop some files.
-6. Watch as the assistant re-downloads them!
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130501
-local repository version: unknown
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-
-Debian Testing/Sid.
-
-### Please provide any additional information below.
-
-If it's relevant I switched the local repository to indirect mode by manually shutting down the assistant and running 'git annex indirect' before restarting the assistant. This was done before any of the steps above.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Matching_oddity_in_SafeCommand.hs.mdwn b/doc/bugs/Matching_oddity_in_SafeCommand.hs.mdwn
deleted file mode 100644
--- a/doc/bugs/Matching_oddity_in_SafeCommand.hs.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-In SafeCommand.hs, the code to unwrap a File looks like:
-
-[[!format haskell """
-toCommand :: [CommandParam] -> [String]
-toCommand = concatMap unwrap
-  where
-        [...]
-        -- Files that start with a non-alphanumeric that is not a path
-        -- separator are modified to avoid the command interpreting them as
-        -- options or other special constructs.
-        unwrap (File s@(h:_))
-                | isAlphaNum h || h `elem` pathseps = [s]
-                | otherwise = ["./" ++ s]
-        unwrap (File s) = [s]
-        [...]
-"""]]
-
-I am not sure I understand which case would be caught in the last clause "unwrap (File s)". Is that the empty file? Because all non-empty file names seem to have been caught earlier, at least in the "otherwise" if they do not match the condition. In this case, wouldn't it be an error to use an empty file name and wouldn't it be better to throw an exception instead of returning [[]]?
-
-I would use:
-
-[[!format haskell """
-        unwrap (File []) = throw "Empty file name in SafeCommand.toCommand"
-"""]]
-
-or something similar instead.
-
-> [[done]]
diff --git a/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn b/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
deleted file mode 100644
--- a/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-Running the 'assistant' branch, I occassionally get
-
-To myhost1:/Users/jtang/annex
- ! [rejected]        master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'myhost1:/Users/jtang/annex'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-(Recording state in git...)
-
-manually running a 'git annex sync' usually fixes it, I guess once the sync command runs periodically this problem will go away, is this even OSX specific? I don't quite get the behaviour that is described in [[design/assistant/blog/day_15__its_aliiive]].
-
-> With my changes today, I've seen it successfully recover from this
-> situation. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana.mdwn b/doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana.mdwn
deleted file mode 100644
--- a/doc/bugs/Most_recent_git-annex_will_not_build_on_OpenIndiana.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-Version 3.20120825 built on my OpenIndiana system just fine, but the latest release gives me this during setup:
-
-    Linking /tmp/git-annex-3.20121017-13013/git-annex-3.20121017/dist/setup/setup ...
-      checking version... 3.20121017
-      checking git... yes
-      checking git version... 1.7.8.2
-      checking cp -a... yes
-      checking cp -p... yes
-      checking cp --reflink=auto... yes
-      checking uuid generator... uuid -m
-      checking xargs -0... yes
-      checking rsync... yes
-      checking curl... yes
-      checking wget... yes
-      checking bup... no
-      checking gpg... no
-      checking lsof... no
-      checking ssh connection caching... yes
-      checking sha1... sha1sum
-      checking sha256... sha256sum
-      checking sha512... sha512sum
-      checking sha224... sha224sum
-      checking sha384... sha384sum
-    Configuring git-annex-3.20121017...
-    Building git-annex-3.20121017...
-    Preprocessing executable 'git-annex' for git-annex-3.20121017...
-    In file included from Mounts.hsc:25:0:
-    Utility/libmounts.h:13:3: warning: #warning mounts listing code not available for this OS [-Wcpp]
-
-    Utility/libkqueue.c:13:23:
-         fatal error: sys/event.h: No such file or directory
-    compilation terminated.
-
-Is it possible to remove the new requirement?  Thanks!
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Name_scheme_does_not_follow_git__39__s_rules.mdwn b/doc/bugs/Name_scheme_does_not_follow_git__39__s_rules.mdwn
deleted file mode 100644
--- a/doc/bugs/Name_scheme_does_not_follow_git__39__s_rules.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-I can create an annex remote named 'test:/test'. git itself does not allow colons in names, though. The name scheme for an annex should be the same as for git repos themselves.
-
-> What do you mean by "an annex remote"? git-annex uses the same
-> remotes configuration as does git. If you put invalid
-> stuff in .git/config it might handle it slightly different than 
-> git, I don't know. Examples needed. --[[Joey]] 
-
->> What I mean is this:
-
-    % cd 1
-    % git init
-    % git annex init "my:colon"
-    % [...]
-    % cd ../2
-    % git init
-    % git annex init "second"
-    % git remote add "my:colon" ../1
-    fatal: 'my:colon' is not a valid remote name
-
->> -- RichiH
-
->>> I see.. Git annex init does not specifiy a remote's name, it specifies
->>> an arbitrary human-readable description of the repository, which will
->>> be displayed when there is no configured remote corresponding to the
->>> repository. So this is not a bug unless some documentation of that is
->>> unclear. --[[Joey]] 
-
->>>> Nobody spoke up to say it's unclear, so closing as PEBKAC :)
->>>> [[done]] --[[Joey]] 
-
->>>>> I still think git-annex should follow the same rules as git in this regard, but if your design decision is different, I won't try to argue the point :) -- RichiH
diff --git a/doc/bugs/Need_to_manually_install_c2hs_-_3.20121127_and_previous.mdwn b/doc/bugs/Need_to_manually_install_c2hs_-_3.20121127_and_previous.mdwn
deleted file mode 100644
--- a/doc/bugs/Need_to_manually_install_c2hs_-_3.20121127_and_previous.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-What steps will reproduce the problem?
-
-Install git-annex via cabal - either from Hackage or as a manual install. (i.e. <http://git-annex.branchable.com/install/cabal/>)
-
-What is the expected output? What do you see instead?
-
-Expect a clean install.
-
-However, get the following error:
-
-      Configuring gnuidn-0.2...
-      cabal: The program c2hs is required but it could not be found.
-      Failed to install gnuidn-0.2
-      cabal: Error: some packages failed to install:
-      git-annex-3.20121127 depends on gnuidn-0.2 which failed to install.
-      gnuidn-0.2 failed during the configure step. The exception was:
-      ExitFailure 1
-      network-protocol-xmpp-0.4.4 depends on gnuidn-0.2 which failed to install.
-
-What version of git-annex are you using? On what operating system?
-
-git-annex: 3.20121127 (and previous versions)
-
-OS: Mac OSX 10.6.8
-
-
-Please provide any additional information below.
-
-The fix seems as easy as
-
-    cabal install c2hs
-
-Should c2hs be included as a dep got git-annex or is this a bug in gnuidn?
-
-> Apparently cabal does not support automatically installing programs
-> needed for the build. I've updated the cabal installation instructions
-> to document the need to install c2hs. [[done]] --[[Joey]]
diff --git a/doc/bugs/No_progress_bars_with_S3.mdwn b/doc/bugs/No_progress_bars_with_S3.mdwn
deleted file mode 100644
--- a/doc/bugs/No_progress_bars_with_S3.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-## What steps will reproduce the problem?
-
-Add new data to a repository with an S3 special remote. Monitor the repository with the web app.
-
-
-## What is the expected output? What do you see instead?
-
-I expect a changing status bar and percentage. Instead I see no changes when an upload becomes active.
-
-
-## What version of git-annex are you using? On what operating system?
-
-3.20130102 on Arch 64-bit.
-
-
-## Please provide any additional information below.
-
-
-When uploading local data to an S3 remote, I see no progress bars. The progress bar area on active uploads stays the same grey as the bar on queued uploads. The status does not change from "0% of...". The uploads are completing, but this makes it very difficult to judge their activity.
-
-The only remotes I currently have setup are S3 special remotes, so I cannot say whether progress bars are working for uploads to other remote types.
-
-> [[done]], this turned out to be a confusion in the progress code;
-> parts were expecting a full number of bytes since the start, while
-> other parts were sending the number of bytes in a chunk. Result was
-> progress bars stuck at 0% often. --[[Joey]]
diff --git a/doc/bugs/No_version_information_from_cli.mdwn b/doc/bugs/No_version_information_from_cli.mdwn
deleted file mode 100644
--- a/doc/bugs/No_version_information_from_cli.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-git-annex does not listen to -v, --version or version.
-
-At the very least, it should return both the version of the binary and the version of the object store it supports.
-If it supports several annex versions, they should be listed in a comma-separated fashion.
-If git-annex is called from within an annex, it should print the version of the local object store.
-
-Sample:
-
-    % git annex version
-    git-annex version               : 0.24
-    default object store version    : 3
-    supported object store versions : 2,3
-    local object store version      : 2
-    % 
-
-The above might look like overkill, but it's in a form that will, most likely, never need to be extended.
-
-> Great idea, [[done]] --[[Joey]] 
diff --git a/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn b/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn
deleted file mode 100644
--- a/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn
+++ /dev/null
@@ -1,68 +0,0 @@
-### Please describe the problem.
-
-The .dmg the OSX build is distributed in  is unnecessarily large (fixed size) and is externally compressed.
-
-I did a quick survey of .dmg images used for distributing other pieces of software which I had downloaded to my Mac, and most of them seem to be the UDBZ or the (older) UDZO formats which are internally compressed with bzip2 or zlib.  According to "man hdiutil", the UDBZ format is supported since 10.4 (Tiger).
-
-Below are a pair of patches: first to enable "make clean" to work on OSX, second to build the .dmg in the UDBZ format and without an explicit size (it seems to infer a correct size).  When I tested building it, it results in a .dmg which is slightly smaller than the old .dmg.bz2
-
-(This will also require a change to remove the .bz2 from the download links elsewhere in the wiki.)
-
-<pre>
-From 251e23bbe66cc63e98089554f91b2528a097e818 Mon Sep 17 00:00:00 2001
-From: Mike Magin <git@mike.magin.org>
-Date: Sun, 17 Nov 2013 08:11:05 -0800
-Subject: [PATCH 1/2] Add explicit path to find invocation in "make clean" target.
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3f3ed35..5a0cebb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -83,8 +83,8 @@ clean:
- 		Setup Build/InstallDesktopFile Build/EvilSplicer \
- 		Build/Standalone Build/OSXMkLibs \
- 		git-union-merge git-recover-repository
--	find -name \*.o -exec rm {} \;
--	find -name \*.hi -exec rm {} \;
-+	find . -name \*.o -exec rm {} \;
-+	find . -name \*.hi -exec rm {} \;
- 
- Build/InstallDesktopFile: Build/InstallDesktopFile.hs
- 	$(GHC) --make $@
--- 
-1.8.4.3
-
-From e66f767893b5ef70cbf69d420cb589071f88c784 Mon Sep 17 00:00:00 2001
-From: Mike Magin <git@mike.magin.org>
-Date: Sun, 17 Nov 2013 08:40:07 -0800
-Subject: [PATCH 2/2] Change .dmg build to include compression and not be fixed size.
-
----
- Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5a0cebb..b6ac549 100644
---- a/Makefile
-+++ b/Makefile
-@@ -162,10 +162,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
- 
- 	./Build/OSXMkLibs $(OSXAPP_BASE)
- 	rm -f tmp/git-annex.dmg
--	hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \
-+	hdiutil create -format UDBZ -srcfolder tmp/build-dmg \
- 		-volname git-annex -o tmp/git-annex.dmg
- 	rm -f tmp/git-annex.dmg.bz2
--	bzip2 --fast tmp/git-annex.dmg
- 
- ANDROID_FLAGS?=-f-XMPP
- # Cross compile for Android.
--- 
-1.8.4.3
-</pre>
-
-> Ah, that never seemed optimal. [[done]] --[[Joey]]
diff --git a/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn b/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn
deleted file mode 100644
--- a/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-What steps will reproduce the problem?
-
-Use assistant and create repository the a folder in home dir.
-Use textedit and save a new txt to the repository folder. 
-
-What is the expected output? What do you see instead?
-
-The alias solution is broken. It should work more like Dropbox.
-Textedit saves the file initially, but it is immediately locked.
-Since it autosaves, it asks to unlock or duplicate.
-Then gives the error:
-"The file “Untitled 16.txt” cannot be unlocked."
-
-If the file exists:
-The document “Untitled 14” could not be saved as “Untitled 14.txt”. You don’t have permission.
-
-If you open a file from the repository (now replaced by a symlink) with textedit, there are other problems:
-- The filename will not be correct (will show the sha hash). 
-- It will ask to unlock, then give the error "You don’t have permission to write to the folder that the file “SHA256E-s8--8985d9832de2e28b5e1af64258c391a34d7528709ef916bac496e698c139020c.txt” is in."
-
-What version of git-annex are you using? On what operating system?
-
-OSX Lion
-git-annex version: 3.20120924
-
-Please provide any additional information below.
-
-Even if you fix these problems, automatic versioning in lion will probably don't work, and the symlinks seem a hackish solution and don't seem intuitive or easy to the end user. 
-The sync should be transparent but it's not, and it's error prone. It would even be best to keep file copies in the git repo and sync them with the original folder than make symlinks.
-
-Dropbox even allows to put a symlink in the dropbox directory, and it will sync the file. 
-
-[[!tag /design/assistant/OSX]]
-
-> Now the assistant creates new repositories using direct mode on OSX.
-> In direct mode, there is no locking of files; they can be modified
-> directly. [[done]] --[[Joey]]
diff --git a/doc/bugs/OSX_app_issues.mdwn b/doc/bugs/OSX_app_issues.mdwn
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-This was a collection of problem reports for the standalone OSX app.
-Please post separate bug reports going forward; this bug report is
-[[closed|done]] --[[Joey]]
-
-(Some things that should be fixed now have been moved to [[old]].)
diff --git a/doc/bugs/OSX_app_issues/comment_10_54d8f3e429df9a9958370635c890abf0._comment b/doc/bugs/OSX_app_issues/comment_10_54d8f3e429df9a9958370635c890abf0._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_10_54d8f3e429df9a9958370635c890abf0._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.154.3.194"
- subject="comment 10"
- date="2013-01-19T16:13:20Z"
- content="""
-The app uses the version of git included in it, because using the system's installed version if there is one is likely to run into other version incompatabilities. 
-
-You can either install git-annex using cabal and homebrew, as documented, or you could go in and delete
-all the git programs out of the app, and then it'd use the system's git stuff instead.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_10_6d23232fbb15d0ee3ab532a4884f81ed._comment b/doc/bugs/OSX_app_issues/comment_10_6d23232fbb15d0ee3ab532a4884f81ed._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_10_6d23232fbb15d0ee3ab532a4884f81ed._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 10"
- date="2013-04-16T17:14:13Z"
- content="""
-@Jeremy, it's been a long time since anyone reported having the \"LSOpenURLsWithRole()\". It seemed to go away when the dmg was fixed to include all the necessary libraries. So my guess is you installed it wrong, somehow, and perhaps it's not finding those libraries that are part of the dmg.
-
-You should be able to start the assistant by running it directly from the dmg.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_11_5db2baa771fd01a284eac8a16c1c8c67._comment b/doc/bugs/OSX_app_issues/comment_11_5db2baa771fd01a284eac8a16c1c8c67._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_11_5db2baa771fd01a284eac8a16c1c8c67._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawlkAghrKEvslMcV2INKUhtPPMsfnzQyyd8"
- nickname="Jeremy"
- subject="comment 11"
- date="2013-04-17T02:02:00Z"
- content="""
-@joey, figured it out. There was a program added to the startup list, presumably from when I ran things from the dmg a while ago. Once I delete that, it started fine. Of course, I forgot to write down the name of the program... I remember it had an LW in the name.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_11_bb2ceb95a844449795addee6986d0763._comment b/doc/bugs/OSX_app_issues/comment_11_bb2ceb95a844449795addee6986d0763._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_11_bb2ceb95a844449795addee6986d0763._comment
+++ /dev/null
@@ -1,26 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawlYy4BrJyV1PdfqzevCVziXRp89iUH6Xzw"
- nickname="Christopher"
- subject="Code signing errors in log on starting git-annex.app"
- date="2013-01-19T22:30:32Z"
- content="""
-When I run via the App and set up a fresh repo, i get some Console.app spam (looks like one per file added to the repo dir... or maybe one per git command?):
-
-    2013-01-19 2:44:55.000 PM kernel[0]: CODE SIGNING: cs_invalid_page(0x1008b4000): p=73995[git] clearing CS_VALID
-    2013-01-19 2:44:55.000 PM kernel[0]: CODE SIGNING: cs_invalid_page(0x10f99e000): p=73996[git] clearing CS_VALID
-    2013-01-19 2:44:55.000 PM kernel[0]: CODE SIGNING: cs_invalid_page(0x102b44000): p=73997[git] clearing CS_VALID
-    2013-01-19 2:44:55.000 PM kernel[0]: CODE SIGNING: cs_invalid_page(0x1029f4000): p=73998[git] clearing CS_VALID
-    ...
-
-and nothing seems to work. The page address and the pid increment steadily with each line.  I'm using 10.8.2 (12C60) on a Mac Pro, and grabbed:
-
-     /git-annex/OSX/current/10.8.2_Mountain_Lion/git-annex.dmg.bz2	
-
-(published 14-Jan-2013 15:19)
-
-It seems to be a code signing issue, perhaps with the vendored git binaries. While things are sort-of working, the web app shows the files flying by really fast. 
-
-Using a fresh repo via `git annex webapp` works great (I built that after much teeth-knashing, brew install/link cycles, and then cabal install git-annex). 
-
-I am very excited for this to work, this is exactly what I've been waiting for to replace dropbox. Came very close to writing it myself a few times (and in Haskell no less!!). 
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment b/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_12_62170597c7f441d84d48986857998858._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w"
- nickname="Alexander"
- subject="standalone app dmg won't open in OSX 10.8.3"
- date="2013-04-29T18:05:54Z"
- content="""
-I downloaded the app build from [http://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/](http://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/) and unpacked it, but the .dmg won't open. I can run other dmg's successfully. 
-
-Trying to install git-annex via cabal on the same machine led to this issue: [http://git-annex.branchable.com/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/#comment-7cc94df1bf9a75a6d03369f3897d6816](http://git-annex.branchable.com/tips/Building_git-annex_on_Debian_OR___37____164____35____34____164____37____38____34____35___Haskell__33__/#comment-7cc94df1bf9a75a6d03369f3897d6816)
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment b/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_12_f3bc5a4e4895ac9351786f0bdd8005ba._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmYiJgOvC4IDYkr2KIjMlfVD9r_1Sij_jY"
- nickname="Douglas"
- subject="Error creating remote repository using ssh on OSX"
- date="2013-01-25T13:18:40Z"
- content="""
-There is an issue with creating remote repositories using ssh (the problem may require using a different account name.) I filed the following bug:
-
-
-<http://git-annex.branchable.com/bugs/Error_creating_remote_repository_using_ssh_on_OSX/>
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_13_cb12d419459e5cac766022ee0697fedc._comment b/doc/bugs/OSX_app_issues/comment_13_cb12d419459e5cac766022ee0697fedc._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_13_cb12d419459e5cac766022ee0697fedc._comment
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!comment format=mdwn
- username="John"
- ip="109.242.130.160"
- subject="runshell typo prevents execution"
- date="2013-09-22T00:24:10Z"
- content="""
-Using the latest Mountain Lion build available.
-
->$ /Applications/git-annex.app/Contents/MacOS/git-annex
-
->/Applications/git-annex.app/Contents/MacOS/runshell: line 25: syntax error near unexpected token `&'
-
-Line 25:
->echo \"** runshell loop detected!\"> &2
-
-Fix (obvious but for the sake of completeness):
->echo \"** runshell loop detected!\" >&2
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_14_c966fa549bc73c52034ac9abc49de52a._comment b/doc/bugs/OSX_app_issues/comment_14_c966fa549bc73c52034ac9abc49de52a._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_14_c966fa549bc73c52034ac9abc49de52a._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.154.1.250"
- subject="comment 14"
- date="2013-09-22T14:15:28Z"
- content="""
-I have fixed the runshell typo and updated the builds.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_15_10f1df95266f1a8c9ef933183190f6e2._comment b/doc/bugs/OSX_app_issues/comment_15_10f1df95266f1a8c9ef933183190f6e2._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_15_10f1df95266f1a8c9ef933183190f6e2._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="gueux"
- ip="2a01:240:fe6d:0:8947:cf55:f955:49b9"
- subject="same typo on Lion build"
- date="2013-10-23T09:17:58Z"
- content="""
-Could you please fix this typo on the Lion build?
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_16_064e151da121f9c2ef13c19ecb4e7458._comment b/doc/bugs/OSX_app_issues/comment_16_064e151da121f9c2ef13c19ecb4e7458._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_16_064e151da121f9c2ef13c19ecb4e7458._comment
+++ /dev/null
@@ -1,16 +0,0 @@
-[[!comment format=mdwn
- username="Remy"
- ip="83.87.21.84"
- subject="Crashes on OSX 10.9"
- date="2013-10-23T20:30:12Z"
- content="""
-I just installed OSX Mavericks. I also took the latest autobuild and copied it over the old git-annex.app to be sure it doesn't work.
-When I execute \"git-annex status\" I get the following message
-
-
-> dyld: Symbol not found: _objc_debug_taggedpointer_mask
->   Referenced from: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
->   Expected in: /Applications/git-annex.app/Contents/MacOS/bundle/I
->  in /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
-> [1]    1361 trace trap  git-annex status
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_17_0e6ac5e0a54ce78bdc56c62e6fb92846._comment b/doc/bugs/OSX_app_issues/comment_17_0e6ac5e0a54ce78bdc56c62e6fb92846._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_17_0e6ac5e0a54ce78bdc56c62e6fb92846._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="calmyournerves"
- ip="85.3.250.239"
- subject="comment 17"
- date="2013-10-24T21:43:37Z"
- content="""
-For 10.9 Mavericks see http://git-annex.branchable.com/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/#comments
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_2_fd560811c57df5cbc3976639642b8b19._comment b/doc/bugs/OSX_app_issues/comment_2_fd560811c57df5cbc3976639642b8b19._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_2_fd560811c57df5cbc3976639642b8b19._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkN91jAhoesnVI9TtWANaBPaYjd1V9Pag8"
- nickname="Benjamin"
- subject="Package for older OS X"
- date="2012-11-17T12:36:45Z"
- content="""
-Is there an option to provide application bundle for older versions of OS X? The last time I tried the bundle wouldn't work under 10.5. If no specific features from newer OS X versions are required, it could be enough to add a simple switch when building.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_7_93e0bb53ac2d7daef53426fbdc5f92d9._comment b/doc/bugs/OSX_app_issues/comment_7_93e0bb53ac2d7daef53426fbdc5f92d9._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_7_93e0bb53ac2d7daef53426fbdc5f92d9._comment
+++ /dev/null
@@ -1,15 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc"
- nickname="Bret"
- subject="git-annex.app Not working on 32 bit machines"
- date="2012-11-03T19:18:47Z"
- content="""
-I tried running the git-annex.app on my Core Duo Macbook pro, and it does not run at all.  I get an error on my system.log
-
-`Nov  3 12:13:26 Bret-Mac [0x0-0x15015].com.branchable.git-annex[155]: /Applications/git-annex.app/Contents/MacOS/runshell: line 52: /Applications/git-annex.app/Contents/MacOS/bin/git-annex: Bad CPU type in executable
-Nov  3 12:13:26 Bret-Mac com.apple.launchd.peruser.501[92] ([0x0-0x15015].com.branchable.git-annex[155]): Exited with exit code: 1`
-
-It works on my 64 bit machine, and this has become quite the problem for a while now, where people with newer macs dont compile back for a 32bit machine.  
-
-Is there any hope for a pre-compiled binary that works on a 32 bit machine?
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_8_141eac2f3fb25fe18b4268786f00ad6a._comment b/doc/bugs/OSX_app_issues/comment_8_141eac2f3fb25fe18b4268786f00ad6a._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_8_141eac2f3fb25fe18b4268786f00ad6a._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
- nickname="Jimmy"
- subject="comment 8"
- date="2012-11-07T16:08:00Z"
- content="""
-I've been updating my haskell platform install recently, i used to try and get the builder to spit out 32/64bit binaries, but recently it's just become too messy, I've just migrated to a full 64bit build system. I'm afraid I won't be able to  provide 32bit builds any more.
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_8_f4d5b2645d7f29b80925159efb94a998._comment b/doc/bugs/OSX_app_issues/comment_8_f4d5b2645d7f29b80925159efb94a998._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_8_f4d5b2645d7f29b80925159efb94a998._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmOsimKUgz6rxpmsS_nrBQGavEYyUpDlsE"
- nickname="Tim"
- subject="OS X 10.8.2"
- date="2013-01-11T00:07:54Z"
- content="""
-Double click on the app, give permission for it to run and ... nothing
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_9_2e6dfca0fd8df04066769653724eae28._comment b/doc/bugs/OSX_app_issues/comment_9_2e6dfca0fd8df04066769653724eae28._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_9_2e6dfca0fd8df04066769653724eae28._comment
+++ /dev/null
@@ -1,17 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
- nickname="Andrew"
- subject="Prefer the system/path git binaries if they're a newer version"
- date="2013-01-19T06:20:38Z"
- content="""
-I have used homebrew to install git v1.8.0.2 but git-annex.app packages git v1.7.10.2. git 1.7 crashes due to some newer directives in my global git config.
-
-    error: Malformed value for push.default: simple
-    error: Must be one of nothing, matching, tracking or current.
-    fatal: bad config file line 38 in /Users/akraut/.gitconfig
-    
-    git-annex: fd:13: hGetLine: end of file
-    failed
-    git-annex: webapp: 1 failed
-
-"""]]
diff --git a/doc/bugs/OSX_app_issues/comment_9_e1bbe83a1b9a7385ed6d443d0cc22bc7._comment b/doc/bugs/OSX_app_issues/comment_9_e1bbe83a1b9a7385ed6d443d0cc22bc7._comment
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/comment_9_e1bbe83a1b9a7385ed6d443d0cc22bc7._comment
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawlkAghrKEvslMcV2INKUhtPPMsfnzQyyd8"
- nickname="Jeremy"
- subject="Unable to start assistant"
- date="2013-04-16T01:07:05Z"
- content="""
-I got the git-annex assistant to work once a long time ago when I ran it the first time directly from the dmg. Ever since then (i.e., after putting it in my applications folder) I have never gotten it to run. Wondering if anyone else has experienced this?
-
-I am running OSX 10.7.5 and just pulled the latest app (05-Apr-2013 10:17).
-
-For reference, when I try to kick off the the assistant from the command line I get the error:
-
-    $ open /Applications/git-annex.app
-    LSOpenURLsWithRole() failed with error -10810 for the file /Applications/git-annex.app.
-
-I am wondering if there is some sort of file or modification that was made when I accidently kicked it off initially from the dmg, if so any thoughts on what to clear / change?
-
-"""]]
diff --git a/doc/bugs/OSX_app_issues/old.mdwn b/doc/bugs/OSX_app_issues/old.mdwn
deleted file mode 100644
--- a/doc/bugs/OSX_app_issues/old.mdwn
+++ /dev/null
@@ -1,1 +0,0 @@
-These issues should be fixed now.
diff --git a/doc/bugs/OSX_build_broken.mdwn b/doc/bugs/OSX_build_broken.mdwn
deleted file mode 100644
--- a/doc/bugs/OSX_build_broken.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-### Please describe the problem.
-
-The OSX webapp doesn't start on the current OSX 10.7.5 builds. 
-
-### What steps will reproduce the problem?
-
-Download git-annex from http://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg and install it by copying it to Application. Try to launch it then. The result is a message in the system log saying "git-annex unknown command webapp" and then the usage information.
-
-### What version of git-annex are you using? On what operating system?
-
-The current version as downloaded from http://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg on OSX 10.7.5
-
-> OS Lion builds are no longer being made. [[done]] --[[Joey]]
diff --git a/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn b/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn
deleted file mode 100644
--- a/doc/bugs/On_Windows__44___wget_is_not_used__44___even_if_available.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-### Please describe the problem.
-On Windows, with a remote repository configured for HTTP access, wget is never used, even if it's available in the system. curl is always used.
-
-### What steps will reproduce the problem?
-1. Set up an annex on a remote system, configure it for HTTP access, run an HTTP server.
-2. over HTTP, clone it to Windows
-3. "annex get -vd <file>"
-4. note that curl is used.
-
-
-### What version of git-annex are you using? On what operating system?
-Windows 7: 4.20140627-g8a36ec5 (from the git-annex download page)
-
-### Additional Info
-After some debugging, it appears the issue is that git-annex looks to see if the file 'wget' is available in any directory on the PATH. on windows, wget is installed as 'wget.exe', and the file 'wget' does not exist anywhere. creating a file named 'wget' works around the issue. (wget.exe appears to still be the file used)
-
-###Full Transcript
-1. remote annex is created on host 192.168.0.8, with file "file1.txt"
-[[!format sh """
-#Windows 7
-#download and install git from git-scm.com/download/win
-#Git-1.8.3-preview20130601.exe
-#on install, selecting "Run Git from the Windows Command Prompt"
-#on install, selecting "checkout as-is, commit as-is"
-#installs to C:\Program Files (x86)\Git
-#download and install git-annex from http://git-annex.branchable.com/install/
-#git-annex-installer.exe
-#need to right-click 'run as administrator', per reported bug (link here)
-#installs to C:\Program Files (x86)\Git\cmd
-#also installs some utilities, including wget.exe
-
-C:\Users\test-git-annex>git clone http://192.168.0.8:8000/test_annex/.git
-Cloning into 'test_annex'...
-
-C:\Users\test-git-annex>cd test_annex
-
-C:\Users\test-git-annex\test_annex>dir
- Volume in drive C has no label.
-
- Directory of C:\Users\test-git-annex\test_annex
-
-<DIR>          .
-<DIR>          ..
-              178 file1.txt
-               1 File(s)            178 bytes
-
-C:\Users\test-git-annex\test_annex>type file1.txt
-.git/annex/objects/J9/m6/SHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729/SHA256-s21--6ed275e9e01c84a57fdd99d6af793c5d587d02e699cd2c28b32b7dc90f73e729
-
-C:\Users\test-git-annex\test_annex>git annex init windows
-init windows
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-ok
-(Recording state in git...)
-
-C:\Users\test-git-annex\test_annex> git annex get file.txt
-#fails, with error dialog box, indicating libcurl-4.dll is missing, indicating git-annex is trying to use curl.
-
-"""]]
-
-> I fixed this immediately after it was mentioned on IRC. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Partial_direct__47__indirect_repo.mdwn b/doc/bugs/Partial_direct__47__indirect_repo.mdwn
deleted file mode 100644
--- a/doc/bugs/Partial_direct__47__indirect_repo.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-Setup:
-
-* Fresh install of Debian Wheezy on machines A & B, git-annex 4.20130227 pulled in from unstable
-* On both machines, clone old repository which contains both annexed files and a three small files checked straight into git
-
-Steps:
-
-* On both machines, use webapp to create `~/.config/git-annex/autostart` by just firing it up and typing in location of existing repository
-* Move a new file into B's annex, in a subdirectory that is preferred on both A & B
-
-Expected:
-
-* The new file is copied over to A and everything remains in indirect mode
-* Three files checked straight into git remain checked straight into git (see below for why this is a variant on [[bugs/Switching_between_direct_and_indirect_stomps_on___39__regular__39___git_files/]])
-
-Actual:
-
-* New file copied over but seems to be in direct mode, while all the other content that is present is still symlinked
-* Files checked into git converted to direct mode files too (can tell this has happened by following step:)
-* Typing `git annex indirect` on A & B shows conversion of precisely four files (three files originally checked into git and new file added to B ) back to indirect
-
-Thanks.
-
-> [[done]], webapp now avoids changing existing repos here. --[[Joey]]
diff --git a/doc/bugs/Prevent_accidental_merges.mdwn b/doc/bugs/Prevent_accidental_merges.mdwn
--- a/doc/bugs/Prevent_accidental_merges.mdwn
+++ b/doc/bugs/Prevent_accidental_merges.mdwn
@@ -12,3 +12,5 @@
 > as it is to undo any other git commit, right? I quite like that git-annex 
 > no longer adds any clutter to the master branch, and would be reluctant
 > to change that. --[[Joey]]
+
+[[wontfix|done]] --[[Joey]]
diff --git a/doc/bugs/Problem_when_dropping_unused_files.mdwn b/doc/bugs/Problem_when_dropping_unused_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Problem_when_dropping_unused_files.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-### Please describe the problem.
-
-While dropping 19 unused files from an annex, I got this error:
-
-    error: invalid object 100644 c873416e78db4dd94b6ab40470d6fe99b2ecb8bd for '002/0a6/SHA256E-s427690--03aeabcde841b66168b72de80098d74e047f3ffc832d4bbefa1f2f70ee6c92f8.jpg.log'
-    fatal: git-write-tree: error building trees
-    git-annex: failed to read sha from git write-tree
-
-I've actually seen this before, a few months ago.
-
-### What steps will reproduce the problem?
-
-I have no idea, but once it happens I can't interact with unused files anymore.  Also, `git annex fsck` now reports this same problem as well.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130815, OS X 10.8.4
-
-> [[done]]; no indication this is anything other than a corrupt git
-> repository, which can be caused by system crash, disk data loss, 
-> cosmic rays, etc. This is why we keep backups... --[[Joey]] 
diff --git a/doc/bugs/Problems_building_on_Mac_OS_X.mdwn b/doc/bugs/Problems_building_on_Mac_OS_X.mdwn
deleted file mode 100644
--- a/doc/bugs/Problems_building_on_Mac_OS_X.mdwn
+++ /dev/null
@@ -1,62 +0,0 @@
-### Please describe the problem.
-
-Installing via Cabal fails due to dependency conflicts with yesod. If I build without the webapp flag, the problem disappears.
-
-### What steps will reproduce the problem?
-Running `cabal install c2hs git-annex --bindir=$HOME/bin`.
-
-### What version of git-annex are you using? On what operating system?
-I was attempting to install 4.20130521 from Hackage. My operating system is Mac OS X 10.6.8. Cabal-install is at 0.14.0.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
-Resolving dependencies...
-cabal: Could not resolve dependencies:
-trying: git-annex-4.20130521 (user goal)
-trying: git-annex-4.20130521:+webapp
-trying: yesod-default-1.2.0 (dependency of git-annex-4.20130521:+webapp)
-trying: yesod-core-1.2.1 (dependency of yesod-default-1.2.0)
-trying: cookie-0.4.0.1/installed-9d9... (dependency of yesod-core-1.2.1)
-next goal: yesod (dependency of git-annex-4.20130521:+webapp)
-rejecting: yesod-1.2.0.1, 1.2.0 (conflict: git-annex-4.20130521:webapp =>
-yesod(<1.2))
-rejecting: yesod-1.1.9.3, 1.1.9.2, 1.1.9.1, 1.1.9, 1.1.8.2, 1.1.8.1, 1.1.8,
-1.1.7.2, 1.1.7.1, 1.1.7, 1.1.6, 1.1.5, 1.1.4.1, 1.1.4 (conflict:
-yesod-core==1.2.1, yesod => yesod-core>=1.1.5 && <1.2)
-rejecting: yesod-1.1.3.1, 1.1.3, 1.1.2, 1.1.1.2, 1.1.1, 1.1.0.3, 1.1.0.2,
-1.1.0.1, 1.1.0 (conflict: yesod-core==1.2.1, yesod => yesod-core>=1.1 && <1.2)
-rejecting: yesod-1.0.1.6, 1.0.1.5, 1.0.1.4, 1.0.1.3, 1.0.1.2, 1.0.1.1, 1.0.1,
-1.0.0.2, 1.0.0.1, 1.0.0 (conflict: yesod-core==1.2.1, yesod => yesod-core>=1.0
-&& <1.1)
-rejecting: yesod-0.10.2, 0.10.1.4, 0.10.1.3, 0.10.1.2, 0.10.1.1, 0.10.1
-(conflict: yesod-core==1.2.1, yesod => yesod-core>=0.10.1 && <0.11)
-rejecting: yesod-0.9.4.1, 0.9.4, 0.9.3.4, 0.9.3.3, 0.9.3.2 (conflict:
-yesod-core==1.2.1, yesod => yesod-core>=0.9.3.4 && <0.10)
-rejecting: yesod-0.9.3.1, 0.9.3, 0.9.2.2, 0.9.2.1, 0.9.2, 0.9.1.1 (conflict:
-yesod-core==1.2.1, yesod => yesod-core>=0.9.1.1 && <0.10)
-rejecting: yesod-0.9.1 (conflict: yesod-core==1.2.1, yesod => yesod-core>=0.9
-&& <0.10)
-rejecting: yesod-0.8.2.1, 0.8.2, 0.8.1 (conflict: yesod-core==1.2.1, yesod =>
-yesod-core>=0.8.1 && <0.9)
-rejecting: yesod-0.8.0 (conflict: yesod-core==1.2.1, yesod => yesod-core>=0.8
-&& <0.9)
-rejecting: yesod-0.7.3, 0.7.2 (conflict: yesod-core==1.2.1, yesod =>
-yesod-core>=0.7.0.2 && <0.8)
-rejecting: yesod-0.7.1 (conflict: yesod-core==1.2.1, yesod =>
-yesod-core>=0.7.0.1 && <0.8)
-rejecting: yesod-0.7.0 (conflict: yesod-core==1.2.1, yesod => yesod-core>=0.7
-&& <0.8)
-rejecting: yesod-0.6.7, 0.6.6, 0.6.5, 0.6.4, 0.6.3, 0.6.2, 0.6.1.2, 0.6.1.1,
-0.6.1, 0.6.0.2, 0.6.0.1, 0.6.0, 0.5.4.2, 0.5.4.1, 0.5.4, 0.5.3, 0.5.2, 0.5.1,
-0.5.0.3, 0.5.0.2, 0.5.0.1, 0.5.0, 0.4.1, 0.4.0.3, 0.4.0.2, 0.4.0.1, 0.4.0
-(conflict: cookie => time==1.4/installed-d61..., yesod => time>=1.1.4 && <1.3)
-rejecting: yesod-0.3.1.1, 0.3.1, 0.3.0, 0.2.0, 0.0.0.2, 0.0.0.1, 0.0.0
-(conflict: cookie => time==1.4/installed-d61..., yesod => time>=1.1.3 && <1.2)
-# End of transcript or log.
-"""]]
-
-> Not OSX specific. I have added a version hint that makes cabal work and uploaded
-> a point release with this fix. [[done]] --[[Joey]]
diff --git a/doc/bugs/Problems_running_make_on_osx.mdwn b/doc/bugs/Problems_running_make_on_osx.mdwn
deleted file mode 100644
--- a/doc/bugs/Problems_running_make_on_osx.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-Followed the instructions over here: http://git-annex.branchable.com/forum/git-annex_on_OSX/
-
-and had to install the following extra packages to be able to get make to start:
-
-[realizes pcre-light is needed but pcre not installed on my mac]  
-sudo port install pcre  
-sudo cabal install pcre-light  
-
-> Ah right, that is a new dependency. I've updated the forum page
-> with this info.
-> --[[Joey]] 
-
-But then I got the following error:  
-
-<pre>
-ghc -O2 -Wall --make git-annex  
-[ 7 of 52] Compiling BackendTypes     ( BackendTypes.hs, BackendTypes.o   
-
-BackendTypes.hs:71:17:  
-    No instance for (Arbitrary Char)  
-      arising from a use of `arbitrary' at BackendTypes.hs:71:17-25  
-    Possible fix: add an instance declaration for (Arbitrary Char)  
-    In a stmt of a 'do' expression: backendname <- arbitrary  
-    In the expression:  
-        do backendname <- arbitrary  
-           keyname <- arbitrary  
-             return $ Key (backendname, keyname)  
-    In the definition of `arbitrary':  
-        arbitrary = do backendname <- arbitrary  
-                       keyname <- arbitrary  
-                         return $ Key (backendname, keyname)  
-make: *** [git-annex] Error 1  
-</pre>
-
-My knowledge of Haskell (had to lookup the spelling...) is more than rudimentary so any help would be appreciated.
-
-> Hmm, it seems you may be missing part of the quickcheck haskell
-> library, or have a different version than me.
-> 
-> The easy fix is probably to just edit BackendTypes.hs and delete the
-> entire end of the file from line 68, "for quickcheck" down. This code
-> is only used by the test suite (so "make test" will fail), 
-> but it should get it to build. --[[Joey]]
-
----
-
-Closing this bug because the above problem now has a solution documented on
-the install page, and the below test suite failure problems should all be
-resolved on OSX. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Problems_with_syncing_gnucash.mdwn b/doc/bugs/Problems_with_syncing_gnucash.mdwn
deleted file mode 100644
--- a/doc/bugs/Problems_with_syncing_gnucash.mdwn
+++ /dev/null
@@ -1,568 +0,0 @@
-### Please describe the problem.
-I am trying to sync gnucash between my server and my notebook. Both devices are connected via VPN to provide bidirectional SSH connectivity. After adding some data in gnucash the logfiles get synced properly but the changes to the gnucash.gnucash file are not recognized. Touching the file afterwards causes git-annex to immediately transfer the file.
-
-### What steps will reproduce the problem?
-
-Store your gnucash configuration in a git-annex repository. Add some transactions and wait for git-annex to sync your *.gnucash file.
-
-### What version of git-annex are you using? On what operating system?
-
-server and notebook -> Ubuntu 12.04.2 LTS:
-[[!format sh """
-florz@server:~$ git-annex version
-git-annex version: 4.20130601
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-"""]]
-
-### Please provide any additional information below.
-
-before opening gnucash:
-[[!format sh """
-florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 113902         Blöcke: 240        EA Block: 4096   Normale Datei
-Gerät: 15h/21d  Inode: 2974371     Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:32:37.974073365 +0200
-Modifiziert: 2013-06-22 19:32:37.846073367 +0200
-Geändert   : 2013-06-22 19:32:37.970073365 +0200
- Geburt    : -
-
-florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 113902         Blöcke: 224        EA Block: 4096   Normale Datei
-Gerät: fc00h/64512d     Inode: 401737579   Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:40:24.148876398 +0200
-Modifiziert: 2013-06-22 19:24:18.000000000 +0200
-Geändert   : 2013-06-22 19:24:26.817865369 +0200
- Geburt    : -
-"""]]
-
-after doing some changes in gnucash:
-[[!format sh """
-florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 114039         Blöcke: 240        EA Block: 4096   Normale Datei
-Gerät: 15h/21d  Inode: 2974990     Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:52:12.226049268 +0200
-Modifiziert: 2013-06-22 19:52:12.342049265 +0200
-Geändert   : 2013-06-22 19:52:12.342049265 +0200
- Geburt    : -
-
-florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 113902         Blöcke: 224        EA Block: 4096   Normale Datei
-Gerät: fc00h/64512d     Inode: 401737579   Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:40:24.148876398 +0200
-Modifiziert: 2013-06-22 19:24:18.000000000 +0200
-Geändert   : 2013-06-22 19:24:26.817865369 +0200
- Geburt    : -
-
-# after some time -> still no transfer
-
-florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 113902         Blöcke: 224        EA Block: 4096   Normale Datei
-Gerät: fc00h/64512d     Inode: 401737579   Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:40:24.148876398 +0200
-Modifiziert: 2013-06-22 19:24:18.000000000 +0200
-Geändert   : 2013-06-22 19:24:26.817865369 +0200
- Geburt    : -
-"""]]
-
-doing a touch on the file:
-[[!format sh """
-florz@notebook:~$ touch annex-sync/gnucash/gnucash.gnucash
-florz@notebook:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 114039         Blöcke: 240        EA Block: 4096   Normale Datei
-Gerät: 15h/21d  Inode: 2974990     Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:54:27.222046497 +0200
-Modifiziert: 2013-06-22 19:54:27.070046501 +0200
-Geändert   : 2013-06-22 19:54:27.214046498 +0200
- Geburt    : -
-
-#it syncs immediately
-
-florz@server:~$ stat annex-sync/gnucash/gnucash.gnucash
-  Datei: »annex-sync/gnucash/gnucash.gnucash“
-  Größe: 114039         Blöcke: 224        EA Block: 4096   Normale Datei
-Gerät: fc00h/64512d     Inode: 401737638   Verknüpfungen: 1
-Zugriff: (0600/-rw-------)  Uid: ( 1000/   florz)   Gid: ( 1000/   florz)
-Zugriff    : 2013-06-22 19:54:35.307056482 +0200
-Modifiziert: 2013-06-22 19:54:27.000000000 +0200
-Geändert   : 2013-06-22 19:54:34.787072264 +0200
- Geburt    : -
-"""]]
-
-on my notebook:
-[[!format sh """
-Everything up-to-date
-Everything up-to-date
-Everything up-to-date
-[2013-06-22 19:52:12 CEST] Watcher: file deleted gnucash/gnucash.gnucash.tmp-rFzA3U
-[2013-06-22 19:52:12 CEST] Committer: committing 1 changes
-[2013-06-22 19:52:12 CEST] Committer: Committing changes to git
-[2013-06-22 19:52:12 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-06-22 19:52:12 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 
-[2013-06-22 19:52:12 CEST] Watcher: add direct gnucash/gnucash.gnucash.20130622195200.log
-[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:12 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:12 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:12 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:13 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"]
-[2013-06-22 19:52:13 CEST] Committer: Adding gnucash.g..95200.log
-ok
-(Recording state in git...)
-(Recording state in git...)
-
-
-
-(Recording state in git...)
-add gnucash/gnucash.gnucash.20130622195200.log (checksum...) [2013-06-22 19:52:13 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-[2013-06-22 19:52:13 CEST] Committer: committing 1 changes
-[2013-06-22 19:52:13 CEST] Committer: Committing changes to git
-[2013-06-22 19:52:13 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:52:13 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-06-22 19:52:13 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing : new file created
-[2013-06-22 19:52:13 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing
-[2013-06-22 19:52:13 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing : new file created
-[2013-06-22 19:52:13 CEST] call: /home/florz/bin/git-annex ["transferkeys","--readfd","29","--writefd","27"]
-[2013-06-22 19:52:13 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Nothing
-[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/books/gnucash.gnucash.gcm
-[2013-06-22 19:52:14 CEST] Watcher: file deleted gnucash/gnucash.gnucash.7f0101.29284.LNK
-[2013-06-22 19:52:14 CEST] Watcher: file deleted gnucash/gnucash.gnucash.LCK
-[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/accelerator-map
-[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/expressions-2.0
-[2013-06-22 19:52:14 CEST] Watcher: changed direct .gnucash/stylesheets-2.0
-[2013-06-22 19:52:14 CEST] Watcher: add direct gnucash/gnucash.gnucash.20130622195212.log
-[2013-06-22 19:52:14 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"]
-[2013-06-22 19:52:14 CEST] Committer: Adding 5 files
-ok
-(Recording state in git...)
-add .gnucash/books/gnucash.gnucash.gcm (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-ok
-add .gnucash/accelerator-map (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-ok
-add .gnucash/expressions-2.0 (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-ok
-add .gnucash/stylesheets-2.0 (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-ok
-add gnucash/gnucash.gnucash.20130622195212.log (checksum...) [2013-06-22 19:52:15 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-[2013-06-22 19:52:15 CEST] Committer: committing 7 changes
-[2013-06-22 19:52:15 CEST] Committer: Committing changes to git
-[2013-06-22 19:52:15 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-To ssh://florz@192.168.1.3/home/florz/annex-sync/
-   7d4c30d..1954c7f  master -> synced/master
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:15 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master
-[2013-06-22 19:52:15 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing : new file created
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:15 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing : new file created
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:15 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"]
-Already up-to-date.
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:15 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"]
-To ssh://florz@192.168.2.2/home/florz/annex-sync/
-   7d4c30d..e1cb6c3  master -> synced/master
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:16 CEST] Merger: merging refs/remotes/server192.168.2.2/synced/master into refs/heads/master
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:16 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/server192.168.2.2/synced/master"]
-Already up-to-date.
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:16 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"]
-
-gnucash.gnucash.20130622195200.log
-
-         778 100%    0.00kB/s    0:00:00  
-         778 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-[2013-06-22 19:52:17 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195200.log Just 778
-
-sent 876 bytes  received 31 bytes  201.56 bytes/sec
-total size is 778  speedup is 0.86
-[2013-06-22 19:52:17 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "8b8aa5c2cfe4466c6b897f7987246021468033301a696e2db0070386f7d0f3fd.log", keyBackendName = "SHA256E", keySize = Just 778, keyMtime = Nothing}}
-[2013-06-22 19:52:17 CEST] Transferrer: Uploaded gnucash.g..95200.log
-[2013-06-22 19:52:17 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing
-[2013-06-22 19:52:17 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Nothing
-[2013-06-22 19:52:18 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 
-[2013-06-22 19:52:18 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"]
-[2013-06-22 19:52:18 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:52:18 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","f2463d30e73fec86e14c9df4bcae5e568398a503","-p","refs/heads/git-annex"]
-[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","776258f91d4245ffe13117a771dc8c7723867c1a"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:18 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:18 CEST] Merger: merging refs/heads/synced/master into refs/heads/master
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:18 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/heads/synced/master"]
-Already up-to-date.
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"]
-
-gnucash.gnucash.20130622195212.log
-
-         411 100%    0.00kB/s    0:00:00  
-         411 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-[2013-06-22 19:52:20 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195212.log Just 411
-
-sent 509 bytes  received 31 bytes  154.29 bytes/sec
-total size is 411  speedup is 0.76
-[2013-06-22 19:52:20 CEST] Transferrer: Uploaded gnucash.g..95212.log
-[2013-06-22 19:52:20 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "36e8842e91f7577d12992724c8f52586e9ea7cb0234312dc5544ea4dc6f6c39a.log", keyBackendName = "SHA256E", keySize = Just 411, keyMtime = Nothing}}
-[2013-06-22 19:52:20 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing
-[2013-06-22 19:52:20 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Nothing
-To ssh://florz@192.168.1.3/home/florz/annex-sync/
-   e7d4504..776258f  git-annex -> synced/git-annex
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:21 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:21 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"]
-Already up-to-date.
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:52:21 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c","e1cb6c3b8bc0c851e6dab51271a4cde04815c50c"]
-
-gnucash.gnucash.20130622195212.log
-
-         411 100%    0.00kB/s    0:00:00  
-         411 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-[2013-06-22 19:52:21 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash.20130622195212.log Just 411
-
-sent 509 bytes  received 31 bytes  360.00 bytes/sec
-total size is 411  speedup is 0.76
-[2013-06-22 19:52:22 CEST] Transferrer: Uploaded gnucash.g..95212.log
-[2013-06-22 19:52:22 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "36e8842e91f7577d12992724c8f52586e9ea7cb0234312dc5544ea4dc6f6c39a.log", keyBackendName = "SHA256E", keySize = Just 411, keyMtime = Nothing}}
-[2013-06-22 19:52:22 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing
-[2013-06-22 19:52:22 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash.20130622195200.log Nothing
-To ssh://florz@192.168.2.2/home/florz/annex-sync/
-   e7d4504..776258f  git-annex -> synced/git-annex
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"]
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:22 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-git-annex-shell: key is already present in annex
-rsync: connection unexpectedly closed (0 bytes received so far) [sender]
-rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9]
-[2013-06-22 19:52:22 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "8b8aa5c2cfe4466c6b897f7987246021468033301a696e2db0070386f7d0f3fd.log", keyBackendName = "SHA256E", keySize = Just 778, keyMtime = Nothing}}
-git-annex-shell: key is already present in annex
-rsync: connection unexpectedly closed (0 bytes received so far) [sender]
-rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9]
-[2013-06-22 19:52:24 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 
-[2013-06-22 19:52:24 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"]
-[2013-06-22 19:52:24 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:52:24 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","1641422d48162f533f80693486d7c5a1208b9fcf","-p","refs/heads/git-annex"]
-[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","48cfe2eb07d63d4a59c237994eb07896c92ef1c4"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:52:24 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:24 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..48cfe2eb07d63d4a59c237994eb07896c92ef1c4","--oneline","-n1"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e7d4504abea59b0b59659908ba771783acc6cd55","--oneline","-n1"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:24 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..48cfe2eb07d63d4a59c237994eb07896c92ef1c4","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-index","--raw","-z","-r","--no-renames","-l0","--cached","df87e3bef80902abc6d48ce0fbfe3432c790cd21"]
-[2013-06-22 19:52:25 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","df87e3bef80902abc6d48ce0fbfe3432c790cd21..refs/heads/git-annex","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:52:25 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","5bf44cd143b2c35a44e609e083af23093eb02028","-p","refs/heads/git-annex","-p","df87e3bef80902abc6d48ce0fbfe3432c790cd21"]
-[2013-06-22 19:52:25 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","4cd264f192611f5a0d76e54d31329921a650f896"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:25 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-To ssh://florz@192.168.1.3/home/florz/annex-sync/
-   df87e3b..4cd264f  git-annex -> synced/git-annex
-[2013-06-22 19:52:26 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:26 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"]
-[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..776258f91d4245ffe13117a771dc8c7723867c1a","--oneline","-n1"]
-[2013-06-22 19:52:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-To ssh://florz@192.168.2.2/home/florz/annex-sync/
-   776258f..4cd264f  git-annex -> synced/git-annex
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"]
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:52:28 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:53:18 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"]
-[2013-06-22 19:54:27 CEST] Watcher: changed direct gnucash/gnucash.gnucash
-[2013-06-22 19:54:27 CEST] read: lsof ["-F0can","+d","/home/florz/annex-sync/.git/annex/tmp/"]
-[2013-06-22 19:54:27 CEST] Committer: Adding gnucash.gnucash
-ok
-(Recording state in git...)
-
-
-(Recording state in git...)
-
-
-(Recording state in git...)
-(merging synced/git-annex into git-annex...)
-(Recording state in git...)
-add gnucash/gnucash.gnucash (checksum...) [2013-06-22 19:54:27 CEST] read: sha256sum ["/home/florz/annex-sync/.git/annex/tmp/gnucash25536.gnucash"]
-[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-[2013-06-22 19:54:27 CEST] Committer: committing 1 changes
-[2013-06-22 19:54:27 CEST] Committer: Committing changes to git
-[2013-06-22 19:54:27 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-06-22 19:54:27 CEST] Committer: queued Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing : new file created
-[2013-06-22 19:54:27 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 
-[2013-06-22 19:54:27 CEST] Transferrer: Transferring: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing
-[2013-06-22 19:54:27 CEST] Committer: queued Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing : new file created
-[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"]
-[2013-06-22 19:54:27 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:54:27 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","4c81716cf1a0e0df472ffb43770ac8a27ca45420","-p","refs/heads/git-annex"]
-[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","e9e2f951a5c1c645447ccc565bc3def9caeff93c"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:27 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:54:27 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Nothing
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:27 CEST] Merger: merging refs/heads/synced/master into refs/heads/master
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:27 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/heads/synced/master"]
-Already up-to-date.
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:27 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"]
-
-
-
-gnucash.gnucash
-
-       32768  28%    0.00kB/s    0:00:00  [2
-      114039 100%   15.50MB/s    0:00:00 (xfer#1, to-check=0/1)
-013-06-22 19:54:28 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Just 32768
-[2013-06-22 19:54:28 CEST] TransferWatcher: transfer starting: Upload UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512" gnucash/gnucash.gnucash Just 114039
-To ssh://florz@192.168.1.3/home/florz/annex-sync/
-   4cd264f..e9e2f95  git-annex -> synced/git-annex
-   e1cb6c3..e41ffae  master -> synced/master
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..4cd264f192611f5a0d76e54d31329921a650f896","--oneline","-n1"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:33 CEST] Merger: merging refs/remotes/home192.168.1.3/synced/master into refs/heads/master
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:33 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/home192.168.1.3/synced/master"]
-Already up-to-date.
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/ann
-sent 114130 bytes  received 31 bytes  20756.55 bytes/sec
-total size is 114039  espeedup is 1.00
-x-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:33 CEST] Transferrer: Uploaded gnucash.gnucash
-[2013-06-22 19:54:33 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "dc591dd7-2446-45c6-84dc-55bdf79e7512", transferKey = Key {keyName = "91ec950e4004863219ea33f1398ea4308e0969267c207272e046858ede8bf9d9", keyBackendName = "SHA256E", keySize = Just 114039, keyMtime = Nothing}}
-[2013-06-22 19:54:33 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"]
-[2013-06-22 19:54:33 CEST] Transferrer: Transferring: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing
-[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Nothing
-
-gnucash.gnucash
-
-       32768  28%    0.00kB/s    0:00:00  
-      114039 100%   19.38MB/s    0:00:00 (xfer#1, to-check=0/1)
-[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Just 32768
-[2013-06-22 19:54:33 CEST] TransferWatcher: transfer starting: Upload UUID "84bab1ab-238f-4602-953a-a297aab6da44" gnucash/gnucash.gnucash Just 114039
-To ssh://florz@192.168.2.2/home/florz/annex-sync/
-   4cd264f..e9e2f95  git-annex -> synced/git-annex
-   e1cb6c3..e41ffae  master -> synced/master
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:34 CEST] Merger: merging refs/remotes/server192.168.2.2/synced/master into refs/heads/master
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:34 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync/.git/annex/merge/","merge","--no-edit","refs/remotes/server192.168.2.2/synced/master"]
-Already up-to-date.
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/master"]
-[2013-06-22 19:54:34 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-tree","-z","--raw","--no-renames","-l0","-r","e41ffae310ed2a50058b2f963decde4f9bc10a14","e41ffae310ed2a50058b2f963decde4f9bc10a14"]
-
-sent 114130 bytes  received 31 bytes  45664.40 bytes/sec
-total size is 114039  speedup is 1.00
-[2013-06-22 19:54:35 CEST] Transferrer: Uploaded gnucash.gnucash
-[2013-06-22 19:54:35 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "84bab1ab-238f-4602-953a-a297aab6da44", transferKey = Key {keyName = "91ec950e4004863219ea33f1398ea4308e0969267c207272e046858ede8bf9d9", keyBackendName = "SHA256E", keySize = Just 114039, keyMtime = Nothing}}
-[2013-06-22 19:54:36 CEST] Pusher: Syncing with server192.168.2.2, home192.168.1.3 
-[2013-06-22 19:54:36 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-w","--stdin-paths"]
-[2013-06-22 19:54:36 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:54:36 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","fb43dcef4baa4b928faec6622a4f7889125c6c0a","-p","refs/heads/git-annex"]
-[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","b74b3402e31d7394815733811b9668b00cc51aa9"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","symbolic-ref","HEAD"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","refs/heads/master"]
-[2013-06-22 19:54:36 CEST] Pusher: pushing to [Remote { name ="server192.168.2.2" },Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","server192.168.2.2","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:54:36 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..b74b3402e31d7394815733811b9668b00cc51aa9","--oneline","-n1"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..df87e3bef80902abc6d48ce0fbfe3432c790cd21","--oneline","-n1"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:36 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:39 CEST] read: git ["--gitTo ssh://florz@192.168.1.3/home/florz/annex-sync/
-- ! [rejected]        dgit-annex -> synced/git-annexi (r=/non-fast-forwardh)o
-me/florz/aerror: failed to push some refs to 'ssh://florz@192.168.1.3/home/florz/annex-sync/'
-nTo prevent you from losing history, non-fast-forward updates were rejected
-Merge the remote changes (e.g. 'git pull') before pushing again.  See the
-'Note about fast-forwards' section of 'git push --help' for details.
-nex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..b74b3402e31d7394815733811b9668b00cc51aa9","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] feed: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-index","-z","--index-info"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","diff-index","--raw","-z","-r","--no-renames","-l0","--cached","89e2137442dfdb06facbaba3079873d90c7af281"]
-[2013-06-22 19:54:39 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","hash-object","-t","blob","-w","--stdin"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","89e2137442dfdb06facbaba3079873d90c7af281..refs/heads/git-annex","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","write-tree"]
-[2013-06-22 19:54:39 CEST] chat: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","commit-tree","f175a05b82160942363f46bf1af3e7af1660dfa1","-p","refs/heads/git-annex","-p","89e2137442dfdb06facbaba3079873d90c7af281"]
-[2013-06-22 19:54:39 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","update-ref","refs/heads/git-annex","fabac4b203dce9e812b4637f7e95375b15a3f739"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:39 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-To ssh://florz@192.168.2.2/home/florz/annex-sync/
-   e9e2f95..fabac4b  git-annex -> synced/git-annex
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:40 CEST] Pusher: trying manual pull to resolve failed pushes
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..e9e2f951a5c1c645447ccc565bc3def9caeff93c","--oneline","-n1"]
-[2013-06-22 19:54:40 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:40 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","fetch","home192.168.1.3"]
-From ssh://192.168.1.3/home/florz/annex-sync
-   e9e2f95..89e2137  synced/git-annex -> home192.168.1.3/synced/git-annex
-[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:42 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--verify","-q","refs/remotes/home192.168.1.3/master"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/master..refs/remotes/home192.168.1.3/master","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--verify","-q","refs/remotes/home192.168.1.3/synced/master"]
-[2013-06-22 19:54:43 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/synced/master..refs/remotes/home192.168.1.3/synced/master","--oneline","-n1"]
-[2013-06-22 19:54:43 CEST] Pusher: pushing to [Remote { name ="home192.168.1.3" }]
-[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","branch","-f","synced/master"]
-[2013-06-22 19:54:43 CEST] call: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","push","home192.168.1.3","git-annex:synced/git-annex","master:synced/master"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..89e2137442dfdb06facbaba3079873d90c7af281","--oneline","-n1"]
-[2013-06-22 19:54:45 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-Everything up-to-date
-[2013-06-22 19:54:46 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","git-annex"]
-[2013-06-22 19:54:46 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","show-ref","--hash","refs/heads/git-annex"]
-[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..fabac4b203dce9e812b4637f7e95375b15a3f739","--oneline","-n1"]
-[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..69a00fc4a2079b3a87725cc0e3e8b8a1e3a9ae20","--oneline","-n1"]
-[2013-06-22 19:54:47 CEST] read: git ["--git-dir=/home/florz/annex-sync/.git","--work-tree=/home/florz/annex-sync","log","refs/heads/git-annex..3c87a082e3b5340597dc59b9d5963b191f24a936","--oneline","-n1"]
-"""]]
-
-[[!tag /design/assistant]]
-[[!meta title="hard link to open file which is then deleted"]]
-
-> I have fixed this bug. [[done]] --[[Joey]]
diff --git a/doc/bugs/Provide_64-bit_standalone_build.mdwn b/doc/bugs/Provide_64-bit_standalone_build.mdwn
deleted file mode 100644
--- a/doc/bugs/Provide_64-bit_standalone_build.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-The 32-bit standalone build appears to require two libraries (lib32-libyaml and lib32-gsasl) that are not available on Arch Linux. [See the comments on the AUR package](https://aur.archlinux.org/packages/git-annex-bin/). I'd appreciate it if you could bring back the 64-bit build.
-
-> [[done]], based on <https://aur.archlinux.org/packages/git-annex-bin/>
-> they are managing with what I am providing. Also, Arch Linux has a
-> proper build of git-annex from source, so I'm not going to worry about
-> git-annex-bin, the rationalle for which I don't even understand. --[[Joey]]
diff --git a/doc/bugs/Proxy_support.mdwn b/doc/bugs/Proxy_support.mdwn
--- a/doc/bugs/Proxy_support.mdwn
+++ b/doc/bugs/Proxy_support.mdwn
@@ -16,3 +16,4 @@
 Please provide any additional information below.
 
 I don't use networkmanager if proxy information is obtained from it. There should be a fallback to environment variables.
+[[!tag confirmed]]
diff --git a/doc/bugs/Recreating_remote_repository__39__s_annex.mdwn b/doc/bugs/Recreating_remote_repository__39__s_annex.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/Recreating_remote_repository__39__s_annex.mdwn
@@ -0,0 +1,32 @@
+### Please describe the problem.
+My remote repository's annex was lost.  In the webapp, I can now click to recreate it, that fails half-way.
+
+### What steps will reproduce the problem?
+Create a remote repo, delete the annex directory.
+
+### What version of git-annex are you using? On what operating system?
+git-annex version: 5.20140517-g0aed6d9
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
+local repository version: unknown
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+
+### Please provide any additional information below.
+
+[[!format sh """
+gcrypt: Development version -- Repository format MAY CHANGE
+gcrypt: Repository not found: ssh://lhunath@satura.lyndir.com/~/annex/
+gcrypt: Setting up new repository
+gcrypt: Remote ID is :id:ROTs3SImZEdvdO2yCMku
+gcrypt: Encrypting to:  -R 0EF21226F43EA6BC
+gcrypt: Requesting manifest signature
+Warning: remote port forwarding failed for listen port 2222
+Warning: remote port forwarding failed for listen port 37218
+fatal: '~/annex/' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+"""]]
diff --git a/doc/bugs/Remote_repo_and_set_operation_with_find.mdwn b/doc/bugs/Remote_repo_and_set_operation_with_find.mdwn
deleted file mode 100644
--- a/doc/bugs/Remote_repo_and_set_operation_with_find.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-Currently, git annex find lists files that are present in the current repository, possibly restricted to a subdirectory. But it does not easily seem possible to get this information about a remote repository.
-
-I would find it useful if this command understood flags that makes it tell me what is present somewhere else (maybe "--on remote") and combinations of the flags ("--on remote1 --and --not-on remote2" or "--on disk1 --or --on disk2").
-
-> Almost. You're looking for `--in remote`, which was added 2 months ago.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Remote_repositories_have_to_be_setup_encrypted.mdwn b/doc/bugs/Remote_repositories_have_to_be_setup_encrypted.mdwn
--- a/doc/bugs/Remote_repositories_have_to_be_setup_encrypted.mdwn
+++ b/doc/bugs/Remote_repositories_have_to_be_setup_encrypted.mdwn
@@ -25,3 +25,4 @@
 
 [[!meta title="webapp does not allow disabling encryption on rsync special remotes"]]
 [[!tag /design/assistant]]
+[[!tag confirmed]]
diff --git a/doc/bugs/Repository_Information_Is_Lost.mdwn b/doc/bugs/Repository_Information_Is_Lost.mdwn
--- a/doc/bugs/Repository_Information_Is_Lost.mdwn
+++ b/doc/bugs/Repository_Information_Is_Lost.mdwn
@@ -29,3 +29,5 @@
 
 # End of transcript or log.
 """]]
+
+[[!tag moreinfo]]
diff --git a/doc/bugs/Repository_deletion_error.mdwn b/doc/bugs/Repository_deletion_error.mdwn
deleted file mode 100644
--- a/doc/bugs/Repository_deletion_error.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-**What steps will reproduce the problem?**
-
-On the dashboard, click settings > Delete on the repo you want to remove.
-Wait for the dropping to finish.
-Start final deletion when the message "The repository "repo" has been emptied, and can now be removed." pops up.
-
-**What is the expected output? What do you see instead?**
-
-The repository should be deleted, but I only see "Internal Server Error: git [Param "remote",Param "remove",Param "repo"] failed".
-
-**What version of git-annex are you using? On what operating system?**
-
-Standalone build, git-annex version 4.20130417-g4bb97d5
-
-**Please provide any additional information below.**
-
-The log shows:
-
-     [2013-04-22 22:17:22 CEST] TransferScanner: The repository "repo" has been emptied, and can now be removed. 
-     error: Unknown subcommand: remove
-     usage: git remote [-v | --verbose]
-       or: git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>
-       or: git remote rename <old> <new>
-       or: git remote rm <name>
-       or: git remote set-head <name> (-a | -d | <branch>)
-       or: git remote [-v | --verbose] show [-n] <name>
-       or: git remote prune [-n | --dry-run] <name>
-       or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
-       or: git remote set-branches [--add] <name> <branch>...
-       or: git remote set-url <name> <newurl> [<oldurl>]
-       or: git remote set-url --add <name> <newurl>
-       or: git remote set-url --delete <name> <url>
-
-        -v, --verbose         be verbose; must be placed before a subcommand
-
-
-
-> Seems that `git remote remove` is new as of git 1.8.0 or so.
-> Older gits only support `git remote rm`. Which newer gits
-> support as well. but it seems to be in the process
-> of being deprecated so I'd rather not use it.
-> 
-> So, I've made the version of git it's
-> built for determine which subcommand it uses. [[done]] --[[Joey]]
-> 
-> (You can run `git remote rm repo` by hand to clean up from this BTW.)
diff --git a/doc/bugs/Repository_in_manual_mode_does_not_hold_files.mdwn b/doc/bugs/Repository_in_manual_mode_does_not_hold_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Repository_in_manual_mode_does_not_hold_files.mdwn
+++ /dev/null
@@ -1,305 +0,0 @@
-### Please describe the problem.
-
-I have two repositories in my local network which are locally paired and synced using git-annex assistant (setup using webapp, both in direct mode). The one (master) has all files and is in mode "full backup". The second one (slave) is in "manual" mode and should therefore only contain the file content it already has. But it also should not loose any content it has until I explicitely drop it but this is exactly what happens! Files are getting dropped (I think it happens during git-annex startup of the slave repository, but I am not sure).
-
-### What steps will reproduce the problem?
-
-1. Setup two repositories using git-annex webapp in local network
-2. Set one to "full backup" mode, the second to "manual" mode
-3. Add files to the master repository
-4. Pair both repositories over webapp
-5. Call git-annex get folderA on slave system to transfer some file contents to it.
-
-=> After some time the file contents from folderA seem to disappear on slave system.
-
-### What version of git-annex are you using? On what operating system?
-
-* Master (full backup) repository is running on Ubuntu Server 12.04 and git-annex 5.20140117.1 from PPA. Git version 1.7.9.5
-* Slave (manual) repository is running on Gentoo Linux with 5.20140116, created from own ebuild. Git version 1.8.4.5
-
-### Please provide any additional information below.
-
-[[!format sh """
-[2014-01-29 09:14:15 CET] main: starting assistant version 5.20140116
-[2014-01-29 09:19:33 CET] TransferScanner: Syncing with Eifel.fritz.box__mnt_raid_Media 
-Already up-to-date.
-
-(scanning...) [2014-01-29 09:19:34 CET] Watcher: Performing startup scan
-Already up-to-date.
-Already up-to-date.
-[2014-01-29 09:35:31 CET] Committer: Committing changes to git
-[2014-01-29 09:35:31 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-[2014-01-29 09:40:37 CET] Committer: Committing changes to git
-[2014-01-29 09:44:15 CET] Committer: Committing changes to git
-Von ssh://git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media
-   390c764..7775ce1  annex/direct/master -> Eifel.fritz.box__mnt_raid_Media/annex/direct/master
-   eca59d1..59db343  git-annex  -> Eifel.fritz.box__mnt_raid_Media/git-annex
- + a1f3176...7775ce1 synced/master -> Eifel.fritz.box__mnt_raid_Media/synced/master  (Aktualisierung erzwungen)
-Already up-to-date.
-error: Ref refs/heads/synced/master is at a1f3176ff3821cdd9aa74bfa310dfdccb8452247 but expected 7775ce196da4561367ee231ce116fe5849827c51
-remote: error: failed to lock refs/heads/synced/master        
-To ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/
-   98219eb..3d2b713  git-annex -> synced/git-annex
- ! [remote rejected] annex/direct/master -> synced/master (failed to lock)
-error: Fehler beim Versenden einiger Referenzen nach 'ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/'
-Von ssh://git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media
-   7775ce1..a1f3176  annex/direct/master -> Eifel.fritz.box__mnt_raid_Media/annex/direct/master
-   59db343..6e39b5b  git-annex  -> Eifel.fritz.box__mnt_raid_Media/git-annex
-   7775ce1..a1f3176  synced/master -> Eifel.fritz.box__mnt_raid_Media/synced/master
-Already up-to-date.
-[2014-01-29 09:51:41 CET] Committer: Committing changes to git
-error: Ref refs/heads/synced/git-annex is at 3d2b7131d39c78fc56f67e29617e72b177807449 but expected 98219eb545d5dc51da9984ede4b4c5c41ec188d0
-remote: error: failed to lock refs/heads/synced/git-annex        
-To ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/
- ! [remote rejected] git-annex -> synced/git-annex (failed to lock)
-error: Fehler beim Versenden einiger Referenzen nach 'ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/'
-To ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/
-   3d2b713..5bd0d7e  git-annex -> synced/git-annex
-[2014-01-29 09:51:51 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-Everything up-to-date
-Everything up-to-date
-[2014-01-29 09:53:01 CET] Committer: Committing changes to git
-[2014-01-29 09:53:01 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-Everything up-to-date
-
-
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(merging synced/git-annex into git-annex...)
-(Recording state in git...)
-(merging synced/git-annex into git-annex...)
-(Recording state in git...)
-
-
-(Recording state in git...)
-(Recording state in git...)
-(started...) [2014-01-29 09:53:48 CET] Committer: Committing changes to git
-[2014-01-29 09:53:48 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-Everything up-to-date
-[2014-01-29 10:19:33 CET] NetWatcherFallback: Syncing with Eifel.fritz.box__mnt_raid_Media 
-Von ssh://git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media
-   6e39b5b..5bd0d7e  git-annex  -> Eifel.fritz.box__mnt_raid_Media/git-annex
-Everything up-to-date
-[2014-01-29 10:39:49 CET] Committer: Committing changes to git
-[2014-01-29 10:39:49 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-[2014-01-29 10:39:50 CET] Committer: Committing changes to git
-[2014-01-29 10:39:51 CET] Committer: Committing changes to git
-[2014-01-29 10:39:53 CET] Committer: Committing changes to git
-[2014-01-29 10:39:54 CET] Committer: Committing changes to git
-[2014-01-29 10:39:55 CET] Committer: Committing changes to git
-[2014-01-29 10:39:56 CET] Committer: Committing changes to git
-[2014-01-29 10:39:57 CET] Committer: Committing changes to git
-[2014-01-29 10:39:59 CET] Committer: Committing changes to git
-[2014-01-29 10:40:00 CET] Committer: Committing changes to git
-[2014-01-29 10:40:01 CET] Committer: Committing changes to git
-[2014-01-29 10:40:02 CET] Committer: Committing changes to git
-[2014-01-29 10:40:03 CET] Committer: Committing changes to git
-[2014-01-29 10:40:05 CET] Committer: Committing changes to git
-[2014-01-29 10:40:07 CET] Committer: Adding AlbumArtSmall.jpg Folder.jpg
-
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-add Audio/Musik/2raumwohnung/2002 - In Wirklich/AlbumArtSmall.jpg ok
-add Audio/Musik/2raumwohnung/2002 - In Wirklich/Folder.jpg [2014-01-29 10:40:07 CET] Committer: Committing changes to git
-[2014-01-29 10:40:08 CET] Committer: Committing changes to git
-[2014-01-29 10:40:09 CET] Committer: Committing changes to git
-[2014-01-29 10:40:11 CET] Committer: Committing changes to git
-[2014-01-29 10:40:12 CET] Committer: Committing changes to git
-[2014-01-29 10:40:13 CET] Committer: Committing changes to git
-[2014-01-29 10:40:14 CET] Committer: Committing changes to git
-[2014-01-29 10:40:16 CET] Committer: Committing changes to git
-[2014-01-29 10:40:17 CET] Committer: Committing changes to git
-[2014-01-29 10:40:18 CET] Committer: Committing changes to git
-[2014-01-29 10:40:19 CET] Committer: Committing changes to git
-[2014-01-29 10:40:20 CET] Committer: Committing changes to git
-[2014-01-29 10:40:21 CET] Committer: Committing changes to git
-[2014-01-29 10:40:23 CET] Committer: Committing changes to git
-[2014-01-29 10:40:24 CET] Committer: Committing changes to git
-[2014-01-29 10:40:26 CET] Committer: Committing changes to git
-[2014-01-29 10:40:27 CET] Committer: Committing changes to git
-[2014-01-29 10:40:28 CET] Committer: Committing changes to git
-[2014-01-29 10:40:29 CET] Committer: Committing changes to git
-[2014-01-29 10:40:30 CET] Committer: Committing changes to git
-[2014-01-29 10:40:31 CET] Committer: Committing changes to git
-[2014-01-29 10:40:32 CET] Committer: Committing changes to git
-[2014-01-29 10:40:34 CET] Committer: Committing changes to git
-[2014-01-29 10:40:35 CET] Committer: Committing changes to git
-[2014-01-29 10:40:36 CET] Committer: Committing changes to git
-[2014-01-29 10:40:37 CET] Committer: Committing changes to git
-[2014-01-29 10:40:39 CET] Committer: Committing changes to git
-[2014-01-29 10:40:40 CET] Committer: Committing changes to git
-[2014-01-29 10:40:41 CET] Committer: Committing changes to git
-[2014-01-29 10:40:42 CET] Committer: Committing changes to git
-[2014-01-29 10:40:44 CET] Committer: Committing changes to git
-[2014-01-29 10:40:45 CET] Committer: Committing changes to git
-[2014-01-29 10:40:46 CET] Committer: Committing changes to git
-[2014-01-29 10:40:47 CET] Committer: Committing changes to git
-[2014-01-29 10:40:48 CET] Committer: Committing changes to git
-[2014-01-29 10:40:50 CET] Committer: Committing changes to git
-[2014-01-29 10:40:51 CET] Committer: Committing changes to git
-[2014-01-29 10:40:52 CET] Committer: Committing changes to git
-[2014-01-29 10:40:53 CET] Committer: Committing changes to git
-[2014-01-29 10:40:54 CET] Committer: Committing changes to git
-[2014-01-29 10:40:55 CET] Committer: Committing changes to git
-[2014-01-29 10:40:57 CET] Committer: Committing changes to git
-[2014-01-29 10:40:58 CET] Committer: Committing changes to git
-[2014-01-29 10:40:59 CET] Committer: Committing changes to git
-[2014-01-29 10:41:00 CET] Committer: Committing changes to git
-[2014-01-29 10:41:02 CET] Committer: Committing changes to git
-[2014-01-29 10:41:03 CET] Committer: Committing changes to git
-[2014-01-29 10:41:04 CET] Committer: Committing changes to git
-[2014-01-29 10:41:05 CET] Committer: Committing changes to git
-[2014-01-29 10:41:06 CET] Committer: Committing changes to git
-[2014-01-29 10:41:07 CET] Committer: Committing changes to git
-[2014-01-29 10:41:09 CET] Committer: Committing changes to git
-[2014-01-29 10:41:10 CET] Committer: Committing changes to git
-[2014-01-29 10:41:11 CET] Committer: Committing changes to git
-[2014-01-29 10:41:12 CET] Committer: Committing changes to git
-[2014-01-29 10:41:23 CET] Committer: Committing changes to git
-[2014-01-29 10:41:24 CET] Committer: Committing changes to git
-[2014-01-29 10:41:29 CET] Committer: Committing changes to git
-[2014-01-29 10:41:30 CET] Committer: Committing changes to git
-[2014-01-29 10:41:32 CET] Committer: Committing changes to git
-[2014-01-29 10:41:33 CET] Committer: Committing changes to git
-[2014-01-29 10:41:34 CET] Committer: Committing changes to git
-[2014-01-29 10:41:35 CET] Committer: Committing changes to git
-[2014-01-29 10:41:36 CET] Committer: Committing changes to git
-[2014-01-29 10:41:38 CET] Committer: Adding AlbumArt_..Small.jpg Folder.jpg
-ok
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-add Audio/Musik/Alanis Morissette/1995 - Jagged Little Pill/AlbumArt_{79951A99-BD71-4029-80F6-C3705D930871}_Small.jpg ok
-add Audio/Musik/Alanis Morissette/1995 - Jagged Little Pill/Folder.jpg [2014-01-29 10:41:38 CET] Committer: Committing changes to git
-[2014-01-29 10:41:39 CET] Committer: Committing changes to git
-[2014-01-29 10:41:41 CET] Committer: Committing changes to git
-[2014-01-29 10:41:42 CET] Committer: Committing changes to git
-[2014-01-29 10:41:44 CET] Committer: Committing changes to git
-[2014-01-29 10:41:45 CET] Committer: Committing changes to git
-[2014-01-29 10:41:46 CET] Committer: Committing changes to git
-[2014-01-29 10:41:47 CET] Committer: Committing changes to git
-[2014-01-29 10:41:48 CET] Committer: Committing changes to git
-[2014-01-29 10:41:49 CET] Committer: Committing changes to git
-[2014-01-29 10:41:51 CET] Committer: Committing changes to git
-[2014-01-29 10:41:52 CET] Committer: Committing changes to git
-[2014-01-29 10:41:54 CET] Committer: Committing changes to git
-[2014-01-29 10:41:55 CET] Committer: Committing changes to git
-[2014-01-29 10:41:56 CET] Committer: Committing changes to git
-[2014-01-29 10:41:58 CET] Committer: Committing changes to git
-[2014-01-29 10:41:59 CET] Committer: Committing changes to git
-[2014-01-29 10:42:00 CET] Committer: Committing changes to git
-[2014-01-29 10:42:01 CET] Committer: Committing changes to git
-[2014-01-29 10:42:02 CET] Committer: Committing changes to git
-[2014-01-29 10:42:04 CET] Committer: Committing changes to git
-[2014-01-29 10:42:05 CET] Committer: Committing changes to git
-[2014-01-29 10:42:06 CET] Committer: Committing changes to git
-[2014-01-29 10:42:07 CET] Committer: Committing changes to git
-[2014-01-29 10:42:08 CET] Committer: Committing changes to git
-[2014-01-29 10:42:10 CET] Committer: Committing changes to git
-[2014-01-29 10:42:11 CET] Committer: Committing changes to git
-[2014-01-29 10:42:12 CET] Committer: Committing changes to git
-[2014-01-29 10:42:13 CET] Committer: Committing changes to git
-[2014-01-29 10:42:14 CET] Committer: Committing changes to git
-[2014-01-29 10:42:15 CET] Committer: Committing changes to git
-[2014-01-29 10:42:17 CET] Committer: Committing changes to git
-[2014-01-29 10:42:18 CET] Committer: Committing changes to git
-[2014-01-29 10:42:19 CET] Committer: Committing changes to git
-[2014-01-29 10:42:20 CET] Committer: Committing changes to git
-[2014-01-29 10:42:21 CET] Committer: Committing changes to git
-[2014-01-29 10:42:23 CET] Committer: Committing changes to git
-[2014-01-29 10:42:24 CET] Committer: Committing changes to git
-[2014-01-29 10:42:25 CET] Committer: Committing changes to git
-[2014-01-29 10:42:26 CET] Committer: Committing changes to git
-[2014-01-29 10:42:27 CET] Committer: Committing changes to git
-[2014-01-29 10:42:28 CET] Committer: Committing changes to git
-To ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/
-   5bd0d7e..1eda3be  git-annex -> synced/git-annex
-[2014-01-29 10:43:43 CET] Pusher: Syncing with Eifel.fritz.box__mnt_raid_Media 
-To ssh://fabian@git-annex-Eifel.fritz.box-fabian_.2Fmnt.2Fraid.2FMedia/mnt/raid/Media/
-   1eda3be..4c70ad2  git-annex -> synced/git-annex
-"""]]
-
-> The only way a repository can become "unwanted" is if you
-> tell git-annex to start deleting it (or perhaps set its group to unwanted
-> manually). This will cause git-annex to try to move all files away from
-> that repository. 
-> 
-> So, AFAICS, this must have been a case of operator error. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/Resource_leak_somewhere_in_the___39__get__39___code.mdwn b/doc/bugs/Resource_leak_somewhere_in_the___39__get__39___code.mdwn
deleted file mode 100644
--- a/doc/bugs/Resource_leak_somewhere_in_the___39__get__39___code.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-What steps will reproduce the problem?
-
-I have an Annex with about 18k files in it.  If I clone it and then run `git annex get .`, it gets a few thousand files and then starts reporting:
-
-    get 2004-2012/Originals/110414_0362.jpg (from titan...) 
-    rsync: fork: Resource temporarily unavailable (35)
-    rsync error: error in IPC code (code 14) at pipe.c(63) [Receiver=3.0.9]
-
-I have to abort and re-run `git annex get .` several times to finally get all of the files.
-
-What is the expected output? What do you see instead?
-
-I didn't expect what I saw!  I think there's a resource not being released in the `get` code.
-
-What version of git-annex are you using? On what operating system?
-
-master branch, d430fb1.
-
-Please provide any additional information below.
-
-OS X 10.8.2.  The machine has tons of RAM and tons of process handles free.  It's really not doing anything else but this git-annex at the time of my tests.
-
-> [[done]], this is a bug introduced in 3.20121009, and I've reverted the
-> buggy change. --[[Joey]]
diff --git a/doc/bugs/Rsync_encrypted_remote_asks_for_ssh_key_password_for_each_file.mdwn b/doc/bugs/Rsync_encrypted_remote_asks_for_ssh_key_password_for_each_file.mdwn
deleted file mode 100644
--- a/doc/bugs/Rsync_encrypted_remote_asks_for_ssh_key_password_for_each_file.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-What steps will reproduce the problem?
-
-Add an encrypted rsync remote by it's 'Host' value in ~/.ssh/config.
-
-eg.:
-
-cat ~/.ssh/config | grep Host
-
-    Host serverNick
-
-git annex initremote rsyncRemote type=rsync rsyncurl=serverNick:/home/USER/Music encryption=USER@gmail.com
-
-git annex copy some\ artist --to serverNick
-
-
-What is the expected output? What do you see instead?
-
-I'd expect it to remember the key password like a normal ssh remote.  Instead I get asked for the key password 3 times for each file in the folder.
-
-What version of git-annex are you using? On what operating system?
-
-3.20130216.  Arch x64 (up to date as of 2013-03-07)
-
-Please provide any additional information below.
-
-
-[[!meta title="rsync special remote does not use ssh connection caching"]]
-
-> [[done]]; ssh connection caching is now done for these remotes.
-> --[[Joey]]
diff --git a/doc/bugs/S3_bucket_uses_the_same_key_for_encryption_and_hashing.mdwn b/doc/bugs/S3_bucket_uses_the_same_key_for_encryption_and_hashing.mdwn
deleted file mode 100644
--- a/doc/bugs/S3_bucket_uses_the_same_key_for_encryption_and_hashing.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-While using HMAC instead of "plain" hash functions is inherently more secure, it's still a bad idea to re-use keys for different purposes.
-
-Also, ttbomk, HMAC needs two keys, not one. Are you re-using the same key twice?
-
-Compability for old buckets and support for different ones can be maintained by introducing a new option and simply copying over the encryption key's identifier into this new option should it be missing.
-
-> Bug was filed prematurely, but was a good bit of paranoia, and gpg and
-> hmac are given different secret keys [[done]] --[[Joey]] 
-
->> Thanks :) -- RIchiH
diff --git a/doc/bugs/S3_memory_leaks.mdwn b/doc/bugs/S3_memory_leaks.mdwn
--- a/doc/bugs/S3_memory_leaks.mdwn
+++ b/doc/bugs/S3_memory_leaks.mdwn
@@ -12,3 +12,4 @@
 At least the send leak should be fixed by the patch in the s3-memory-leak
 branch in git. That needs a patch to hS3, which I have sent to its author.
 --[[Joey]] 
+[[!tag confirmed]]
diff --git a/doc/bugs/S3_upload_not_using_multipart.mdwn b/doc/bugs/S3_upload_not_using_multipart.mdwn
--- a/doc/bugs/S3_upload_not_using_multipart.mdwn
+++ b/doc/bugs/S3_upload_not_using_multipart.mdwn
@@ -51,3 +51,4 @@
 	supported repository versions: 3
 	upgrade supported from repository versions: 0 1 2
 
+[[!tag confirmed]]
diff --git a/doc/bugs/Segfaults_on_Fedora_18_with_SELinux_enabled.mdwn b/doc/bugs/Segfaults_on_Fedora_18_with_SELinux_enabled.mdwn
deleted file mode 100644
--- a/doc/bugs/Segfaults_on_Fedora_18_with_SELinux_enabled.mdwn
+++ /dev/null
@@ -1,65 +0,0 @@
-git-annex version: 4.20130323
-
-Running the webapp with SELinux enabled:
-
-    [0 zerodogg@browncoats annexed]$ git annex webapp --debug
-    Launching web browser on file:///home/zerodogg/Documents/annexed/.git/annex/webapp.html
-    /home/zerodogg/bin/git-annex: line 25:  5801 Segmentation fault      (core dumped) "$base/runshell" git-annex "$@"
-
-After disabling SELinux it works just fine. This is on a freshly installed (default settings) Fedora 18 on x86-64.
-
-Running the assistant also works, but segfaults when attempting to open the webapp:
-
-    [0 zerodogg@browncoats annexed]$ git annex assistant &
-    [1] 6241
-    [0 zerodogg@browncoats annexed]$ 
-    [0 zerodogg@browncoats annexed]$ git annex webapp --debug
-    Launching web browser on file:///home/zerodogg/Documents/annexed/.git/annex/webapp.html
-    /home/zerodogg/bin/git-annex: line 25:  6322 Segmentation fault      (core dumped) "$base/runshell" git-annex "$@"
-    [139 zerodogg@browncoats annexed]$ Created new window in existing browser session.
-
-Here's what `dmesg` says:
-
-    [   71.488843] SELinux: initialized (dev proc, type proc), uses genfs_contexts
-    [  115.443932] git-annex[3985]: segfault at e6e62984 ip 0000000009b8085a sp 00000000f4bfd028 error 4 in git-annex[8048000+1c75000]
-    [  125.148819] SELinux: initialized (dev proc, type proc), uses genfs_contexts
-    [  125.230155] git-annex[4043]: segfault at e6eda984 ip 0000000009b8085a sp 00000000f63fd028 error 4 in git-annex[8048000+1c75000]
-    [  406.855659] SELinux: initialized (dev proc, type proc), uses genfs_contexts
-    [  407.033966] git-annex[5806]: segfault at e6faa984 ip 0000000009b8085a sp 00000000f6dfd028 error 4 in git-annex[8048000+1c75000]
-    [  462.368045] git-annex[6279]: segfault at e6f76984 ip 0000000009b8085a sp 00000000f49fd028 error 4 in git-annex[8048000+1c75000]
-    [  465.714636] SELinux: initialized (dev proc, type proc), uses genfs_contexts
-    [  465.930434] git-annex[6329]: segfault at e6e7a984 ip 0000000009b8085a sp 00000000f63fd028 error 4 in git-annex[8048000+1c75000]
-    [  560.570480] git-annex[7050]: segfault at e7022984 ip 0000000009b8085a sp 00000000f54fd028 error 4 in git-annex[8048000+1c75000]
-    [  565.510664] SELinux: initialized (dev proc, type proc), uses genfs_contexts
-    [  565.688681] git-annex[7108]: segfault at e7196984 ip 0000000009b8085a sp 00000000f54fd028 error 4 in git-annex[8048000+1c75000]
-
-Running the whole thing with --debug doesn't appear to provide anything useful:
-
-    [0 zerodogg@browncoats annexed]$ git annex assistant --debug &
-    [1] 7018
-    [0 zerodogg@browncoats annexed]$ [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","show-ref","git-annex"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","show-ref","--hash","refs/heads/git-annex"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..f2260840bd9563f3d9face53dddd6807813860cd","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..798526ef1315811296b1ac95d4cf97c72141ad29","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..0d827b1ef545a88e94ee8cc973e54a1b74d216f4","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..1d8f91411b827c4d59735dbc572e7f278e870e43","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..cc442416b325866139db6dbe374bddacda6fef91","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..3c2f44ffd82df1a0ae8858bdf2610e933b105a09","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..fb8819ca92d9a2ed39e6d329160b5f8da60df83f","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..68d0f936ee044b0ca34cf4029bcd6274fed88499","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] read: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","log","refs/heads/git-annex..3ba3dfef6340196126f4fc630b5048188230d1ff","--oneline","-n1"]
-    [2013-03-24 16:27:02 CET] chat: git ["--git-dir=/home/zerodogg/Documents/annexed/.git","--work-tree=/home/zerodogg/Documents/annexed","cat-file","--batch"]
-    
-    [1]  + done       GITWRAP annex assistant --debug
-    [0 zerodogg@browncoats annexed]$ git annex webapp --debug &
-    [1] 7082
-    [0 zerodogg@browncoats annexed]$ Launching web browser on file:///home/zerodogg/Documents/annexed/.git/annex/webapp.html
-    /home/zerodogg/bin/git-annex: line 25:  7088 Segmentation fault      (core dumped) "$base/runshell" git-annex "$@"
-    
-    [1]  + exit 139   GITWRAP annex webapp --debug
-    [0 zerodogg@browncoats annexed]$ Created new window in existing browser session.
-
-> On IRC it developed that it segfaulted at other times, and gdb complained
-> of a library mismatch. Seems something changed in Fedora libc, and 
-> the 32 bit binary is not working on 64 bit. I've brought back the 64 bit
-> standalone builds, which work. [[done]] --[[Joey]]
diff --git a/doc/bugs/Should_UUID__39__s_for_Remotes_be_case_sensitive__63__.mdwn b/doc/bugs/Should_UUID__39__s_for_Remotes_be_case_sensitive__63__.mdwn
deleted file mode 100644
--- a/doc/bugs/Should_UUID__39__s_for_Remotes_be_case_sensitive__63__.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-> git annex status
-supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-supported remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-repository mode: indirect
-trusted repositories: 0
-semitrusted repositories: 8
-	00000000-0000-0000-0000-000000000001 -- web
- 	44AF00F1-511F-4902-8235-DFF741B09400 -- here
- 	44af00f1-511f-4902-8235-dff741b09400 -- chrissy
- 	53499200-CA18-4B51-B6B3-651C18208349 -- stevedave
- 	56C56658-0995-4613-8A1B-B2FA534A834C -- olaf
- 	8FE9B19F-4FC8-4CFA-AD89-4B70EB432EDC -- passport
- 	AFC75641-B34A-4644-B566-C8D3127823F7 -- glacier
- 	B3238A12-D81B-40EA-BE89-3BDB318AE2B7 -- brodie
-untrusted repositories: 0
-transfers in progress: none
-available local disk space: 78.8 gigabytes (+1 gigabyte reserved)
-local annex keys: 3915
-local annex size: 81.37 gigabytes
-known annex keys: 5728
-known annex size: 641.36 gigabytes
-bloom filter size: 16 mebibytes (0.8% full)
-backend usage:
-	SHA256E: 8716
-	URL: 927
-
-> git annex version
-git-annex version: 4.20130909
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-
-> git-annex intentionally treats UUIDs as opaque strings,
-> so it is not going to go to any bother to consider 
-> different byte sequences to be the same UUID, sorry.
-> (The standard may be arbitrarily complicated, but I have arbitrarily
-> decided to ignore it.)
-> 
-> Since git-annex only ever generates each UUID once, and copies
-> the exact sequence of bytes as necessary, the only way the situation
-> you show above can happen is if you have manually gone in and entered
-> UUIDs in two different cases.
-> 
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn b/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn
deleted file mode 100644
--- a/doc/bugs/Should_ignore_.thumbnails__47___on_android.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-### Please describe the problem.
-
-When creating a Camera repository on android, the .thumbnails/ directory (containing useless crushed JPGs and even more useless oodles of thumbnail metadata databases) is annexed. This leads to confusion (assistant tries to annex database and thumbnails in modification) and waste (uploading/annexing unusable/unneeded metadata).
-
-### What steps will reproduce the problem?
-
-Install git-annex on Android and choose the defaults for a camera repository.
-
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130601, Android 4.2.2
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> I've [[done]] this, however the .gitignore file it writes will
-> not actually be used by the assistant until it gets support
-> for querying gitignore settings from git. There is already a
-> bug tracking that, and it's in process. --[[Joey]] 
diff --git a/doc/bugs/Stale_lock_files_on_Android.mdwn b/doc/bugs/Stale_lock_files_on_Android.mdwn
deleted file mode 100644
--- a/doc/bugs/Stale_lock_files_on_Android.mdwn
+++ /dev/null
@@ -1,44 +0,0 @@
-### Please describe the problem.
-
-Both my Android devices where not processing git-annex updates due to stale lock files. While the lock files are different, I've reported them both together as they are related. 
-
-### What steps will reproduce the problem?
-
-Unknown, perhaps the assistant crashed, or the battery ran flat on them.
-
-To resolve the issue I had to manually remove the lock files.
-
-### What version of git-annex are you using? On what operating system?
-
-On my Android phone, daily build 4.20130614-g221aea4
-On my Android tablet, daily build 4.20130621-g36258de
-
-### Please provide any additional information below.
-
-It seems to me that it'd be useful to have the assistant check to see if the lock files are still valid and remove them if they're stale.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-My phone:
-
-From ssh://git-annex-flick-andrewannex_phonecamera/~/phone-camera
-   987dc25..682cdd1  git-annex  -> flick_phonecamera/git-annex
-fatal: Unable to create '/storage/emulated/legacy/DCIM/.git/refs/remotes/flick_phonecamera/synced/git-annex.lock': File exists.
-
-My tablet:
-
-Committer: Adding Coleman-C..eedom.pdf
-Committer: Committing changes to git
-fatal: Unable to create '/mnt/sdcard/reference/.git/index.lock': File exists.
-
-# End of transcript or log.
-"""]]
-
-> The '/mnt/sdcard/reference/.git/index.lock' lock file will now be
-> automatically dealt with. Have not done anything about the refs/remotes
-> lock files yet. --[[Joey]]
-> 
-> Now the assistant deals with all stale git lock files on startup. 
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn b/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn
deleted file mode 100644
--- a/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-#What steps will reproduce the problem?
-
-1. Create a new repository in indirect mode.
-
-2. Add the same file twice under a different name. Now you have two symlinks pointing to the same file under .git/annex/objects/
-
-3. Switch to direct mode. The first symlink gets replaced by the actual file. The second stays unchanged, pointing to nowhere. But git annex whereis still reports it has a copy.
-
-4. Delete the first file. Git annex whereis still thinks it has a copy of file 2, which is not true -> data loss.
-
-#What is the expected output? What do you see instead?
-
-When switching to direct mode, both symlinks should be replaced by a copy (or at least a hardlink) of the actual file.
-
-> The typo that caused this bug is fixed. --[[Joey]] 
-
-#What version of git-annex are you using? On what operating system?
-
-3.20130107 on Arch Linux x64
-
-#Please provide any additional information below.
-
-The deduplication performed by git-annex is very dangerous in itself
-because files with identical content become replaced by references to the
-same file without the user necessarily being aware. Think of the user
-making a copy of a file, than modifying it. He would expect to end up with
-two files, the unchanged original and the modified copy. But what he really
-gets is two symlinks pointing to the same modified file.
-
-> I agree, it now copies rather than hard linking.  [[done]] --[[Joey]] 
diff --git a/doc/bugs/Syncing_creates_broken_links_instead_of_proper_files.mdwn b/doc/bugs/Syncing_creates_broken_links_instead_of_proper_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Syncing_creates_broken_links_instead_of_proper_files.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-What steps will reproduce the problem?
-
-Create two repositories by running git annex webapp. Sync them by linking them to the same xmpp account. Add files on both sides.
-
-What is the expected output? What do you see instead?
-
-I expect the same file to show up on both sides with the same contents. Instead adding a file on any side creates a broken link with the same name on the other side. For example:
-
-Side A:
-
-    $ ls -la
-    total 20
-    drwxrwxr-x  3 pedrocr pedrocr 4096 Jan  3 19:24 .
-    drwxr-xr-x 55 pedrocr pedrocr 4096 Jan  3 19:19 ..
-    lrwxrwxrwx  1 pedrocr pedrocr  178 Jan  3 19:22 bar -> .git/annex/objects/FQ/vV/SHA256E-s8--12a61f4e173fb3a11c05d6471f74728f76231b4a5fcd9667cef3af87a3ae4dc2/SHA256E-s8--12a61f4e173fb3a11c05d6471f74728f76231b4a5fcd9667cef3af87a3ae4dc2
-    lrwxrwxrwx  1 pedrocr pedrocr  178 Jan  3 19:20 foo -> .git/annex/objects/g7/9v/SHA256E-s4--7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730/SHA256E-s4--7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730
-    drwxrwxr-x  7 pedrocr pedrocr 4096 Jan  3 19:24 .git
-    -rw-r--r--  1 pedrocr pedrocr    0 Jan  3 19:24 testing
-
-"foo" and "bar" are broken links that were created on Side B
-
-Side B:
-
-    $ ls -la
-    total 24
-    drwxrwxr-x  3 pedrocr pedrocr 4096 Jan  3 19:24 .
-    drwx------ 42 pedrocr pedrocr 4096 Jan  3 19:18 ..
-    -rw-r--r--  1 pedrocr pedrocr    8 Jan  3 19:22 bar
-    -rw-r--r--  1 pedrocr pedrocr    4 Jan  3 19:20 foo
-    drwxrwxr-x  7 pedrocr pedrocr 4096 Jan  3 19:24 .git
-    lrwxrwxrwx  1 pedrocr pedrocr  178 Jan  3 19:24 testing -> .git/annex/objects/pX/ZJ/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-
-In this case "testing" is a broken link and was created on Side A.
-
-What version of git-annex are you using? On what operating system?
-
-    $ ./git-annex version
-    git-annex version: 3.20130102
-
-    $ uname -a
-    Linux wintermute 3.2.0-35-generic #55-Ubuntu SMP Wed Dec 5 17:45:18 UTC 2012 i686 i686 i386 GNU/Linux
-
-    $ lsb_release -a
-    Distributor ID:	Ubuntu
-    Description:	Ubuntu 12.04.1 LTS
-    Release:	12.04
-    Codename:	precise
-
-> [[done]]; the webapp now detects when XMPP pairing has been used but no
-> transfer remote is available, and prompts the user to create one.
-> --[[Joey]]
diff --git a/doc/bugs/Test_failure_on_debian_dropunused.mdwn b/doc/bugs/Test_failure_on_debian_dropunused.mdwn
deleted file mode 100644
--- a/doc/bugs/Test_failure_on_debian_dropunused.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-### Please describe the problem.
-./git-annex test fails:
-                                          
-    ### Failure in: git-annex unused/dropunused                                                                                                     
-    dropunused failed
-    Cases: 1  Tried: 1  Errors: 0  Failures: 1   
-
-### What steps will reproduce the problem?
-./git-annex test
-
-### What version of git-annex are you using? On what operating system?
-4.20130723-206-g1647361
-
-
-debian 7.1 i686
-
-### Please provide any additional information below.
-
-I'm not sure if there is a way to get extra information out of the test harness. I had a quick look at the code and couldn't see anything obvious.
-I've tried a clean and rebuild and it reappears, so if there is more information you need just let me know what.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Forgot to update the test suite for this behavior change.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/The_assistant_hangs_forever.mdwn b/doc/bugs/The_assistant_hangs_forever.mdwn
deleted file mode 100644
--- a/doc/bugs/The_assistant_hangs_forever.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-What steps will reproduce the problem?
-
-1. Open the assistant with git-annex webapp
-2. Click add another repository
-3. Choose "add another repository"
-4. Use "/home/pierre/testme" (try and get the problem with a new directory or an existing directory)
-5. Press "Make Repository"
-5. Choose "Keep the repository separate" 
-
-What is the expected output? What do you see instead?
-
-Go to the created repository but the interface hangs forever
-I have 4 git-annex processes that use no CPUs.
-I can still use the UI by clicking around with success or even shutdown the daemon.
-If I shutdown the daemon, all git-annex process gets killed.
-
-What version of git-annex are you using? On what operating system?
-
-It is said to be git-annex version: 4.20130324 but it is actually 4.20130405 (known bug)
-
-Please provide any additional information below.
-
-
-OS: Arch linux, bin package (not installed from source)
-All tests are OK
-Nothing happens on the log pages
-
-This is so weird that I would like to see the log file but I cannot find it. I have looked at /var/log without success.
-I have tried other available version on Arch linux (AUR git-annex-bin, AUR git-annex-standalone, haskell-web git-annex) and they all exhibit the same problem.
-At that stage, what I would like to be able is to try to figure out what is going on using the log file.
-Thanks
-
-> This could happen when using the amd64 standalone build, because I 
-> forgot to install curl into its chroot, so it was not included in the
-> bundle. If the host system also lacked curl, or something prevented
-> curl from working, it would fail like this.
-> 
-> I've included curl into the amd64 standalone build. I've also made the
-> assistant fall back to using a built-in http client if it is built
-> without curl.
-> 
-> None of which helps at all with the Arch git-annex-bin hack, since
-> that binary will be built with a working curl (when my amd64 standalone
-> builder builds it), and then installed onto a system, that,
-> apparently, has a broken curl. Which is one of many reasons I cannot
-> support that hack. [[done]] --[[Joey]]
diff --git a/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn b/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn
deleted file mode 100644
--- a/doc/bugs/The_webapp_doesn__39__t_allow_deleting_repositories.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-What steps will reproduce the problem?
-
-After creating new remote repositories in the webapp there's no option to delete them
-
-What is the expected output? What do you see instead?
-
-Some option to delete a repository, just like I can disable sync or change the config of a remote
-
-What version of git-annex are you using? On what operating system?
-
-    $ ./git-annex version
-    git-annex version: 3.20130102
-
-    $ uname -a
-    Linux wintermute 3.2.0-35-generic #55-Ubuntu SMP Wed Dec 5 17:45:18 UTC 2012 i686 i686 i386 GNU/Linux
-
-    $ lsb_release -a
-    Distributor ID:	Ubuntu
-    Description:	Ubuntu 12.04.1 LTS
-    Release:	12.04
-    Codename:	precise
-
-[[!tag /design/assistant]]
-
-> Status: You can delete the current repository. You can also remove
-> repositories from the list of remotes (without deleting their content)
-> and you can tell it you want to stop using a remote, and it will
-> suck all content off that remote until it's empty.
-> 
-> Still todo: Detect when a remote has been sucked dry, and actually delete
-> it. --[[Joey]]
-
->> [[done]] --[[Joey]]
diff --git a/doc/bugs/Too_many_open_files.mdwn b/doc/bugs/Too_many_open_files.mdwn
deleted file mode 100644
--- a/doc/bugs/Too_many_open_files.mdwn
+++ /dev/null
@@ -1,59 +0,0 @@
-### Please describe the problem.
-
-The transferrer crashes after a while due to too many open files
-
-### What steps will reproduce the problem?
-
-Have a huge annex. Connect two local machines, one with the huge annex, the other one without. Let them copy files…
-
-### What version of git-annex are you using? On what operating system?
-
-latest version
-git-annex version: 5.20131117-gbd514dc
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-
-on Mac OS X 10.9
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2013-11-22 10:49:19 CET] Transferrer: Downloaded oktaeder.png
-[2013-11-22 10:49:19 CET] Transferrer: Downloaded oktaeder.png
-[2013-11-22 10:49:19 CET] Transferrer: Downloaded oktaeder.png
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded klett-cover-neu.jpg
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded klett-cover-neu.jpg
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded kara-worl..ditor.gif
-git-annex: runInteractiveProcess: pipe: Too many open files
-Committer crashed: lsof: createProcess: resource exhausted (Too many open files)
-[2013-11-22 10:49:20 CET] Committer: warning Committer crashed: lsof: createProcess: resource exhausted (Too many open files)
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded kara-worl..ditor.gif
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded kara-worl..ditor.gif
-[2013-11-22 10:49:20 CET] Transferrer: Downloaded image1.png
-[2013-11-22 10:49:21 CET] Transferrer: Downloaded image1.png
-[2013-11-22 10:49:21 CET] Transferrer: Downloaded image.png
-[2013-11-22 10:49:21 CET] Transferrer: Downloaded image.png
-[2013-11-22 10:49:21 CET] Transferrer: Downloaded ikoseder.png
-[2013-11-22 10:49:21 CET] Transferrer: Downloaded ikoseder.png
-[2013-11-22 10:49:22 CET] Transferrer: Downloaded ikoseder.png
-[2013-11-22 10:49:22 CET] Transferrer: Downloaded ikosaeder.jpg
-git-annex: runInteractiveProcess: pipe: Too many open files
-ok
-(Recording state in git...)
-git-annex: socket: resource exhausted (Too many open files)
-[2013-11-22 10:49:22 CET] Transferrer: Downloaded ikosaeder.jpg
-Transferrer crashed: getCurrentDirectory: resource exhausted (Too many open files)
-[2013-11-22 10:49:22 CET] Transferrer: warning Transferrer crashed: getCurrentDirectory: resource exhausted (Too many open files)
-git-annex: runInteractiveProcess: pipe: Too many open files
-git-annex: runInteractiveProcess: pipe: Too many open files
-
-# End of transcript or log.
-"""]]
-
-> This appears to be the same problem as [[Resource_exhausted]],
-> so closing as duplicate; please follow up to the other bug report if
-> possible. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Too_much_system_load_on_startup.mdwn b/doc/bugs/Too_much_system_load_on_startup.mdwn
deleted file mode 100644
--- a/doc/bugs/Too_much_system_load_on_startup.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-### Please describe the problem.
-When I log in, if git annex is monitoring a large repo, my desktop is very sluggish getting started. Git-annex causes moderate CPU load, but keeps the disk IO very busy -delaying the opening of desktop applications.
-
-### What steps will reproduce the problem?
-On Linux, with git-annex set to autostart and monitoring a folder with more than a few hundred files (I have a pdf library of a few thousand journal articles).
-
-### What version of git-annex are you using? On what operating system?
-4.20131002 Ubuntu, from Hess's PPA.
-
-### Please provide any additional information below.
-
-I solved this problem by changing the call to git-annex in /etc/xdg/autostart/git-annex.desktop from:
-
-Exec=/usr/bin/git-annex assistant --autostart
-
-to
-
-Exec=sleep 5 ionice -c 3 /usr/bin/git-annex assistant --autostart
-
-This delays the start of git-annex for 5 seconds, letting the desktop get started, and forces git-annex to yield IO to other programs -preventing it from slowing them down by forcing them to wait for disk access. Since this is a background daemon with potentially high IO usage, but no need for quick responsiveness, perhaps that would make a decent default?
-
-> Added 5 second delay to existing ionice. Provisionally [[done]],
-> although it does occur to me that the startup scan could add some delays
-> in between actions to run more as a batch job. --[[Joey]]
diff --git a/doc/bugs/TransferScanner_crash_on_Android.mdwn b/doc/bugs/TransferScanner_crash_on_Android.mdwn
deleted file mode 100644
--- a/doc/bugs/TransferScanner_crash_on_Android.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-### Please describe the problem.
-
-TransferScanner crashes trying to add a file.
-
-### What steps will reproduce the problem?
-
-Start the web app.
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130709-g339d1e0 on Android.
-
-### Please provide any additional information below.
-
-There was a whole stack of nulls in some of those log lines as well. I've 
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-TransferScanner crashed: unknown response from git cat-file ("refs/heads/git-annex:289/20f/SHA256E-s85883241--3bf01cfd6a422f9b661ed335e6142bbdaf899cd71587bb3cc812256064c7071e missing",refs/heads/git-annex:289/20f/SHA256E-s85883241--3bf01cfd6a422f9b661ed335e6142bbdaf899cd71587bb3cc812256064c7071e\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00(7981 more elided)\00.log)
-[2013-07-16 15:19:26 NZST] TransferScanner: warning TransferScanner crashed: unknown response from git cat-file ("refs/heads/git-annex:289/20f/SHA256E-s85883241--3bf01cfd6a422f9b661ed335e6142bbdaf899cd71587bb3cc812256064c7071e missing",refs/heads/git-annex:289/20f/SHA256E-s85883241--3bf01cfd6a422f9b661ed335e6142bbdaf899cd71587bb3cc812256064c7071e\00\00\00\00\00(7991 more elided)\00.log)
-# End of transcript or log.
-"""]]
-
-> Lacking other information about this problem, and with the assistant
-> able to detect problems and run `git annex repair` to fix up corrupt git
-> repos, I suppose this is [[done]] --[[Joey]]
diff --git a/doc/bugs/Trouble_initializing_git_annex_on_NFS.mdwn b/doc/bugs/Trouble_initializing_git_annex_on_NFS.mdwn
deleted file mode 100644
--- a/doc/bugs/Trouble_initializing_git_annex_on_NFS.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-The following occurs in a directory that is shared on an NFS server:
-
-    /media/mybook/movies $ git init
-    Initialized empty Git repository in /media/mybook/movies/.git/
-    /media/mybook/movies $ git annex init mybook-movies
-    init mybook-movies 
-    git-annex: waitToSetLock: resource exhausted (No locks available)
-    failed
-    git-annex: init: 1 failed
-    /media/mybook/movies $
-
-This happens reliably.  Is there any way around it?  I have shell
-access on the NFS server, but it is a NAS, so I don't think it is
-capable of running git-annex.
-
-[[done]]
diff --git a/doc/bugs/True_backup_support.mdwn b/doc/bugs/True_backup_support.mdwn
deleted file mode 100644
--- a/doc/bugs/True_backup_support.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-I'd like to be able to restore my data from S3/Glacier following a catastrophic loss of information.
-
-As I understand it, git-annex doesn't solve this problem for me because it only stores file *contents* in S3/Glacier.  A restore-from-nothing requires both the file contents and also the file names and metadata, which git-annex doesn't store in S3.
-
-I'm still feeling my way around git-annex, but I think it will probably be sufficient for my purposes to set up a cron job to push my annex to github.  But I think it would be helpful if git-annex could take care of this automatically.
-
-> Based on the comments, this is [[done]] --[[Joey]]
diff --git a/doc/bugs/USB_drive_not_syncing.mdwn b/doc/bugs/USB_drive_not_syncing.mdwn
deleted file mode 100644
--- a/doc/bugs/USB_drive_not_syncing.mdwn
+++ /dev/null
@@ -1,519 +0,0 @@
-### Please describe the problem.
-A USB drive could not be synced, whether as a client or transfer repository. The misbehaving part appears to be at this point in the logs:
-
-error: Ref refs/heads/synced/git-annex is at ff94266684335f9b152282fe620ef086e067afba but expected 0000000000000000000000000000000000000000
-
-"git annex get" also fails as shown in the (full) log message pasted below.
-
-### What steps will reproduce the problem?
-Not sure. Re-inserting the same drive gives the same problem. As the very first time using git annex (and not knowing git that well too), I need guidance in narrowing down this problem. If this bug has been fixed in the mean time, that is also fine.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20131106~bpo70+1
-build flags: Assistant Webapp Pairing Testsuite S3 Inotify DBus XMPP Feeds Quvi TDFA
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-remote types: git gcrypt S3 bup directory rsync web glacier hook
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-
-
-apg-get installed from Debian wheezy backports. uname -a gives:
-
-Linux im1 3.2.0-4-686-pae #1 SMP Debian 3.2.51-1 i686 GNU/Linux
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-[2014-01-05 21:01:40 CST] main: starting assistant version 4.20131106~bpo70+1
-[2014-01-05 21:01:40 CST] Cronner: You should enable consistency checking to protect your data. 
-(Recording state in git...)
-(scanning...) [2014-01-05 21:01:40 CST] Watcher: Performing startup scan
-(started...) [2014-01-05 21:03:56 CST] Committer: Adding README.txt cassandra-env.sh cassandra..roperties cassandra..roperties cassandra.yaml
-
-add conf/README.txt (checksum...) ok
-add conf/README.txt (checksum...) ok
-add conf/cassandra-env.sh (checksum...) ok
-add conf/cassandra-env.sh (checksum...) ok
-add conf/cassandra-rackdc.properties (checksum...) ok
-add conf/cassandra-rackdc.properties (checksum...) ok
-add conf/cassandra-topology.properties (checksum...) ok
-add conf/cassandra-topology.properties (checksum...) ok
-add conf/cassandra.yaml (checksum...) ok
-add conf/cassandra.yaml (checksum...) [2014-01-05 21:03:57 CST] Committer: Adding commitlog..roperties cqlshrc.sample log4j-ser..roperties log4j-too..roperties
-ok
-add conf/commitlog_archiving.properties (checksum...) ok
-add conf/commitlog_archiving.properties (checksum...) ok
-add conf/cqlshrc.sample (checksum...) ok
-add conf/cqlshrc.sample (checksum...) ok
-add conf/log4j-server.properties (checksum...) ok
-add conf/log4j-server.properties (checksum...) ok
-add conf/log4j-tools.properties (checksum...) ok
-add conf/log4j-tools.properties (checksum...) [2014-01-05 21:03:58 CST] Committer: Committing changes to git
-[2014-01-05 21:09:46 CST] Committer: Committing changes to git
-ok
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-Launching web browser on file:///home/tyc20/Desktop/annex/.git/annex/webapp.html
-[2014-01-05 21:11:46 CST] main: starting assistant version 4.20131106~bpo70+1
-[2014-01-05 21:11:46 CST] Cronner: You should enable consistency checking to protect your data. 
-(scanning...) [2014-01-05 21:11:46 CST] Watcher: Performing startup scan
-(started...) 
-(scanning...) [2014-01-05 21:13:17 CST] Watcher: Performing startup scan
-[2014-01-05 21:13:17 CST] Committer: Committing changes to git
-(Recording state in git...)
-(started...) [2014-01-05 21:13:18 CST] Committer: Committing changes to git
-[2014-01-05 21:16:19 CST] Committer: Adding cassandra.thrift
-
-(Recording state in git...)
-add conf/cassandra.thrift (checksum...) [2014-01-05 21:16:19 CST] Committer: Committing changes to git
-[2014-01-05 21:16:20 CST] Committer: Adding cassandra.thrift
-ok
-(Recording state in git...)
-(Recording state in git...)
-add conf/cassandra.thrift (checksum...) [2014-01-05 21:16:20 CST] Committer: Committing changes to git
-[2014-01-05 21:16:29 CST] Committer: Committing changes to git
-[2014-01-05 21:16:40 CST] Committer: Committing changes to git
-[2014-01-05 21:17:56 CST] Committer: Adding new-name.properties
-[2014-01-05 21:17:56 CST] Committer: Committing changes to git
-ok
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-ok
-(Recording state in git...)
-(Recording state in git...)
-
-  conf/Smalltalk-80 The language and its implementation (Bluebook).pdf still has writers, not adding
-
-  conf/Smalltalk-80 The language and its implementation (Bluebook).pdf still has writers, not adding
-[2014-01-05 21:27:34 CST] Committer: Committing changes to git
-[2014-01-05 21:28:09 CST] Committer: Adding The Essen..tions.pdf
-(Recording state in git...)
-(Recording state in git...)
-add conf/The Essence of Compiling with Continuations.pdf (checksum...) ok
-add conf/The Essence of Compiling with Continuations.pdf (checksum...) [2014-01-05 21:28:09 CST] Committer: Committing changes to git
-[2014-01-05 21:28:49 CST] Committer: Committing changes to git
-gpg: new configuration file \`/home/tyc20/.gnupg/gpg.conf\' created
-gpg: WARNING: options in \`/home/tyc20/.gnupg/gpg.conf\' are not yet active during this run
-ok
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-
-  Detected a crippled filesystem.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-[2014-01-05 21:35:09 CST] main: Syncing with ADATAUFD 
-warning: no common commits
-From /media/A-DATA UFD/annex
- * [new branch]      git-annex  -> ADATAUFD/git-annex
-[2014-01-05 21:35:09 CST] Pusher: Syncing with ADATAUFD 
-Already up-to-date.
-error: Ref refs/heads/synced/git-annex is at ff94266684335f9b152282fe620ef086e067afba but expected 0000000000000000000000000000000000000000
-error: Ref refs/heads/synced/master is at 745c01118e8684b4826f2fb53368faf0568fcafc but expected 0000000000000000000000000000000000000000
-remote: error: failed to lock refs/heads/synced/git-annex        
-To /media/A-DATA UFD/annex
- * [new branch]      git-annex -> synced/git-annex
- * [new branch]      master -> synced/master
-remote: error: failed to lock refs/heads/synced/master        
-To /media/A-DATA UFD/annex
- ! [remote rejected] git-annex -> synced/git-annex (failed to lock)
- ! [remote rejected] master -> synced/master (failed to lock)
-error: failed to push some refs to '/media/A-DATA UFD/annex'
-Already up-to-date.
-Everything up-to-date
-
-cassandra-rackdc.properties
-
-        1199 100%    0.00kB/s    0:00:00  
-        1199 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1290 bytes  received 31 bytes  2642.00 bytes/sec
-total size is 1199  speedup is 0.91
-[2014-01-05 21:35:13 CST] Transferrer: Uploaded cassandra..roperties
-[2014-01-05 21:35:13 CST] Pusher: Syncing with ADATAUFD 
-
-cassandra-topology.properties
-
-        1358 100%    0.00kB/s    0:00:00  
-        1358 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1451 bytes  received 31 bytes  2964.00 bytes/sec
-total size is 1358  speedup is 0.92
-[2014-01-05 21:35:13 CST] Transferrer: Uploaded cassandra..roperties
-
-cassandra.thrift
-
-       32768  93%    0.00kB/s    0:00:00  
-       35216 100%    2.33MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 35300 bytes  received 31 bytes  70662.00 bytes/sec
-total size is 35216  speedup is 1.00
-[2014-01-05 21:35:14 CST] Transferrer: Uploaded cassandra.thrift
-
-commitlog_archiving.properties
-
-        2328 100%    0.00kB/s    0:00:00  
-        2328 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 2422 bytes  received 31 bytes  4906.00 bytes/sec
-total size is 2328  speedup is 0.95
-[2014-01-05 21:35:15 CST] Transferrer: Uploaded commitlog..roperties
-
-cqlshrc.sample
-
-        1324 100%    0.00kB/s    0:00:00  
-        1324 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1402 bytes  received 31 bytes  2866.00 bytes/sec
-total size is 1324  speedup is 0.92
-[2014-01-05 21:35:15 CST] Transferrer: Uploaded cqlshrc.sample
-
-new-name.properties
-
-        1850 100%    0.00kB/s    0:00:00  
-        1850 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1933 bytes  received 31 bytes  3928.00 bytes/sec
-total size is 1850  speedup is 0.94
-[2014-01-05 21:35:16 CST] Transferrer: Uploaded new-name.properties
-To /media/A-DATA UFD/annex
-   ff94266..d2dcc21  git-annex -> synced/git-annex
-[2014-01-05 21:35:19 CST] Pusher: Syncing with ADATAUFD 
-To /media/A-DATA UFD/annex
-   d2dcc21..c9f93f8  git-annex -> synced/git-annex
-[2014-01-05 21:42:39 CST] Committer: Adding Smalltalk..book).pdf
-(Recording state in git...)
-(merging ADATAUFD/git-annex into git-annex...)
-(Recording state in git...)
-
-
-(Recording state in git...)
-(Recording state in git...)
-add Smalltalk-80 The language and its implementation (Bluebook).pdf (checksum...) [2014-01-05 21:42:40 CST] Committer: Committing changes to git
-[2014-01-05 21:42:40 CST] Pusher: Syncing with ADATAUFD 
-
-Smalltalk-80 The language and its implementation (Bluebook).pdf
-
-       32768   0%    0.00kB/s    0:00:00  Already up-to-date.
-
-     8847360  26%    8.39MB/s    0:00:02  
-    21037056  62%   10.01MB/s    0:00:01  To /media/A-DATA UFD/annex
-   c9f93f8..1f1bfe9  git-annex -> synced/git-annex
-   745c011..6c6149b  master -> synced/master
-Already up-to-date.
-
-    31129600  92%    9.88MB/s    0:00:00  
-    33558574 100%    9.85MB/s    0:00:03 (xfer#1, to-check=0/1)
-[2014-01-05 21:42:45 CST] Pusher: Syncing with ADATAUFD 
-Everything up-to-date
-
-sent 33562798 bytes  received 31 bytes  3196459.90 bytes/sec
-total size is 33558574  speedup is 1.00
-[2014-01-05 21:42:51 CST] Transferrer: Uploaded Smalltalk..book).pdf
-[2014-01-05 21:42:51 CST] Pusher: Syncing with ADATAUFD 
-To /media/A-DATA UFD/annex
-   1f1bfe9..07ac8cf  git-annex -> synced/git-annex
-[2014-01-05 21:46:18 CST] main: Syncing with annex2 
-warning: no common commits
-From /home/tyc20/Desktop/annex2
- * [new branch]      git-annex  -> annex2/git-annex
- * [new branch]      master     -> annex2/master
-Already up-to-date!
-Merge made by the 'recursive' strategy.
-[2014-01-05 21:46:19 CST] Pusher: Syncing with annex2, ADATAUFD 
-Already up-to-date.
-To /home/tyc20/Desktop/annex2
- * [new branch]      git-annex -> synced/git-annex
- * [new branch]      master -> synced/master
-error: Ref refs/heads/synced/git-annex is at cf8e5160f57d8279770613851ee75fb6b7c1d381 but expected 0000000000000000000000000000000000000000
-remote: error: failed to lock refs/heads/synced/git-annex        
-error: Ref refs/heads/synced/master is at 8de8929c1e6712613f9e81faba88c2e464c809a7 but expected 0000000000000000000000000000000000000000
-remote: error: failed to lock refs/heads/synced/master        
-To /home/tyc20/Desktop/annex2
- ! [remote rejected] git-annex -> synced/git-annex (failed to lock)
- ! [remote rejected] master -> synced/master (failed to lock)
-error: failed to push some refs to '/home/tyc20/Desktop/annex2'
-Already up-to-date.
-[2014-01-05 21:46:20 CST] Transferrer: Uploaded Smalltalk..book).pdf
-ok
-(Recording state in git...)
-(Recording state in git...)
-
-
-(Recording state in git...)
-(Recording state in git...)
-(merging annex2/git-annex into git-annex...)
-(Recording state in git...)
-
-
-
-drop ADATAUFD Smalltalk-80 The language and its implementation (Bluebook).pdf [2014-01-05 21:46:20 CST] Transferrer: Uploaded cassandra..roperties
-ok
-drop ADATAUFD conf/cassandra-rackdc.properties [2014-01-05 21:46:21 CST] Transferrer: Uploaded cassandra..roperties
-ok
-drop ADATAUFD conf/cassandra-topology.properties To /media/A-DATA UFD/annex
-   07ac8cf..cf8e516  git-annex -> synced/git-annex
-   6c6149b..8de8929  master -> synced/master
-From /home/tyc20/Desktop/annex2
-   0f740b9..47ed905  git-annex  -> annex2/git-annex
-[2014-01-05 21:46:23 CST] Transferrer: Uploaded cassandra.thrift
-Already up-to-date.
-ok
-
-(merging annex2/git-annex into git-annex...)
-(Recording state in git...)
-drop ADATAUFD conf/cassandra.thrift To /home/tyc20/Desktop/annex2
-   cf8e516..859a06b  git-annex -> synced/git-annex
-[2014-01-05 21:46:25 CST] Transferrer: Uploaded commitlog..roperties
-ok
-drop ADATAUFD conf/commitlog_archiving.properties [2014-01-05 21:46:25 CST] Transferrer: Uploaded cqlshrc.sample
-ok
-drop ADATAUFD conf/cqlshrc.sample [2014-01-05 21:46:26 CST] Transferrer: Uploaded new-name.properties
-ok
-drop ADATAUFD conf/new-name.properties [2014-01-05 21:46:27 CST] Pusher: Syncing with annex2, ADATAUFD 
-To /home/tyc20/Desktop/annex2
-   859a06b..da020f9  git-annex -> synced/git-annex
-To /media/A-DATA UFD/annex
-   cf8e516..da020f9  git-annex -> synced/git-annex
-Updating 8de8929..2bfeaab
-Fast-forward
- conf/{new-name.properties => new-name2.properties} | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename conf/{new-name.properties => new-name2.properties} (100%)
-[2014-01-05 21:47:23 CST] Committer: Committing changes to git
-[2014-01-05 21:47:23 CST] Pusher: Syncing with annex2, ADATAUFD 
-To /home/tyc20/Desktop/annex2
-   da020f9..1649bb6  git-annex -> synced/git-annex
-Already up-to-date.
-[2014-01-05 21:47:24 CST] Committer: Committing changes to git
-To /media/A-DATA UFD/annex
-   da020f9..1649bb6  git-annex -> synced/git-annex
-   8de8929..2bfeaab  master -> synced/master
-Already up-to-date.
-[2014-01-05 21:47:37 CST] Pusher: Syncing with annex2, ADATAUFD 
-Everything up-to-date
-Everything up-to-date
-
-Smalltalk-80 The language and its implementation (Bluebook).pdf
-
-       32768   0%    0.00kB/s    0:00:00  
-    10354688  30%    9.84MB/s    0:00:02  
-    20709376  61%    9.86MB/s    0:00:01  
-    29851648  88%    9.48MB/s    0:00:00  
-    33558574 100%    9.33MB/s    0:00:03 (xfer#1, to-check=0/1)
-
-sent 33562798 bytes  received 31 bytes  3532929.37 bytes/sec
-total size is 33558574  speedup is 1.00
-[2014-01-05 21:52:09 CST] Transferrer: Uploaded Smalltalk..book).pdf
-[2014-01-05 21:52:09 CST] Pusher: Syncing with annex2, ADATAUFD 
-
-cassandra-rackdc.properties
-
-        1199 100%    0.00kB/s    0:00:00  
-        1199 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1290 bytes  received 31 bytes  2642.00 bytes/sec
-total size is 1199  speedup is 0.91
-To /home/tyc20/Desktop/annex2
-   1649bb6..7329695  git-annex -> synced/git-annex
-[2014-01-05 21:52:13 CST] Transferrer: Uploaded cassandra..roperties
-
-cassandra-topology.properties
-
-        1358 100%    0.00kB/s    0:00:00  
-        1358 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1451 bytes  received 31 bytes  2964.00 bytes/sec
-total size is 1358  speedup is 0.92
-[2014-01-05 21:52:13 CST] Transferrer: Uploaded cassandra..roperties
-
-cassandra.thrift
-
-       32768  93%    0.00kB/s    0:00:00  
-       35216 100%    2.33MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 35300 bytes  received 31 bytes  23554.00 bytes/sec
-total size is 35216  speedup is 1.00
-[2014-01-05 21:52:14 CST] Transferrer: Uploaded cassandra.thrift
-
-commitlog_archiving.properties
-
-        2328 100%    0.00kB/s    0:00:00  
-        2328 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 2422 bytes  received 31 bytes  4906.00 bytes/sec
-total size is 2328  speedup is 0.95
-[2014-01-05 21:52:15 CST] Transferrer: Uploaded commitlog..roperties
-
-cqlshrc.sample
-
-        1324 100%    0.00kB/s    0:00:00  
-        1324 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1402 bytes  received 31 bytes  2866.00 bytes/sec
-total size is 1324  speedup is 0.92
-[2014-01-05 21:52:15 CST] Transferrer: Uploaded cqlshrc.sample
-
-new-name2.properties
-
-        1850 100%    0.00kB/s    0:00:00  
-        1850 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 1934 bytes  received 31 bytes  3930.00 bytes/sec
-total size is 1850  speedup is 0.94
-[2014-01-05 21:52:17 CST] Transferrer: Uploaded new-name2..roperties
-To /media/A-DATA UFD/annex
-   1649bb6..7329695  git-annex -> synced/git-annex
-[2014-01-05 21:52:21 CST] Pusher: Syncing with annex2, ADATAUFD 
-To /home/tyc20/Desktop/annex2
-   7329695..a7286da  git-annex -> synced/git-annex
-To /media/A-DATA UFD/annex
-   7329695..a7286da  git-annex -> synced/git-annex
-Updating 2bfeaab..40ceb79
-Fast-forward
- conf/commitlog_archiving.properties | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 120000 conf/commitlog_archiving.properties
-[2014-01-05 21:55:05 CST] Pusher: Syncing with annex2 
-[2014-01-05 21:55:05 CST] Committer: Committing changes to git
-To /home/tyc20/Desktop/annex2
-   a7286da..688d27e  git-annex -> synced/git-annex
-Already up-to-date.
-[2014-01-05 21:55:07 CST] Pusher: Syncing with annex2 
-Everything up-to-date
-[2014-01-05 21:55:58 CST] MountWatcher: You should enable consistency checking to protect your data in ADATAUFD. 
-[2014-01-05 21:55:58 CST] MountWatcher: Syncing with ADATAUFD 
-To /media/A-DATA UFD/annex
-   a7286da..688d27e  git-annex -> synced/git-annex
-   2bfeaab..40ceb79  master -> synced/master
-Already up-to-date.
-
-
-
-
-In addition, this is what the drive looks like from the console.
-
-tyc20@im1:/media/A-DATA UFD/annex$ git annex get
-(merging synced/git-annex into git-annex...)
-(Recording state in git...)
-get SHA256E-s9400--8dce230c548a40fe9722ef1cf9444a54ae726a7420391a8eae937c8beaff6d96.sh (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s1228--7e4190c2da12aa55c0f2598688d38723716bc11809ade1e594eae000ca40742c (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s298--d60cff88544f63e6da177d98ef18a593268df6d4fcfd1247443ce3656cb185ba.txt (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s26331--69bbae153239fa57b752bc931345275f36b608b26a3e9542ab4fabf21e05e57c.pdf (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s31688--fea8690cf82baea3365ff692108742fdec308638bf6d66a8765bdc582e6ebb2c.yaml (not available) 
-  No other repository is known to contain the file.
-failed
-git-annex: get: 5 failed
-tyc20@im1:/media/A-DATA UFD/annex$ ls
-annex  branches  config  description  HEAD  hooks  info  objects  refs
-tyc20@im1:/media/A-DATA UFD/annex$ git annex sync
-commit  
-ok
-pull im1 
-From /home/tyc20/Desktop/annex
- * [new branch]      git-annex  -> im1/git-annex
- * [new branch]      master     -> im1/master
- * [new branch]      synced/git-annex -> im1/synced/git-annex
- * [new branch]      synced/master -> im1/synced/master
-ok
-push im1 
-Counting objects: 73, done.
-Delta compression using up to 2 threads.
-Compressing objects: 100% (17/17), done.
-Writing objects: 100% (24/24), 1.54 KiB | 0 bytes/s, done.
-Total 24 (delta 16), reused 0 (delta 0)
-To /home/tyc20/Desktop/annex
-   688d27e..2819176  git-annex -> synced/git-annex
-ok
-tyc20@im1:/media/A-DATA UFD/annex$ git annex sync
-commit  
-ok
-pull im1 
-remote: Counting objects: 10, done.
-remote: Compressing objects: 100% (4/4), done.
-remote: Total 5 (delta 3), reused 0 (delta 0)
-Unpacking objects: 100% (5/5), done.
-From /home/tyc20/Desktop/annex
-   688d27e..c28d1a4  git-annex  -> im1/git-annex
-   2819176..c28d1a4  synced/git-annex -> im1/synced/git-annex
-ok
-(merging im1/git-annex into git-annex...)
-tyc20@im1:/media/A-DATA UFD/annex$ git annex get
-get SHA256E-s9400--8dce230c548a40fe9722ef1cf9444a54ae726a7420391a8eae937c8beaff6d96.sh (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s1228--7e4190c2da12aa55c0f2598688d38723716bc11809ade1e594eae000ca40742c (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s298--d60cff88544f63e6da177d98ef18a593268df6d4fcfd1247443ce3656cb185ba.txt (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s26331--69bbae153239fa57b752bc931345275f36b608b26a3e9542ab4fabf21e05e57c.pdf (not available) 
-  No other repository is known to contain the file.
-failed
-get SHA256E-s31688--fea8690cf82baea3365ff692108742fdec308638bf6d66a8765bdc582e6ebb2c.yaml (not available) 
-  No other repository is known to contain the file.
-failed
-git-annex: get: 5 failed
-tyc20@im1:/media/A-DATA UFD/annex$ mount -l
-sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime)
-proc on /proc type proc (rw,nosuid,nodev,noexec,relatime)
-udev on /dev type devtmpfs (rw,relatime,size=10240k,nr_inodes=128012,mode=755)
-devpts on /dev/pts type devpts (rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000)
-tmpfs on /run type tmpfs (rw,nosuid,noexec,relatime,size=103412k,mode=755)
-/dev/disk/by-uuid/25f084fb-c946-4c0d-bf0b-65ae4b68a7c6 on / type ext3 (rw,relatime,errors=remount-ro,barrier=1,data=ordered)
-tmpfs on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k)
-tmpfs on /run/shm type tmpfs (rw,nosuid,nodev,noexec,relatime,size=285260k)
-none on /mnt/share type vboxsf (rw,nodev,relatime)
-rpc_pipefs on /var/lib/nfs/rpc_pipefs type rpc_pipefs (rw,relatime)
-/dev/sr0 on /media/VBOXADDITIONS_4.3.6_91406 type iso9660 (ro,nosuid,nodev,relatime,uid=1000,gid=1000,iocharset=utf8,mode=0400,dmode=0500,uhelper=udisks) [VBOXADDITIONS_4.3.6_91406]
-/dev/sdb1 on /media/A-DATA UFD type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=1000,fmask=0022,dmask=0077,codepage=cp437,iocharset=utf8,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks) [A-DATA UFD]
-
-
-tyc20@im1:/media/A-DATA UFD/annex$ ls -la ~/Desktop/annex/conf/
-total 60
-drwxr-xr-x 2 tyc20 tyc20  4096 Jan  5 21:55 .
-drwxr-xr-x 4 tyc20 tyc20  4096 Jan  5 21:42 ..
--rw-r--r-- 1 tyc20 tyc20  1199 Jul 28 09:14 cassandra-rackdc.properties
--rw-r--r-- 1 tyc20 tyc20 35216 Jul 28 09:14 cassandra.thrift
--rw-r--r-- 1 tyc20 tyc20  1358 Jul 28 09:14 cassandra-topology.properties
--rw-r--r-- 1 tyc20 tyc20  1324 Jul 28 09:14 cqlshrc.sample
--rw-r--r-- 1 tyc20 tyc20  1850 Jul 28 09:14 new-name2.properties
-tyc20@im1:/media/A-DATA UFD/annex$ ls -la ~/Desktop/annex/
-total 32828
-drwxr-xr-x 4 tyc20 tyc20     4096 Jan  5 21:42 .
-drwxr-xr-x 4 tyc20 tyc20     4096 Jan  5 21:45 ..
-drwxr-xr-x 2 tyc20 tyc20     4096 Jan  5 21:55 conf
-drwxr-xr-x 9 tyc20 tyc20     4096 Jan  5 22:01 .git
--rwxrwxrwx 1 tyc20 tyc20 33558574 Aug 27  2007 Smalltalk-80 The language and its implementation (Bluebook).pdf
-tyc20@im1:/media/A-DATA UFD/annex$ 
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; seems to be some badly set up repository. Happy to help with
-> fixing it, if you reply.. --[[Joey]]
diff --git a/doc/bugs/Unable_to_copy_from_Android.mdwn b/doc/bugs/Unable_to_copy_from_Android.mdwn
deleted file mode 100644
--- a/doc/bugs/Unable_to_copy_from_Android.mdwn
+++ /dev/null
@@ -1,148 +0,0 @@
-### Please describe the problem.
-
-I am unable to copy files from my Android git annex repository into a remote repository on a Ubuntu machine.
-It was previously working fine, but after recent upgrades, it throws odd errors and refuses to copy the files.
-
-### What steps will reproduce the problem?
-
-Run this command:
-
-`git annex copy --to remote Path/To/File.txt`
-
-### What version of git-annex are you using? On what operating system?
-
-Souce Android Tablet
-
-[[!format sh """
-git-annex version: 5.20131221-gf8c928d  
-build flags: Assistant Webapp Testsuite S3 WebDAV Inotify XMPP DNS Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-local repository version: 5
-default repository version: 3
-supported repository versions: 3 5
-upgrade supported from repository versions: 0 1 2 4
-"""]]
-
-Destination Ubuntu server
-
-[[!format sh """
-git-annex version: 5.20131224-g692aa01
-build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-"""]]
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-git annex copy --to gimli Books/Laravel/laravel.mobi
-copy Books/Laravel/laravel.mobi (checking gimli...) git-annex: Not in a git repository.
-(to gimli...) git-annex: unknown command recvkey
-
-Usage: git-annex command [option ...]
-
-Commonly used commands:
-
-add          [PATH ...]      add files to annex
-addurl       URL ...         add urls to annex
-assistant                    automatically handle changes
-copy         [PATH ...]      copy content of files to/from another repository
-drop         [PATH ...]      indicate content of files not currently wanted
-edit         [PATH ...]      same as unlock
-get          [PATH ...]      make content of annexed files available
-import       [PATH ...]      move and add files from outside git working copy
-importfeed   URL ...         import files from podcast feeds
-lock         [PATH ...]      undo unlock command
-mirror       [PATH ...]      mirror content of files to/from another repository
-move         [PATH ...]      move content of files to/from another repository
-rmurl        FILE URL        record file is not available at url
-status       [PATH ...]      show the working tree status
-sync         [REMOTE ...]    synchronize local repository with remotes
-unlock       [PATH ...]      unlock files for modification
-watch                        watch for changes
-webapp                       launch webapp
-
-Repository setup commands:
-
-dead         REMOTE ...      hide a lost repository
-describe     REMOTE DESC     change description of a repository
-direct                       switch repository to direct mode
-enableremote NAME [K=V ...]  enables use of an existing special remote
-group        REMOTE DESC     add a repository to a group
-indirect                     switch repository to indirect mode
-init         DESC            initialize git-annex
-initremote   NAME [K=V ...]  creates a special (non-git) remote
-schedule     REMOTE [EXPR]   get or set scheduled jobs
-semitrust    REMOTE ...      return repository to default trust level
-trust        REMOTE ...      trust a repository
-ungroup      REMOTE DESC     remove a repository from a group
-untrust      REMOTE ...      do not trust a repository
-vicfg                        edit git-annex's configuration
-wanted       REMOTE [EXPR]   get or set preferred content expression
-
-Repository maintenance commands:
-
-addunused    NUM|RANGE ...   add back unused files
-dropunused   NUM|RANGE ...   drop unused file content
-fix          [PATH ...]      fix up symlinks to point to annexed content
-forget                       prune git-annex branch history
-fsck         [PATH ...]      check for problems
-merge                        automatically merge changes from remotes
-repair                       recover broken git repository
-unused                       look for unused file content
-upgrade                      upgrade repository layout
-
-Query commands:
-
-find         [PATH ...]      lists available files
-help                         display help
-info         [PATH ...]      shows general information about the annex
-list         [PATH ...]      show which remotes contain files
-log          [PATH ...]      shows location log
-map                          generate map of repositories
-version                      show version info
-whereis      [PATH ...]      lists repositories that have file content
-
-Utility commands:
-
-migrate      [PATH ...]      switch data to different backend
-reinject     SRC DEST        sets content of annexed file
-unannex      [PATH ...]      undo accidential add command
-uninit       [PATH ...]      de-initialize git-annex and clean out repository
-
-Plumbing commands:
-
-dropkey      KEY ...         drops annexed content for specified keys
-examinekey   KEY ...         prints information from a key
-fromkey      KEY PATH        adds a file using a specific key
-lookupkey    FILE ...        looks up key used for file
-pre-commit   [PATH ...]      run by git pre-commit hook
-rekey        [PATH KEY ...]  change keys used for files
-transferkey  KEY             transfers a key from or to a remote
-transferkeys                 transfers keys
-xmppgit                      git to XMPP relay
-
-rsync: connection unexpectedly closed (0 bytes received so far) [sender]
-rsync error: error in rsync protocol data stream (code 12) at io.c(224) [sender=3.1.0dev]
-
-
-rsync failed -- run git annex again to resume file transfer
-failed
-git-annex: copy: 1 failed
-
-# End of transcript or log.
-"""]]
-
-> There was a bug in the linux standalone tarball distributed
-> with 5.20131221 that made the `git-annex-shell` wrapper accidentially run
-> `git-annex` instead of `git-annex-shell`. Which results in 
-> this error about recvkey, which is a git-annex-shell command, not a
-> git-annex command.
-> 
-> I think your ubuntu system must have git-annex installed from that tarball.
-> This bug is fixed in the daily builds, and I have updated the
-> tarballs for the release too, now. [[done]] --[[Joey]]
diff --git a/doc/bugs/Unable_to_import_feed.mdwn b/doc/bugs/Unable_to_import_feed.mdwn
deleted file mode 100644
--- a/doc/bugs/Unable_to_import_feed.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-Using `git-annex version: 4.20130802` on Debian unstable, when trying to add the feed at <http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml>, I get:
-
-[[!format sh """
-importfeed http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml 
---2013-08-16 09:14:13--  http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml
-Auflösen des Hostnamen »www.ndr.de (www.ndr.de)«... 212.201.100.171, 212.201.100.187
-Verbindungsaufbau zu www.ndr.de (www.ndr.de)|212.201.100.171|:80... verbunden.
-HTTP-Anforderung gesendet, warte auf Antwort... 200 OK
-Länge: 61809 (60K) [application/xml]
-In »»/tmp/feed4404«« speichern.
-
-100%[============================================>] 61.809      --.-K/s   in 0,03s   
-
-2013-08-16 09:14:13 (2,20 MB/s) - »»/tmp/feed4404«« gespeichert [61809/61809]
-
-failed
-git-annex: importfeed: 1 failed
-"""]]
-
-(Oh, and using `format` with nono-ASCII seems to break down., at least in the preview.)
-
-> I'm going to close this since I've narrowed it down to a bug in the
-> upstream feed library. [[done]]. Of course, if we get a lot of reports of
-> the library not working, I may need to revisit using it, but for now this
-> seems an isolated problem. Also, I tried validating the feed, and it is
-> not 100% valid, and one of the validity problems is a missing enclosure
-> length. --[[Joey]] 
diff --git a/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn b/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn
deleted file mode 100644
--- a/doc/bugs/Unable_to_switch_back_to_direct_mode.mdwn
+++ /dev/null
@@ -1,55 +0,0 @@
-### Please describe the problem.
-
-I seem to be unable to switch back and forth between git annex direct and git annex indirect mode in one of my repositories.  I can in others just fine.
-
-### What steps will reproduce the problem?
-
-In the broken repository I can do:
-
-    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ git annex direct
-    commit  
-    add audio/part2.aup (checksum...) ok
-    ok
-    add images/campaign.png (checksum...) ok
-    ok
-    add images/transifex.png (checksum...) ok
-    ok
-    add script-lines.txt (checksum...) ok
-    ok
-    add vid_pitch.blend (checksum...) ok
-    ok
-    (Recording state in git...)
-    [master 9f13dc0] commit before switching to direct mode
-     1 file changed, 145 insertions(+), 1 deletion(-)
-     rewrite audio/part2.aup (100%)
-     mode change 120000 => 100644
-    ok
-    direct gavroche-vid-shot.blend 
-    git-annex: /home/cwebber/gfx-proj/mediagoblin_vid/.git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f: rename: permission denied (Permission denied)
-    failed
-    git-annex: direct: 1 failed
-
-looking at the files:
-
-    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ ls -l gavroche-vid-shot.blend
-    lrwxrwxrwx 1 cwebber cwebber 190 Apr 28 18:27 gavroche-vid-shot.blend -> .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
-    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$ ls -l .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
-    -rw-r--r-- 1 cwebber cwebber 2935980 Apr 28 18:27 .git/annex/objects/3M/mx/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f/SHA256E-s2935980--3a1c838333a4a0ee1eaa837c3f08a910d3f29fc60baf41affd936fbefe11111f
-    cwebber@earlgrey:~/gfx-proj/mediagoblin_vid$
-
-... it looks like these permissions should be fine!
-
-Some notable things:
-
-* I believe Blender wrote directly to a file that was in "locked" somehow, despite it being in that state.  It may have actually followed the symlink and overwritten that file, I'm not sure.
-* However, the file that git-annex is now reporting with "permission denied" is not the one it did previously... I did git checkout -- on all the files, switched them over, and it's a different set of broken things now!
-* It's actually easy enough to fix... in fact, I did fix it!  I just did a fresh clone of the git repository and a git annex get and everything is fine now.  However, it seemed like possibly a bug that might hit other people, hence my reporting it.
-
-### What version of git-annex are you using? On what operating system?
-
-git annex version 4.20130417 on debian wheezy
-
-### Please provide any additional information below.
-
-
-> [[done]]; see comments. --[[Joey]]
diff --git a/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn b/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn
deleted file mode 100644
--- a/doc/bugs/Unable_to_sync_a_second_machine_through_Box.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-What steps will reproduce the problem?
-
-Install 4.20130417 as packaged in Debian unstable.
-Using "git annex webapp", setup on first machine adding repository ~/annex.  Add a Box.com repository in directory "annex", encrypted.  Add a jabber account (apparently successful).
-Add test file to ~/annex.  Login via website to box.com, notice that the "annex" directory is created and contains encrypted file.
-On second (remote machine), follow the same steps (add repository in ~/annex, Add a Box.com repository in directory "annex", encrypted, Add same jabber account).
-
-What is the expected output? What do you see instead?
-
-Expected the file to appear in the second machine's ~/annex.  The webapp indicates: Synced with box.com
-Log file says:
-
-[2013-04-23 06:50:16 EDT] main: starting assistant version 4.20130417
-(scanning...) [2013-04-23 06:50:16 EDT] Watcher: Performing startup scan
-(started...) 
-(encryption setup shared cipher) (testing WebDAV server...)
-(gpg) [2013-04-23 06:50:50 EDT] main: Syncing with box.com 
-[2013-04-23 06:50:50 EDT] main: Share with friends, and keep your devices in sync across the cloud. 
-[2013-04-23 06:51:03 EDT] main: Share with friends, and keep your devices in sync across the cloud. 
-warning: Not updating non-default fetch respec
-	
-	Please update the configuration manually if necessary.
-Initializing nautilus-gdu extension
-Shutting down nautilus-gdu extension
-git-annex: Daemon is already running.
-
-What version of git-annex are you using? On what operating system?
-
-4.20130417, debian testing with apt-pinning to unstable on both systems.
-
-Please provide any additional information below.
-
-When editing the Box.com repository, the option to select a directory no longer appears (and the configuration doesn't show the one selected at creation).
-There's no indication if the jabber communication is working successfully.  It could be that signalling isn't working for some reason, but the user has no information to determine that.
-It would be helpful if there were some indication in the Dashboard as to the number of files/directories/objects that git annex believes exists in each location.  It could be that it's not accessing the Box.com server successfully, but again, this is difficult to determine.
-
-It's great to see that git annex might make a box.com account useful for automatic upload and sync... looking forward to getting it to work on both sides! Thanks for making this!
-
-[[!tag /design/assistant moreinfo]]
-
-> The robustness of the XMPP support has massively improved since this bug
-> report was filed. Since no more information is forthcoming, I consider
-> this bug [[done]].
->
-> (Incidentially, this bug got me to santize all information logged about
-> XMPP protocol, including the names/emails of buddies..) --[[Joey]]
diff --git a/doc/bugs/Unable_to_use_remotes_with_space_in_the_path.mdwn b/doc/bugs/Unable_to_use_remotes_with_space_in_the_path.mdwn
deleted file mode 100644
--- a/doc/bugs/Unable_to_use_remotes_with_space_in_the_path.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-### Please describe the problem.
-
-Git annex can't use remotes with the type "file://" if the path contains spaces
-
-### What steps will reproduce the problem?
-
-- Create one repository with a space in the path (and initialize annex in it)
-- Clone that repo to an other directory (and initialize annex also in that)
-- add a file to the first repository in the annex way
-- chdir to the second repository and try to get that file, it won't work (also after git pull or git sync pull)
-
-Check this typescripts for a more detailed description
-
-<http://uz.sns.it/~enrico/git-annex-bugreport.txt>
-
-<http://pastebin.com/f8wkDNrG> (thanks mhameed for that data)
-
-
-### What version of git-annex are you using? On what operating system?
-
-I'm using debian testing (jessie) on a i386 machine.
-
-`git-annex` version: 4.20130521 (according to apt data and `git annex version`)
-
-`git-annex` build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-
-`git` version: 1.7.10.4
-
-
-### Please provide any additional information below.
-
-I don't use git annex assistant nor the webapp
-
-> Tested and only file:// and not other urls have this problem.
-> guilhem provided a fix. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Unfortunate_interaction_with_Calibre.mdwn b/doc/bugs/Unfortunate_interaction_with_Calibre.mdwn
deleted file mode 100644
--- a/doc/bugs/Unfortunate_interaction_with_Calibre.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calibre 
-
-Calibre is a somewhat popular eBook management package that's also free software.  <http://calibre-ebook.com/>  
-
-Install via
-    # apt-get install calibre
-
-There is a somewhat unfortunate interaction between Calibre and git-annex...
-
-* git-annex makes its files become read-only.  By the way, that's not quite obvious from the documentation; I suggest making that more prominent.
-* Calibre modifies files (not quite sure of semantics, how, or why) when doing various operations, notably such as when copying a book from one's library to one's portable reading device.
-
-These don't play well together, sadly.
-
-I'd expect most of the issue to sit on the Calibre side, and have reported it as a bug.
-[Calibre bug #739045](https://bugs.launchpad.net/calibre/+bug/739045)
-Preliminary indication is that they're treating it as a functionality change they'll decline to fix.  Which isn't entirely unreasonable - I anticipated as much, and I don't want to treat that as a bad/wrong decision.
-
-However, I think it's:
-* Unfortunate, as fitting Calibre together with git-annex seems like a neat idea.
-* Useful to make sure that this kind of "doesn't play well together" condition is documented, even if only as a bug report.
-
-> [[done]]; the assistant uses direct mode by default now to avoid
-> this kind of thing. --[[Joey]] 
diff --git a/doc/bugs/Unknown_command___39__list__39__.mdwn b/doc/bugs/Unknown_command___39__list__39__.mdwn
deleted file mode 100644
--- a/doc/bugs/Unknown_command___39__list__39__.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-### Please describe the problem.
-
-The man page claims there exists a query command 'list' but:
-
-    % git annex list somefile
-    git-annex: Unknown command 'list'
-
-### What version of git-annex are you using? On what operating system?
-
-man page online and git-annex version 4.20130909.
-
-> Your last line explains the problem. The online man page
-> documents the latest release, or in some cases
-> unrelased git version. You have a version 2 releases old installed.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/Unknown_remote_type_webdav.mdwn b/doc/bugs/Unknown_remote_type_webdav.mdwn
deleted file mode 100644
--- a/doc/bugs/Unknown_remote_type_webdav.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-When I attempt to setup a [box.com special remote](http://git-annex.branchable.com/tips/using_box.com_as_a_special_remote/) I get the following error:
-
-    git-annex: Unknown remote type webdav
-
-I'm using the Linux prebuilt tarball. Does it not include webdav support?
-
-> The amd64 standalone tarball was indeed built without it for the last
-> release. Fixed that. [[done]] --[[Joey]]
diff --git a/doc/bugs/Unnecessary_remote_transfers.mdwn b/doc/bugs/Unnecessary_remote_transfers.mdwn
deleted file mode 100644
--- a/doc/bugs/Unnecessary_remote_transfers.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-### Please describe the problem.
-This is related to [[http://git-annex.branchable.com/bugs/assistant_does_not_always_use_repo_cost_info_when_queueing_downloads/]]
-
-### What steps will reproduce the problem?
-1.  Make a client repo on two machines on the local network.
-2.  Pair them.
-3.  Make a remote transfer repo.
-4.  Set up Jabber on both local machines.
-5.  Put a large file into the annex on one of the local machines.
-6.  Watch as the source client repo copies the file directly to the local paired machine, but also copies it to the remote transfer repo.
-7.  Wait for the local paired transfer to finish.
-8.  Manually disable syncing to the remote transfer repo.
-9.  Manually reenable it.
-10.  Watch as the remote transfer is not resumed.
-
-### What version of git-annex are you using? On what operating system?
-Using the 1 Nov Linux tarball, Ubuntu Raring.
-
-### Please provide any additional information below.
-This is a problem because unless I manually disable the remote repo, it will continue uploading the large file until it finishes, which uses the limited upstream bandwidth on my Internet connection--and this could take hours depending on the size of the file.
-
-The remote transfer wasn't even necessary to begin with, because it already had a direct connection to the local paired repo.  But even so, it should at least abort the remote transfer when the local transfer finishes.
-
-Thanks for your work on git-annex assistant.
-
-> From a re-read of the comments, this was resolved satisfactorily,
-> and I don't need to make any changes. [[done]] --[[Joey]]
diff --git a/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn b/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn
deleted file mode 100644
--- a/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn
+++ /dev/null
@@ -1,64 +0,0 @@
-What steps will reproduce the problem?
-
-Run:
-
-    cabal install git-annex
-
-What is the expected output? What do you see instead?
-
-The current output is the following:
-
-    $ cabal install git-annex        
-    Resolving dependencies...    
-    Configuring certificate-1.3.2...
-    Building certificate-1.3.2...
-    Preprocessing library certificate-1.3.2...
-    [ 1 of 10] Compiling Data.Certificate.KeyDSA ( Data/Certificate/KeyDSA.hs, dist/build/Data/Certificate/KeyDSA.o )
-    [ 2 of 10] Compiling Data.Certificate.KeyRSA ( Data/Certificate/KeyRSA.hs, dist/build/Data/Certificate/KeyRSA.o )
-    
-    Data/Certificate/KeyRSA.hs:64:27:
-        `RSA.private_pub' is not a (visible) field of constructor `RSA.PrivateKey'
-    cabal: Error: some packages failed to install:
-    DAV-0.3 depends on certificate-1.3.2 which failed to install.
-    authenticate-1.3.2 depends on certificate-1.3.2 which failed to install.
-    certificate-1.3.2 failed during the building phase. The exception was:
-    ExitFailure 1
-    git-annex-3.20130107 depends on certificate-1.3.2 which failed to install.
-    http-conduit-1.8.6.3 depends on certificate-1.3.2 which failed to install.
-    http-reverse-proxy-0.1.1.1 depends on certificate-1.3.2 which failed to install.
-    tls-1.0.3 depends on certificate-1.3.2 which failed to install.
-    tls-extra-0.5.1 depends on certificate-1.3.2 which failed to install.
-    yesod-1.1.7.2 depends on certificate-1.3.2 which failed to install.
-    yesod-auth-1.1.3 depends on certificate-1.3.2 which failed to install.
-
-I'd rather get a message stating how awesome the software I just installed is. :)
-
-What version of git-annex are you using? On what operating system?
-
-  * Debian (testing)
-  * GHC 7.4.1
-  * Cabal 1.14.0, cabal-install 0.14.0
-  * cabal list git-annex says the installing version is: 3.20130107
-
-Please provide any additional information below.
-
-The certificate package version 1.3.2 does not seem to install properly with
-this version of GHC (I think).
-
-Version 1.3.3 solves the issue. I don't know if there is a way for me to
-override the dependency tree to try to force the version update with
-cabal-install, so maybe it's worth filing a bug.
-
-Thanks a lot for git-annex.
-
-> Welcome to cabal hell! This problem is why haskell's cabal system is not
-> a sufficient way for users to install git-annex, and we have to provide
-> prebuilt builds.
-> 
-> No change to git-annex can fix this problem. The problem is that
-> the old version of certificate got busted by some change to one of its
-> dependencies, and several libraries that git-annex depends on have not
-> yet been updated to use the new version of certificate. Once those
-> libraries get updated, it'll fix itself.
-> 
-> [[done]]; not git-annex bug. --[[Joey]]
diff --git a/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn b/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn
--- a/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn
+++ b/doc/bugs/Upgrade_Does_not_Complete_on_OS_X.mdwn
@@ -29,3 +29,4 @@
 """]]
 
 > This seems to be a duplicate of this bug: [[Upgrade_impossible_om_Mac_OSX]]. Please follow up there with any details you can provide. --[[Joey]]
+> [[dup|done]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX.mdwn b/doc/bugs/Upgrade_impossible_om_Mac_OSX.mdwn
--- a/doc/bugs/Upgrade_impossible_om_Mac_OSX.mdwn
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX.mdwn
@@ -18,3 +18,5 @@
 
 # End of transcript or log.
 """]]
+
+[[moreinfo]]
diff --git a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn b/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn
deleted file mode 100644
--- a/doc/bugs/Use_a_git_repository_on_the_server_don__39__t_work.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-What steps will reproduce the problem?
-1. Create a Repository
-2. Add a Remote Server
-
-What is the expected output? What do you see instead?
-The option "Use a git repository on the server" is marked as not available
-
-What version of git-annex are you using? On what operating system?
-Version: 4.20130405 but on Webapp ist shows: Version: 4.20130324
-Linux 64bit
-
-Please provide any additional information below.
-git and git-annex are available on the Remote Server
-
-> While this bug report was about a server that did not get git-annex-shell
-> installed in PATH (something trivially fixed by `apt-get install
-> git-annex`), the comments below would like to turn this into a bug report about 
-> the error message "unknown UUID; cannot modify". All right then..
-> --[[Joey]]
-> 
-> This can occur if a ssh key is locked down to use directory A, and a
-> new repo is added in directory B which uses the same ssh key. Things will
-> then fail when git-annex-shell rejects the attept to use directory B, and
-> this results in the webapp displaying an internal server error of
-> "unknown UUID; cannot modify" since NoUUID is retreived for the repo.
-> 
-> In fact, I already dealt with this
-> once in 79561774450c8abf7c2cb42b08575a3ca27010dc; it used to not use 
-> the directory name at all as part of the mangled hostname. Most of the 
-> "me too" responses" predate that fix.
-> 
-> Now, this can only happen
-> if the mangled hostname for directory A and B is the same. One way this can
-> happen is if the directories are "annex" and "~/annex". In other words,
-> I suspect that users are entering "annex" once, and "~/annex" another
-> time, when setting up what they intend to be the same repo. Perhaps the
-> first time something else fails (like the original problem of
-> git-annex-shell not being in path), or they want to set it up again,
-> and the next time the subtly different directory is entered.
-> 
-> To fix this,
-> `mangleSshHostName` would need to be changed to generate different mangled
-> hostnames in all cases. Currently, it skips non-alpha-numeric
-> characters in the directory. [[done]] --[[Joey]]
-> --[[Joey]] 
-> 
-> Additionally, just entering a path starting with "~/" would cause this
-> error, since the webapp tacks on "/~/" to make a relative path absolute.
-> I've also fixed that. [[done]] --[[Joey]]
diff --git a/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn b/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn
deleted file mode 100644
--- a/doc/bugs/Using_Github_as_remote_throws_proxy_errors.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-What steps will reproduce the problem?
-
-1. cd to an already existing git repository that uses Github as a remote, with the remote format similar to git@github.com:user/repo.git
-2. git annex init
-3. git annex status
-
-What is the expected output? What do you see instead?
-
-    $ git annex status
-    supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-    supported remote types: git S3 bup directory rsync web hook
-    trusted repositories: Invalid command: 'git-annex-shell 'configlist' '/~/dlo/objectifier.git''
-      You appear to be using ssh to clone a git:// URL.
-      Make sure your core.gitProxy config option and the
-      GIT_PROXY_COMMAND environment variable are NOT set.
-    Command ssh ["-S","/Users/dan/Documents/Web/objectifier/.git/annex/ssh/git@github.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@github.com","git-annex-shell 'configlist' '/~/dlo/objectifier.git'"] failed; exit code 1
-    0
-    # ... other stuff that isn't relevant
-
-
-What version of git-annex are you using? On what operating system?
-
-git-annex-3.20120825
-
-Max OS X 10.8.1
-
-> [[done]]; see comments --[[Joey]] 
diff --git a/doc/bugs/Using_a_revoked_GPG_key.mdwn b/doc/bugs/Using_a_revoked_GPG_key.mdwn
deleted file mode 100644
--- a/doc/bugs/Using_a_revoked_GPG_key.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-### Please describe the problem.
-git-annex refuses to use revoked GPG keys. This may be understandable for the initial remote setup, but it hit me when I tried to add a new key to a remote. The previous key has been revoked (because it has been superseded by the new one), and git-annex refused to reinvoke the shared key with both keys because one of them was revoked.
-
-Given the encryption model does not allow key replacement, it should not refuse to reencrypt using a revoked key. Maybe using `--expert` would help.
-
-### What steps will reproduce the problem?
-Encrypt a special remote with a key K1. Revoke key K1. Try to add key K2 with enableremote. git-annex will refuse to encrypt the shared key with the revoked one.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130802-g1452ac3
-
-### Please provide any additional information below.
-
-[[!format sh """
-% git annex enableremote zoidberg-crypted encryption=42B8F7C2 
-enableremote zoidberg-crypted (encryption update) 
-You need a passphrase to unlock the secret key for
-user: "Samuel Tardieu <sam@rfc1149.net>"
-2048-bit ELG key, ID F0D70BAF, created 2002-05-31 (main key ID 1B80ADE6)
-
-gpg: NOTE: key has been revoked
-gpg: reason for revocation: Key is superseded
-gpg: revocation comment: Key superseded by 42B8F7C2
-gpg: revocation comment: (fingerprint 1D36 D924 8B33 DCAB 7BA5  BA44 7A30 BCF4 42B8 F7C2)
-gpg: F13322411B80ADE6: skipped: Unusable public key
-gpg: [stdin]: encryption failed: Unusable public key
-
-git-annex: user error (gpg ["--quiet","--trust-model","always","--encrypt","--no-encrypt-to","--no-default-recipient","--recipient","7A30BCF442B8F7C2","--recipient","F13322411B80ADE6"] exited 2)
-failed
-git-annex: enableremote: 1 failed
-"""]]
-
-> [[done]]; can now use: `git annex enableremote foo keyid-=REVOKEDKEY
-> keyid+=NEWKEY` to remove it, and add a new key. --[[Joey]]  
diff --git a/doc/bugs/WEBDAV_443.mdwn b/doc/bugs/WEBDAV_443.mdwn
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443.mdwn
+++ /dev/null
@@ -1,307 +0,0 @@
-What steps will reproduce the problem?
-
-```
-WEBDAV_USERNAME=pradermecker@yahoo.ca WEBDAV_PASSWORD=xxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb encryption=none
-```
-
-What is the expected output? What do you see instead?
-
-I have: 
-```
-git-annex: WebDAV failed to write file: FailedConnectionException "www.box.com" 443: user error
-```
-# What version of git-annex are you using? On what operating system?
-
-```
-git-annex version: 4.20130314
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-```
-Archlinux 64: https://aur.archlinux.org/packages/git-annex/
-
-# Please provide any additional information below.
-
-1. Try my password a couple of time. It works with Chrome, Firefox or cadaver
-2. I am using a zsh shell and try exporting both env. variables
-3. git-annex test has errors
-
-### Error in:   git-annex add:1           
-sha1foodup: openFile: does not exist (No such file or directory)
-Cases: 3  Tried: 2  Errors: 2  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: dir/foo: getFileStatus: does not exist (No such file or directory)
-### Failure in: git-annex add:2           
-add of subdir failed
-Cases: 3  Tried: 3  Errors: 2  Failures: 1
-----------------------------------------------------------------------
-reinject
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: sha1foo not found
-### Failure in: git-annex reinject/fromkey
-reinject failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-----------------------------------------------------------------------
-unannex
-Cases: 2  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex unannex:0:no content
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 1  Errors: 1  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex unannex:1:with content
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 2  Errors: 2  Failures: 0
-----------------------------------------------------------------------
-drop
-Cases: 3  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-git-annex: foo not found
-### Failure in: git-annex drop:0:no remotes
-drop wrongly succeeded with no known copy of file
-Cases: 3  Tried: 1  Errors: 0  Failures: 1warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex drop:1:with remote
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 3  Tried: 2  Errors: 1  Failures: 1warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex drop:2:untrusted remote
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 3  Tried: 3  Errors: 2  Failures: 1
-----------------------------------------------------------------------
-get
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex get             
-foo: openFile: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-move
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex move            
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-copy
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex copy            
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-lock
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex unlock/lock     
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-edit
-Cases: 2  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex edit/commit:0   
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 1  Errors: 1  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex edit/commit:1   
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 2  Errors: 2  Failures: 0
-----------------------------------------------------------------------
-fix
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex fix             
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-trust
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-fsck
-Cases: 4  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Failure in: git-annex fsck:0          
-fsck failed to fail with numcopies unsatisfied
-Cases: 4  Tried: 2  Errors: 0  Failures: 1warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Failure in: git-annex fsck:2          
-fsck failed to fail with content only available in untrusted (current) repository
-Cases: 4  Tried: 3  Errors: 0  Failures: 2warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-git-annex: sha1foo not found
-### Failure in: git-annex fsck:3          
-fsck failed to fail with content not replicated to enough non-untrusted repositories
-Cases: 4  Tried: 4  Errors: 0  Failures: 3
-----------------------------------------------------------------------
-migrate
-Cases: 2  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex migrate:0       
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 1  Errors: 1  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex migrate:1       
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 2  Tried: 2  Errors: 2  Failures: 0
-----------------------------------------------------------------------
- unused
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-git-annex: sha1foo not found
-fatal: pathspec 'foo' did not match any files
-### Failure in: git-annex unused/dropunused
-git rm failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-----------------------------------------------------------------------
-describe
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-find
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex find            
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-merge
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-status
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-{"command":"status","supported backends":["SHA256E","SHA1E","SHA512E","SHA224E","SHA384E","SHA256","SHA1","SHA512","SHA224","SHA384","WORM","URL"],"supported remote types":["git","S3","bup","directory","rsync","web","webdav","glacier","hook"],"repository mode":"indirect","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"80db3ccc-8c73-4279-b803-1b02c91dd158","description":".t/tmprepo0","here":true},{"uuid":"c01ef662-caa7-46d1-95de-544bee8b08f1","description":"origin (test repo)","here":false}],"untrusted repositories":[],"dead repositories":[],"available local disk space":"75 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","known annex keys":0,"known annex size":"0 bytes","bloom filter size":"16 mebibytes (0% full)","success":true}
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-version
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex version: 4.20130314
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-sync
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-# On branch master
-#
-# Initial commit
-#
-nothing to commit (create/copy files and use "git add" to track)
-### Failure in: git-annex sync            
-sync failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-----------------------------------------------------------------------
-sync regression
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-git-annex: foo not found
-git-annex: foo not found
-# On branch master
-#
-# Initial commit
-#
-nothing to commit (create/copy files and use "git add" to track)
-### Failure in: git-annex sync_regression 
-sync failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-----------------------------------------------------------------------
-map
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-uninit
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex uninit          
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-upgrade
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-whereis
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-### Error in:   git-annex whereis         
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-hook remote
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex hook remote     
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-directory remote
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex directory remote
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-rsync remote
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex rsync remote    
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-bup remote
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-crypto
-Cases: 1  Tried: 0  Errors: 0  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-git-annex: foo not found
-### Error in:   git-annex crypto          
-foo: getSymbolicLinkStatus: does not exist (No such file or directory)
-Cases: 1  Tried: 1  Errors: 1  Failures: 0
-----------------------------------------------------------------------
-Some tests failed!
-  (This could be due to a bug in git-annex, or an incompatability
-   with utilities, such as git, installed on this system.)
-
-> (The test suite output suggests to me that it was run on a system
-> that does not support symlinks, and may be broken in some other way
-> as well, but is not relevant to this bug report.)
-> --[[Joey]] 
-
-> Closing this bug since the bug submitter cannot reproduce it and
-> had many problems that seems to point at a bad build. [[done]] --[[Joey]]
diff --git a/doc/bugs/WEBDAV_443/comment_10_9ee2c5ed44295455af890caee7b06f1a._comment b/doc/bugs/WEBDAV_443/comment_10_9ee2c5ed44295455af890caee7b06f1a._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_10_9ee2c5ed44295455af890caee7b06f1a._comment
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 10"
- date="2013-03-18T15:47:19Z"
- content="""
-Ok, I will try that.
-
-For your information, I have rebuild the aur package inside a VM using the latest master. All tests passed.
-
-Now I get a new error message with WEBDAV saying:
-
-```
-git-annex: WebDAV failed to write file: \"Conflict\": user error
-```
-
-As a note the current aur build is rather cumbersome because it needs to rebuild a lot of packages using cabal. I believe this is due to a few missing dependencies in the Arch repos [haskell-core] and [haskell-web] such as uuid, SafeSemaphore or c2hs.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_11_863a7d315212c9a8ab8f6fafa5d1b7f5._comment b/doc/bugs/WEBDAV_443/comment_11_863a7d315212c9a8ab8f6fafa5d1b7f5._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_11_863a7d315212c9a8ab8f6fafa5d1b7f5._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 11"
- date="2013-03-18T16:24:52Z"
- content="""
-FYI, it is a bit heavy for me to try the standalone version as it is 32 bits only (I am on 64-bits)
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_12_c17a4e23011e0a917dbe0ecf7e9f0cb5._comment b/doc/bugs/WEBDAV_443/comment_12_c17a4e23011e0a917dbe0ecf7e9f0cb5._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_12_c17a4e23011e0a917dbe0ecf7e9f0cb5._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 12"
- date="2013-03-18T16:33:31Z"
- content="""
-The standalone version works on either architecture, it does not depend on any system libraries, thus the name \"standalone\".
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_13_3414416ff455d2fd1a7c7e7c4554b54d._comment b/doc/bugs/WEBDAV_443/comment_13_3414416ff455d2fd1a7c7e7c4554b54d._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_13_3414416ff455d2fd1a7c7e7c4554b54d._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 13"
- date="2013-03-18T16:39:58Z"
- content="""
-I actually don't know if it has something to do with 32 or 64 bits but with the standalone I have got:
-/opt/git-annex.linux/runshell: line 69: /opt/git-annex.linux/bin/git-annex-shell: No such file or directory
-
-I have tried both the aur standalone and directly downloading the tarball.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_14_e1da141eefb0445c217e5f5c119356da._comment b/doc/bugs/WEBDAV_443/comment_14_e1da141eefb0445c217e5f5c119356da._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_14_e1da141eefb0445c217e5f5c119356da._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 14"
- date="2013-03-18T16:54:02Z"
- content="""
-Given that line 69 of runshell is a newline, and that runshell does not ever try to run git-annex-shell, I wonder what you downloaded exactly...
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_15_41c3134bcc222b97bf183559723713d9._comment b/doc/bugs/WEBDAV_443/comment_15_41c3134bcc222b97bf183559723713d9._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_15_41c3134bcc222b97bf183559723713d9._comment
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 15"
- date="2013-03-18T19:07:31Z"
- content="""
-Euh. I actually feel stupid enough with this but ...
-
-I have try first with your link and it gives me:
-
-```
-./runshell: line 75: /home/vagrant/programs/git-annex.linux/bin/sh: No such file or directory
-```
-
-As I told you I then try the AUR package : https://aur.archlinux.org/packages/git-annex-standalone/
-
-And it does give me the same error on line 69.
-
-It is the same line (3 lines before the end):
-
-```
-exec \"$cmd\" \"$@\"
-```
-
-I really don't get it because the file is there ... and the first sanity checks of the script have pass.
-
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_16_89621b526065b5bef753ce75db1af7b5._comment b/doc/bugs/WEBDAV_443/comment_16_89621b526065b5bef753ce75db1af7b5._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_16_89621b526065b5bef753ce75db1af7b5._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 16"
- date="2013-03-18T19:31:42Z"
- content="""
-Actually it is even worse ...
-
-With your link, line 75 is actually 2 lines below (sh).
-
-So same command (runshell), same error, different places (I guess it is always the last line executed) ...
-
-Is it supposed to work fine in 64 bits also ?
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_17_131a1b65c8008cf9f02c93d4fb75720b._comment b/doc/bugs/WEBDAV_443/comment_17_131a1b65c8008cf9f02c93d4fb75720b._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_17_131a1b65c8008cf9f02c93d4fb75720b._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 7"
- date="2013-03-18T23:05:26Z"
- content="""
-The standalone linux tarball will work on 64 or 32 bit systems, as long as they are capable of linking 32 bit elf executables. I cannot test if Arch Linux is incapable of this.
-
-I'm getting a bit tired of wild tangents, can we you just find someplace, be it a Debian chroot or whatever, to run the standalone linux tarball and test if DAV works there?
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment b/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment
+++ /dev/null
@@ -1,29 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="It works !"
- date="2013-03-19T10:40:31Z"
- content="""
-Sorry for the wild tangents.
-
-It is now working. I am not sure what went wrong.
-
-For the record here are the steps I took (all using the Git annex UI):
-
-* Set up removable media -> OK
-* Set up remote SSH -> missing lsof -> install it -> everything OK
-* Set up S3  -> had issue with time -> solve it with ntp -> everything OK
-* Try again WebDav -> \"Conflict\" message -> try using another dir -> everything OK
-
-There might be a \"cleanup after error problem\" somewhere that would explain the conflict message I have received.
-
-Again for the record, I made it works inside a VM using the AUR \"git-annex 4.20130314-1\" (not the standalone). The only change I made on the PKGBUILD was to install everything with cabal except for the packages in the [haskell-core] Arch repo. I know you are not aware with Arch but basically I choose not to rely on the [haskell-web] Arch repo.
-
-I will try again at home on my laptop and I will try the standalone as well.
-
-Thanks you so much for the wonderful product !
-
-Cheers
-
-
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_1_c6572ca1eaaf89b01c0ed99a4058412f._comment b/doc/bugs/WEBDAV_443/comment_1_c6572ca1eaaf89b01c0ed99a4058412f._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_1_c6572ca1eaaf89b01c0ed99a4058412f._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 1"
- date="2013-03-16T15:35:05Z"
- content="""
-The i386 standalone build for 4.20130314, which is IIRC repackaged by Arch linux, was made using a known broken webdav library. I've since updated that build to use a new version of webdav. Since it only affected that one build, I do not plan to do a full re-release with a new version number.
-
-Probably Arch needs to update their package.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_2_a357969cde382a91e13920ee1e9f711c._comment b/doc/bugs/WEBDAV_443/comment_2_a357969cde382a91e13920ee1e9f711c._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_2_a357969cde382a91e13920ee1e9f711c._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="81.244.205.197"
- subject="Thanks"
- date="2013-03-16T15:46:45Z"
- content="""
-Thanks for your quick comment ! I was about to get crazy trying my password again and again ;-)
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_3_213815d6b827d467c60f3e8af925813b._comment b/doc/bugs/WEBDAV_443/comment_3_213815d6b827d467c60f3e8af925813b._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_3_213815d6b827d467c60f3e8af925813b._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 3"
- date="2013-03-17T21:07:50Z"
- content="""
-Seems that I misdiagnosed this. The error message from the bad TLS library was about a had certificate, not \"user error\" (which, confusingly, does not mean what user error normally means!).
-
-Also, I see you reported this at <https://aur.archlinux.org/packages/git-annex/>, so you're using that build and not the \"git-annex-bin\" build at <https://aur.archlinux.org/packages.php?ID=63503>. The Arch Linux build that's done from source couldn't be affected by the Debian-spefific TLS bug anyway.
-
-I am reopening this bug report. 
-
-Now, FailedConnectionException could be any of several things, but I noticed that someone else (perhaps cooindidentially using Arch Linux) reported the same error message here: [[Proxy_support]]. I wonder if you perhaps also have a http proxy that could be causing trouble.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_4_b775be4b722fc7124d9fbe2d5d01cc9f._comment b/doc/bugs/WEBDAV_443/comment_4_b775be4b722fc7124d9fbe2d5d01cc9f._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_4_b775be4b722fc7124d9fbe2d5d01cc9f._comment
+++ /dev/null
@@ -1,22 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 4"
- date="2013-03-17T21:19:20Z"
- content="""
-Digging into your error message a bit more, it looks like this is not a http proxy (or if it is, it's letting some connections through). 
-
-git-annex is testing the box.com WebDAV server, by performing 3 actions:
-
-1. Creating the requested subdirectory on it, in your case \"git-annex\". 
-2. Creating an empty file to that directory, named \"git-annex-test\"
-3. Deleting the file.
-
-Step 2 is failing. Which sort of suggests step 1 succeeded, but who knows..
-
-So, if you go look at your files on box.com, do you have a git-annex directory?
-
-Does git-annex/git-annex-test exist?
-
-Does it also fail if you use a different directory, like https://www.box.com/dav/git-annex2 ?
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_5_c4ea745da437e56b2426d1c2c00dfcec._comment b/doc/bugs/WEBDAV_443/comment_5_c4ea745da437e56b2426d1c2c00dfcec._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_5_c4ea745da437e56b2426d1c2c00dfcec._comment
+++ /dev/null
@@ -1,17 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="81.244.157.3"
- subject="comment 5"
- date="2013-03-17T22:03:22Z"
- content="""
-No there is no directory created on box.com. I have actually tried with other names without success. I did even try to create the directory myself and use this one but it makes no difference.
-
-I am not sure to understand what 443 means.
-
-To be sure it is not a local config problem on my computer, I have tried to put a file to box using cadaver: cadaver works just fine (create dir, upload, delete file).
-
-After your comment, I actually rebuild the package using master. I still have the same error with WebDav but now all tests pass (git annex test)
-
-Let me know if you need me to do further investigation. Thanks.
-
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_6_ef05c0ae88fee9c626922c6064ffdf1e._comment b/doc/bugs/WEBDAV_443/comment_6_ef05c0ae88fee9c626922c6064ffdf1e._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_6_ef05c0ae88fee9c626922c6064ffdf1e._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="81.244.157.3"
- subject="comment 6"
- date="2013-03-17T22:07:06Z"
- content="""
-I have also tried with the gui and got the same error.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_7_eecabe8d5ed564cb540450770ca7d0b6._comment b/doc/bugs/WEBDAV_443/comment_7_eecabe8d5ed564cb540450770ca7d0b6._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_7_eecabe8d5ed564cb540450770ca7d0b6._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 7"
- date="2013-03-18T00:18:52Z"
- content="""
-443 is the port used for https.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_8_7f77ba8ebd90186d3b3949ae529ba393._comment b/doc/bugs/WEBDAV_443/comment_8_7f77ba8ebd90186d3b3949ae529ba393._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_8_7f77ba8ebd90186d3b3949ae529ba393._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="https://pradermecker.myopenid.com/"
- ip="195.244.162.7"
- subject="comment 8"
- date="2013-03-18T08:33:04Z"
- content="""
-Yes, of course, I know about 443.
-
-I was just surprised to see it in the error message (where as a code my mind was expecting a http error code).
-
-What I meant is that I don't really see how it fits in the current error message.
-"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_9_87ebdc92b48d672964fb3f248c53600f._comment b/doc/bugs/WEBDAV_443/comment_9_87ebdc92b48d672964fb3f248c53600f._comment
deleted file mode 100644
--- a/doc/bugs/WEBDAV_443/comment_9_87ebdc92b48d672964fb3f248c53600f._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 9"
- date="2013-03-18T15:04:00Z"
- content="""
-I think what you need to do is try installing the [Linux standalone tarball](http://downloads.kitenet.net/git-annex/linux/current/) and see if it works with WebDAV. We need to rule out this being a bad build on the Arch side. The Linux standalone tarball works with box.com for me.
-
-"""]]
diff --git a/doc/bugs/WebDAV_HandshakeFailed_.mdwn b/doc/bugs/WebDAV_HandshakeFailed_.mdwn
deleted file mode 100644
--- a/doc/bugs/WebDAV_HandshakeFailed_.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-When I attempt to add a Box.com special remote to my annex I get the following error:
-
-    git-annex: HandshakeFailed (Error_Protocol ("certificate rejected: certificate is not allowed to sign another certificate",True,CertificateUnknown))
-
-Running git-annex version: 3.20130207
-
-> Got that bug fixed in Debian and all builds updated. [[done]] --[[Joey]]
diff --git a/doc/bugs/Weird_behaviour_of_direct_and_indirect_annexes.mdwn b/doc/bugs/Weird_behaviour_of_direct_and_indirect_annexes.mdwn
deleted file mode 100644
--- a/doc/bugs/Weird_behaviour_of_direct_and_indirect_annexes.mdwn
+++ /dev/null
@@ -1,57 +0,0 @@
-## What steps will reproduce the problem?
-
-    ~$ git annex webapp
-
-
-* Add Another Local Repository (~/Direct) "Direct", keep separate (from existing repo) no repo type
-* Add Repository, ~/Indirect "Indirect", combine (with Direct) , repo type client
-* Syncing enabled on both
-
-Then
-
-    ~/Indirect$ git annex indirect
-    commit  ok
-    indirect  ok
-    ok
-    ~/Indirect$ touch ../Direct/Test.File
-    
-
-## What is the expected output? What do you see instead?
-
-That ~/Indirect/Test.File be a symlink into .git/annex/objects/.......
-
-Instead, it is not a symlink. However, doing
-
-    ~/Indirect$ git annex direct
-    ~/Indirect$ git annex indirect
-
-results in what I would expect (until the content of Direct/Test.File is changed, when it ceases to be a symlink in ~/Indirect once more)
-
-
-
-## What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130405
-
-Ubuntu 12.10
-
-
-## Please provide any additional information below.
-
-Reading [[direct_mode]], I thought that I could have two repos on my computer, one direct, and one indirect, and if running the assistant, that I could gain the security of retaining old versions, as well as the convenience of direct mode. (I think I understand that correctly; if a direct-mode file only exists in one repository, and is edited, the old version is lost, but if it is in multiple repos, then the old versions will be retained).
-
-It seems to me that if I do
-
-    ~/Direct$ echo Content > Test.File
-    ~/Direct$ echo More Content > Test.File
-    ~/Direct$ echo Even More Content > Test.File
-
-that all three copies are stored in ~/Indirect, so the functionality I'm after seems to work. However, ~/Indirect/Test.File ends up not being a symlink, which I think is odd/unexpected.
-
-
-**Edit:  Doing a git annex sync in ~/Indirect results in the continuing behaviour to be correct, so there's some issue telling Direct that Indirect is no longer in direct-mode?**
-This appears to fix it, but I guess shouldn't be necessary.
-
-> AFAICS, the entire problem is that the assistant does not notice when the
-> repository it's running in is changed from direct to indirect mode. Since this
-> has also been reported to cause problems with the assistant, I have added
-> a check to prevent it from being done. [[done]] --[[Joey]] 
diff --git a/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn b/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn
deleted file mode 100644
--- a/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn
+++ /dev/null
@@ -1,384 +0,0 @@
-### Please describe the problem.
-I try to share some files between a windows machine and a linux machine in direct mode, with a remote repository between the two. I can't seem to reproduce the problem in indirect mode...
-
-I add a file on the windows machine then copy it to the remote repository. I then get it on the linux machine and edit it there. If I `git annex sync` and copy the file's data to the remote repository, a `git annex sync` on windows will fail like this:
-
-[[!format sh """
-$ git annex sync
-commit
-ok
-pull origin
-remote: Counting objects: 41, done.
-remote: Compressing objects: 100% (24/24), done.
-remote: Total 31 (delta 9), reused 0 (delta 0)
-Unpacking objects: 100% (31/31), done.
-From ssh://192.168.1.29:/home/raz/work/test
-   b23cb44..9073cc3  git-annex  -> origin/git-annex
-   7d4f0e2..87438fc  master     -> origin/master
-   57a661c..b33b025  synced/git-annex -> origin/synced/git-annex
-   7d4f0e2..87438fc  synced/master -> origin/synced/master
-ok
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 17, done.
-Delta compression using up to 8 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 565 bytes | 0 bytes/s, done.
-Total 5 (delta 2), reused 0 (delta 0)
-To ssh://192.168.1.29:/home/raz/work/test.git
-   b33b025..dcfaf23  git-annex -> synced/git-annex
- ! [rejected]        master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'ssh://192.168.1.29:/home/raz/work/test.git'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-failed
-git-annex: sync: 1 failed
-"""]]
-
-A `git log` tells me the master branch is not properly merged so I assume the pull failed silently (I paste the log in the transcript).
-
-I can then try to manually fix the windows working copy and sometimes it kind of work, but sometimes I have a hard time recovering and I am better off cloning a new version and moving data's around...
-
-### What steps will reproduce the problem?
-Create a repository on a windows.
-
-Add a file.
-
-`git clone --bare` the repository and put it on a remote machine.
-
-Clone the remote repository to a linux machine.
-
-Get the file's data.
-
-Edit the file on linux.
-
-Commit it and copy the data's to the remote machine.
-
-`git clone sync` on the windows machine --> Error.
-
-### What version of git-annex are you using? On what operating system?
-On Windows:
-[[!format sh """
-git-annex version: 4.20130827-g4f18612
-build flags: Pairing Testsuite S3 WebDAV DNS
-local repository version: 4
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 2
-"""]]
-
-On Linux
-[[!format sh """
-git-annex version: 4.20130815
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-local repository version: 4
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-"""]]
-
-### Please provide any additional information below.
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-### On Windows
-
-$ mkdir test_windows
-
-$ cd test_windows/
-
-$ git init
-Initialized empty Git repository in c:/Users/raz/test_windows/.git/
-
-$ git annex init windows
-init windows
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-ok
-(Recording state in git...)
-
-$ echo "test 1" > test.txt
-
-$ git annex add test.txt
-add test.txt (checksum...) ok
-(Recording state in git...)
-
-$ git annex sync
-commit
-ok
-git-annex: no branch is checked out
-
-$ cd ..
-
-$ git clone --bare test_windows/ test.git
-Cloning into bare repository 'test.git'...
-done.
-
-$ scp -r test.git 192.168.1.29:/home/raz/work/
-config                                        100%  183     0.2KB/s   00:00
-description                                   100%   73     0.1KB/s   00:00
-HEAD                                          100%   23     0.0KB/s   00:00
-applypatch-msg.sample                         100%  452     0.4KB/s   00:00
-commit-msg.sample                             100%  896     0.9KB/s   00:00
-post-commit.sample                            100%  160     0.2KB/s   00:00
-post-receive.sample                           100%  552     0.5KB/s   00:00
-post-update.sample                            100%  189     0.2KB/s   00:00
-pre-applypatch.sample                         100%  398     0.4KB/s   00:00
-pre-commit.sample                             100% 1704     1.7KB/s   00:00
-pre-push.sample                               100% 1348     1.3KB/s   00:00
-pre-rebase.sample                             100% 4951     4.8KB/s   00:00
-prepare-commit-msg.sample                     100% 1239     1.2KB/s   00:00
-update.sample                                 100% 3611     3.5KB/s   00:00
-exclude                                       100%  240     0.2KB/s   00:00
-825dc642cb6eb9a060e54bf8d69288fbee4904        100%   15     0.0KB/s   00:00
-a31b7a55380d79248658d3fffff6d2dc41a726        100%  116     0.1KB/s   00:00
-dcabbf728abe62b6e2bcc06b8306eb3aa9a497        100%  176     0.2KB/s   00:00
-332ecbfe923879df51a7a3f9bb86ebdfb64273        100%   45     0.0KB/s   00:00
-4f0e20d38d6dc757340a8c569270b5a857fc67        100%  160     0.2KB/s   00:00
-62956bcf45c63b24a637b22a742db0d9458248        100%   86     0.1KB/s   00:00
-7ec519eb1b257a85ae8f9373d0835dea9ddc04        100%   82     0.1KB/s   00:00
-1d1559a050b4a2df2e653b1e7ac15bdf7d56b1        100%   51     0.1KB/s   00:00
-b74dbedfac4d6a0a90580cff2088a5d61f6675        100%  130     0.1KB/s   00:00
-0ca042f439ef997f04a25a449aa1f539b93cf4        100%   53     0.1KB/s   00:00
-bbce5e51e5a90ffd26900de3546fc4f9704181        100%  151     0.2KB/s   00:00
-18bd66316298fcc5c06af9865c30a2fe4d2476        100%  176     0.2KB/s   00:00
-edf8b5cc207e16ca0173785a2ba569c5d4208c        100%   71     0.1KB/s   00:00
-packed-refs                                   100%  160     0.2KB/s   00:00
-
-$ cd test_windows/
-
-$ git remote add origin ssh://192.168.1.29:/home/raz/work/test.git
-
-$ git annex copy --to origin
-copy test.txt (checking origin...) (to origin...)
-test.txt
-           7 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 79 bytes  received 31 bytes  220.00 bytes/sec
-total size is 7  speedup is 0.06
-ok
-(Recording state in git...)
-
-$ git annex sync
-commit
-ok
-pull origin
-remote: Counting objects: 11, done.
-remote: Compressing objects: 100% (5/5), done.
-remote: Total 6 (delta 1), reused 0 (delta 0)
-Unpacking objects: 100% (6/6), done.
-From ssh://192.168.1.29:/home/raz/work/test
- * [new branch]      git-annex  -> origin/git-annex
- * [new branch]      master     -> origin/master
-ok
-(merging origin/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 18, done.
-Delta compression using up to 8 threads.
-Compressing objects: 100% (8/8), done.
-Writing objects: 100% (10/10), 874 bytes | 0 bytes/s, done.
-Total 10 (delta 4), reused 0 (delta 0)
-To ssh://192.168.1.29:/home/raz/work/test.git
- * [new branch]      git-annex -> synced/git-annex
- * [new branch]      master -> synced/master
-ok
-
-### On Linux
-
-$ git clone test.git test_linux
-Cloning into 'test_linux'...
-done.
-
-$ cd test_linux 
-
-$ git annex init linux
-init linux ok
-(Recording state in git...)
-
-$ git annex sync
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-commit  
-ok
-pull origin 
-ok
-push origin 
-Counting objects: 11, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (6/6), done.
-Writing objects: 100% (8/8), 775 bytes | 0 bytes/s, done.
-Total 8 (delta 3), reused 0 (delta 0)
-To /home/raz/work/test.git
-   0b4f175..41fba1d  git-annex -> synced/git-annex
-ok
-
-$ git annex get
-get test.txt (from origin...) ok
-(Recording state in git...)
-
-$ git annex direct
-commit  
-# On branch master
-nothing to commit, working directory clean
-ok
-direct test.txt ok
-direct  ok
-
-$ git annex sync
-commit  
-ok
-pull origin 
-ok
-push origin 
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 492 bytes | 0 bytes/s, done.
-Total 5 (delta 1), reused 0 (delta 0)
-To /home/raz/work/test.git
-   41fba1d..57a661c  git-annex -> synced/git-annex
-ok
-
-$ cat test.txt  
-test 1
-
-$ echo "test 2" > test.txt
-
-$ git annex sync
-add test.txt (checksum...) ok
-(Recording state in git...)
-commit  
-(Recording state in git...)
-ok
-pull origin 
-ok
-push origin 
-Counting objects: 22, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (12/12), done.
-Writing objects: 100% (16/16), 1.40 KiB | 0 bytes/s, done.
-Total 16 (delta 4), reused 0 (delta 0)
-To /home/raz/work/test.git
-   57a661c..4883cad  git-annex -> synced/git-annex
-   7d4f0e2..87438fc  master -> synced/master
-ok
-
-$ git annex copy --to origin
-copy test.txt (to origin...) ok
-(Recording state in git...)
-
-$ git annex sync            
-commit  
-ok
-pull origin 
-remote: Counting objects: 6, done.
-remote: Compressing objects: 100% (4/4), done.
-remote: Total 5 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (5/5), done.
-From /home/raz/work/test
-   b23cb44..9073cc3  git-annex  -> origin/git-annex
-ok
-(merging origin/git-annex into git-annex...)
-(Recording state in git...)
-push origin 
-Counting objects: 18, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (8/8), done.
-Writing objects: 100% (10/10), 924 bytes | 0 bytes/s, done.
-Total 10 (delta 3), reused 0 (delta 0)
-To /home/raz/work/test.git
-   4883cad..b33b025  git-annex -> synced/git-annex
-ok
-
-$ 
-
-
-### On Windows
-
-$ git annex sync
-commit
-ok
-pull origin
-remote: Counting objects: 41, done.
-remote: Compressing objects: 100% (24/24), done.
-remote: Total 31 (delta 9), reused 0 (delta 0)
-Unpacking objects: 100% (31/31), done.
-From ssh://192.168.1.29:/home/raz/work/test
-   b23cb44..9073cc3  git-annex  -> origin/git-annex
-   7d4f0e2..87438fc  master     -> origin/master
-   57a661c..b33b025  synced/git-annex -> origin/synced/git-annex
-   7d4f0e2..87438fc  synced/master -> origin/synced/master
-ok
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 17, done.
-Delta compression using up to 8 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 565 bytes | 0 bytes/s, done.
-Total 5 (delta 2), reused 0 (delta 0)
-To ssh://192.168.1.29:/home/raz/work/test.git
-   b33b025..dcfaf23  git-annex -> synced/git-annex
- ! [rejected]        master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'ssh://192.168.1.29:/home/raz/work/test.git'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-failed
-git-annex: sync: 1 failed
-
-$ git log --graph --oneline --decorate --all
-* 87438fc (origin/synced/master, origin/master) git-annex automatic sync
-* 7d4f0e2 (HEAD, synced/master, master) git-annex automatic sync
-*-.   dcfaf23 (origin/synced/git-annex, git-annex) merging origin/git-annex orig
-|\ \
-| | *   b33b025 merging origin/git-annex into git-annex
-| | |\
-| | |/
-| |/|
-| * | 9073cc3 (origin/git-annex) update
-| | * 73518bc update
-| | * 4883cad update
-| | * 1b447f5 update
-| |/
-|/|
-* | 57a661c update
-| |
-|  \
-*-. \   41fba1d merging origin/git-annex origin/synced/git-annex into git-annex
-|\ \ \
-| | |/
-| |/|
-| | *   0b4f175 merging origin/git-annex into git-annex
-| | |\
-| | |/
-| |/|
-| * | b23cb44 update
-| | * b5755a2 update
-| |/
-| * 6adcabb update
-| * df18bd6 update
-| * dcbbce5 branch created
-* 0d138eb update
-* fe6bccc branch created
-
-$
-
-# End of transcript or log.
-"""]]
-
-> Apparently `test.git` had `receive.denyNonFastForwards`
-> set to true, which prevents the forced pushing `git annex sync`
-> needs to do. I have made it print out a hint about this setting
-> when a push failes. [[done]] --[[Joey]]
diff --git a/doc/bugs/With_S3__44___GPG_ask_for_a_new_passphrase.mdwn b/doc/bugs/With_S3__44___GPG_ask_for_a_new_passphrase.mdwn
deleted file mode 100644
--- a/doc/bugs/With_S3__44___GPG_ask_for_a_new_passphrase.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-I'm using S3 special remote that I initialized like this:
-
-    git annex initremote s3 type=S3 encryption=EEF2B390 datacenter="EU" storageclass="REDUCED_REDUNDANCY"
-
-Instead of asking me my key passphrase (I have gpg-agent running), it ask me a new passphase an then repeat it. So it's not my passphrase because if I kill gpg-agent, it will ask me three passphrase for each file: one mine and two for the new one. If i don't put anything there it says:
-
-    copy GOPR1672.JPG (checking s3...) (to s3...) gpg: error creating passphrase: Invalid passphrase
-    gpg: symmetric encryption of `[stdin]' failed: Invalid passphrase
-    failed
-    git-annex: fd:13: hPutBuf: resource vanished (Broken pipe)
-    copy GOPR1673.JPG (checking s3...) (to s3...) 
-
-So I create a new passphrase (two times) for each file I tried to upload. The problem is that I have more than 12000 files to upload!
-
-What's this new passphrase for?
-
-BTW: git-annex version: 3.20130102 same precompiled binary on Arch Linux.
-
-> I've reproduced this with gpg 2.0.19. It is a documented incompatability
-> between gpg 1.x and 2.x; the latter needs --batch included in its
-> parameters. I've put in a fix. [[done]]
diff --git a/doc/bugs/__34__Adding_4923_files__34___is_really_slow.mdwn b/doc/bugs/__34__Adding_4923_files__34___is_really_slow.mdwn
--- a/doc/bugs/__34__Adding_4923_files__34___is_really_slow.mdwn
+++ b/doc/bugs/__34__Adding_4923_files__34___is_really_slow.mdwn
@@ -98,3 +98,5 @@
 """]]
 
 [[!meta title="direct mode mappings scale badly with thousands of identical files"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content.mdwn b/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content.mdwn
deleted file mode 100644
--- a/doc/bugs/__34__drop__34___deletes_all_files_with_identical_content.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-# What steps will reproduce the problem?
-
-    echo "TEST CONTENT" > fileA
-    cp fileA fileB
-    git annex add file{A,B}
-    git annex drop fileA --force
-    cat fileB
-
-# What is the expected output? What do you see instead?
-
-## expected: 
-
--->   TEST CONTENT
-
-## observed:
-
--->   cat: fileB: No such file or directory
-
-
-# What version of git-annex are you using? On what operating system?
-
-git-annex version: 3.20121017
-
-# Please provide any additional information below.
-
-I really like git annex's feature, to store the same content only once. But as this happens transparently (i.e. the user does not need to no, nor is he told, that contents are identical (which is very comfortable, of course)), the "git annex drop" function is broken. For it effectively deleting (seemingly) random files, WITHOUT notifying the user.
-
-
-# Possible solution?
-
-One simple solution would be to use "git annex find" functionality to see who else uses the file and NOT deleting it.
-
-But this still leaves a problem:
-
-Consider the following variation of the above example and assume, that "drop" does not delete content that is still used (i.e. implementing the above solution). 
-
-    echo "TEST CONTENT" > fileA
-    cp fileA fileB
-    git annex add file{A,B}
-    git rm fileB
-    git annex drop fileA --force
-    git checkout --force
-    cat fileB
--->  cat: fileB: No such file or directory
-
-Here again, the problem is, that the user would probably (correct me if I am wrong) expect that the fileB still exists, because removing a file and checking it out again is expected to not mess with the annex contents (?). He does not know, that the "annex frop fileA" actually drop fileB's contents, because there was no additional file linking to it. It effectively performed a "git annex dropunused".
-
-> We seem to have agreed this is reasonable behavior, and a doc change was done.
-> Do feel free to suggest other doc changes.. [[done]] --[[Joey]]
diff --git a/doc/bugs/__34__git_annex_watch__34___adds_map.dot.mdwn b/doc/bugs/__34__git_annex_watch__34___adds_map.dot.mdwn
deleted file mode 100644
--- a/doc/bugs/__34__git_annex_watch__34___adds_map.dot.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-"git annex watch" will add the file generated by "git annex map", which is
-probably not intended. Shouldn’t this file be created in /tmp or
-.git/annex/ or somewhere else?
-
-> Indeed, so [[done]] --[[Joey]]
-
-    /tmp $ cd test/
-    /tmp/test $ git init
-    Initialized empty Git repository in /tmp/test/.git/
-    /tmp/test $ git annex init
-    init  ok
-    (Recording state in git...)
-    /tmp/test $ git annex watch
-    /tmp/test $ git annex map
-    map /tmp/test ok
-    
-      running: dot -Tx11 map.dot
-    
-    ok
-    /tmp/test $ ls -l
-    insgesamt 4
-    lrwxrwxrwx 1 jojo jojo 180 Jul 15 23:36 map.dot -> .git/annex/objects/P3/76/SHA256-s208--44199582b5948512ff12cf03de0b86fa1bebf09785dba2827fe52afee0afbe3d/SHA256-s208--44199582b5948512ff12cf03de0b86fa1bebf09785dba2827fe52afee0afbe3d
-    
diff --git a/doc/bugs/__34__make_test__34___fails_silently.mdwn b/doc/bugs/__34__make_test__34___fails_silently.mdwn
deleted file mode 100644
--- a/doc/bugs/__34__make_test__34___fails_silently.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-`make test` fails silently when the test program cannot be built. This happens, for example, when attempting to compile git-annex with `QuickCheck-2.4.2`.
-
-> I've made "make test" exit nonzero if the test suite cannot be built.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/__39__Cannot_write_a_repository_there__39___on_Windows.mdwn b/doc/bugs/__39__Cannot_write_a_repository_there__39___on_Windows.mdwn
deleted file mode 100644
--- a/doc/bugs/__39__Cannot_write_a_repository_there__39___on_Windows.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-When I try to create the repository with the suggested location `C:\Users\bbigras\Desktop\annex\` I get "Cannot write a repository there". I didn't see the program output any errors on the console. [screen capture](http://imgur.com/7ZUqqVQ)
-
-It works if I change the path to `C:\Users\bbigras\annex\`.
-
-### What steps will reproduce the problem?
-* run `git annex webapp`
-* click `Make Repository`
-
-### What version of git-annex are you using? On what operating system?
-[[!format sh """
-git-annex version: 5.20131213-g2893b22
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-
-git version 1.8.4.msysgit.0
-"""]]
-
-Windows 7 64-bit
-
-### Please provide any additional information below.
-
-[[!format sh """
-Launching web browser on file://C:\Users\bbigras\AppData\Local\Temp\webapp9924.html
-"""]]
-
-> It checks if the directory can be written to, and it seems that for some
-> reason Windows is preventing you from writing to your Desktop. That seems
-> really weird to me (and I have not seen that behavior). But, I can easily
-> make it check if that's the case, and fall back to the other path, so
-> have done so. [[done]] --[[Joey]]
diff --git a/doc/bugs/__91__webapp__93___pause_syncing_with_specific_repository.mdwn b/doc/bugs/__91__webapp__93___pause_syncing_with_specific_repository.mdwn
deleted file mode 100644
--- a/doc/bugs/__91__webapp__93___pause_syncing_with_specific_repository.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-[Due to some stupid issue on my and AT&T's part] one of my remote repositories is currently unreachable. I would like to tell the webapp/assistant to not attempt to sync with it, or, at least, modify this error message to be more specific (by telling me which repository is unreachable).
-
-In a red bubble it says: "Synced with rose 60justin"
-
-That verbage is the same if they all succeed. The only difference is the red instead of green. Would be nice to know exactly which machine to kick (if I didn't already know, eg I was syncing only with repositories not under my control).
-
-> Fixed alert display. Webapp has allowed pausing syncing with a repository
-> for a while. [[done]] --[[Joey]]
diff --git a/doc/bugs/__96__git_annex_fix__96___run_on_non-annexed_files_is_no-op.mdwn b/doc/bugs/__96__git_annex_fix__96___run_on_non-annexed_files_is_no-op.mdwn
deleted file mode 100644
--- a/doc/bugs/__96__git_annex_fix__96___run_on_non-annexed_files_is_no-op.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-### Please describe the problem.
-
-`git annex fix` only works on files that have been annexed, already.
-While that's a safety measure of course, an option like `--force` or similar would be nice if one is shuffling around data by hand.
-
-### What steps will reproduce the problem?
-
-Please see [[bugs/__96__git_annex_add__96___changes_mtime_if_symlinks_are_fixed_in_the_background/]] for details; I didn't want to spam exactly the same output twice.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex 4.20130709 on Debian unstable i386 and x64.
-
-> We've discussed this on IRC and there seems to be nothing more to do here.
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/__96__git_annex_sync__96___ignores_remotes.mdwn b/doc/bugs/__96__git_annex_sync__96___ignores_remotes.mdwn
deleted file mode 100644
--- a/doc/bugs/__96__git_annex_sync__96___ignores_remotes.mdwn
+++ /dev/null
@@ -1,106 +0,0 @@
-### Please describe the problem.
-
-A mere `git annex sync` does not go through the reachable remotes.
-
-### What steps will reproduce the problem?
-
-I do not know what could have put my repository in this state.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130802-g1452ac3
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-local repository version: 4
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-
-Linux dawn 3.10.3-1-ARCH #1 SMP PREEMPT Fri Jul 26 11:26:59 CEST 2013 x86_64 GNU/Linux
-
-### Please provide any additional information below.
-
-[[!format sh """
-% git annex status
-supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-supported remote types: git S3 bup directory rsync web webdav glacier hook
-repository mode: direct
-trusted repositories: 1
-	f3cb4e8f-65f1-4ded-a6a1-abef64ddcff5 -- zoidberg (sam@git-annex:/media/git-annex/Music)
-semitrusted repositories: 5
-	00000000-0000-0000-0000-000000000001 -- web
- 	063a31dc-542d-407f-a9ed-124479fa6354 -- here (dawn)
- 	22b72aa6-058b-4622-8132-27aa2d8950dc -- arrakis (sam@arrakis:~/Music)
- 	5b3a1abf-5e0b-41bc-a141-774d6236ec76 -- backup on old USB disk
- 	6affec3c-fd26-11e2-9ddd-53f02e5ca176 -- music on eeePC
-untrusted repositories: 0
-transfers in progress: none
-available local disk space: 9.83 gigabytes (+1 megabyte reserved)
-local annex keys: 3947
-local annex size: 23.51 gigabytes
-known annex keys: 3965
-known annex size: 23.56 gigabytes
-bloom filter size: 16 mebibytes (0.8% full)
-backend usage: 
-	SHA256E: 7912
-
-% git remote -v
-arrakis	arrakis:Music (fetch)
-arrakis	arrakis:Music (push)
-zoidberg	ssh://git-annex@zoidberg.rfc1149.net:2222/~/Music (fetch)
-zoidberg	ssh://git-annex@zoidberg.rfc1149.net:2222/~/Music (push)
-
-# Note how here it does not seem to sync with any remote
-% git annex sync
-(Recording state in git...)
-commit  
-ok
-
-% git annex sync zoidberg
-(Recording state in git...)
-commit  
-ok
-pull zoidberg 
-ok
-push zoidberg 
-Everything up-to-date
-ok
-
-% git annex sync arrakis
-(Recording state in git...)
-commit  
-ok
-pull arrakis 
-From arrakis:Music
-   c1a24bd..ba060b7  git-annex  -> arrakis/git-annex
-   98b9a8e..be9c146  master     -> arrakis/master
-   e0df2be..be9c146  synced/master -> arrakis/synced/master
-ok
-
-# A nameless sync with debug turned on
-% git annex sync --debug        
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","symbolic-ref","HEAD"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","refs/heads/master"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","git-annex"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..ba060b7777413ab687d64771b5d6c2b36a072335","--oneline","-n1"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..f401f2b7b67567862df7c5b8d304f52c3af43f4b","--oneline","-n1"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..feaba7c5ea5f4ca73c123e6ea44ffd6333bf383e","--oneline","-n1"]
-[2013-08-06 10:59:57 CEST] chat: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","cat-file","--batch"]
-[2013-08-06 10:59:57 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","ls-files","--stage","-z","--others","--exclude-standard","--","/home/sam/Music"]
-[2013-08-06 10:59:57 CEST] chat: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","cat-file","--batch"]
-(Recording state in git...)
-[2013-08-06 11:00:16 CEST] feed: xargs ["-0","git","--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","add","-f"]
-commit  
-[2013-08-06 11:00:16 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","commit","-m","git-annex automatic sync"]
-ok
-[2013-08-06 11:00:17 CEST] call: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--verify","-q","refs/heads/synced/master"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/master..refs/heads/synced/master","--oneline","-n1"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","git-annex"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..ba060b7777413ab687d64771b5d6c2b36a072335","--oneline","-n1"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..f401f2b7b67567862df7c5b8d304f52c3af43f4b","--oneline","-n1"]
-[2013-08-06 11:00:17 CEST] read: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","log","refs/heads/git-annex..feaba7c5ea5f4ca73c123e6ea44ffd6333bf383e","--oneline","-n1"]
-[2013-08-06 11:00:17 CEST] call: git ["--git-dir=/home/sam/Music/.git","--work-tree=/home/sam/Music","branch","-f","synced/master"]
-"""]]
-
-[[done]]
diff --git a/doc/bugs/add_range_argument_to___34__git_annex_dropunused__34___.mdwn b/doc/bugs/add_range_argument_to___34__git_annex_dropunused__34___.mdwn
deleted file mode 100644
--- a/doc/bugs/add_range_argument_to___34__git_annex_dropunused__34___.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-The command `git annex dropunused` currently takes a number, as referenced in output of last `git annex unused` command.
-
-When you want to drop all, or a range, this may be annoying, as you have to specify each number on the command line. 
-
-A range argument, such as `1-1845`, possibly combined with other argument types (Cf. many print dialogues: `1,3,5-7,9`) would be great.
-
-I work around this lack as I want to drop all unused files anyway by something like this:
-       
-    git annex unused | grep -o -P "^    [0-9]+" | xargs git annex dropunused
-
-> It's designed to be used with `seq`. There's an example in the
-> [[walkthrough|walkthrough/unused_data]], and of course multiple seq calls can be used to
-> specifiy multiple ranges. So:
-
-	git annex dropunused `seq 1 9` `seq 11 1845`
-
-> I don't see adding my own range operations to be an improvement worth
-> making; it'd arguably only be a complication. --[[Joey]] [[done]]
-
->> Actually, this did get implemented, since using seq could fall afoul 
->> of command-line length limits in extreme cases.
diff --git a/doc/bugs/add_script-friendly_output_options.mdwn b/doc/bugs/add_script-friendly_output_options.mdwn
deleted file mode 100644
--- a/doc/bugs/add_script-friendly_output_options.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-I have a need to use git-annex from a larger program. It'd be great if the information output by some of the commands that is descriptive (for example, whereis) could be sent to stdout in a machine-readable format like (preferably) JSON, or XML. That way I can simply read in the output of the command and use the data directly instead of having to parse it via regexes or other such string manipulation.
-
-This could perhaps be triggered by a --json or --xml flag to the relevant commands.
-
-> This is [[done]], --json is supported by all commands, more or less.
-> 
-> Caveats: 
-> 
->  * the version, status, and find commands produce custom output and so
->    no json. This could change for version and status; find needs to just
->    be a simple list of files, I think 
->  * The "note" fields may repeat multiple times per object with different
->    notes and are of course not machine readable, and subject to change.
->  * Output of helper commands like rsync is not diverted away, and
->    could clutter up the json output badly. Should only affect commands
->    that transfer data. And AFAICS, wget and rsync both output their
->    progress displays to stderr, so shouldn't be a problem.
-> 
-> --[[Joey]] 
diff --git a/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn b/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn
deleted file mode 100644
--- a/doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-### Please describe the problem.
-adding an rsync.net repo returns an internal server error "user error (gpg ["--quite","--trust-model","always","--gen-random","--armor","1","512"] exited 127)
-
-
-### What steps will reproduce the problem?
-add an rsync.net repo
-
-
-### What version of git-annex are you using? On what operating system?
-4.20130516-g8a26544 for OSX Mountain Lion
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; the OSX gpg was broken for a while, now fixed. --[[Joey]]
diff --git a/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn b/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn
deleted file mode 100644
--- a/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-It appears like addurl --relaxed if used incombination with --file doesn't actually relax.
-
-(I'm interested in quickly adding links to an extremely large set of files (and for a large set of revisions), and the fact that addurl takes a second or so per file makes this impossible performance-wise.)
-
-What steps will reproduce the problem? (Well, this isn't the problem per see, but it illustrates that it does checking)
-
-    $ echo foo > foo
-    $ git annex add foo
-    $ git annex addurl --relaxed http://lambda.haskell.org/platform/download/2012.4.0.0/haskell-platform-2012.4.0.0.tar.gz --file foo
-    addurl foo 
-      failed to verify url: http://lambda.haskell.org/platform/download/2012.4.0.0/haskell-platform-2012.4.0.0.tar.gz
-    failed
-    git-annex: addurl: 1 failed
-
-What version of git-annex are you using? On what operating system?
-
-Debian Sid
-
-    git-annex version: 4.20130228
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-
-> Missed the case of adding an url to an existing file. [[done]] --[[Joey]] 
diff --git a/doc/bugs/addurl_fails_on_the_internet_archive.mdwn b/doc/bugs/addurl_fails_on_the_internet_archive.mdwn
deleted file mode 100644
--- a/doc/bugs/addurl_fails_on_the_internet_archive.mdwn
+++ /dev/null
@@ -1,65 +0,0 @@
-### Please describe the problem.
-
-`addurl` doesn't support the internet archive:
-
-1. it doesn't actually accept the proper URL as a secondary source of content
-2. it doesn't parse the HTML from the video page (the "details page")
-
-### What steps will reproduce the problem?
-
-    # download eben moglen's excellent re:publica presentation from youtube
-    git annex addurl https://www.youtube.com/watch?v=sKOk4Y4inVY
-    # copy that file aside
-    cp -L re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm-bak
-    # drop it so we can try again
-    git annex drop re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-    # add the IA URL for the same video, failing
-    git annex addurl --file=re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-    # try again with --relaxed to skip some checks
-    git annex addurl --relaxed --file=re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-    # observe both files are the same size and checksum
-
-The files should look like this:
-
-[[!format txt """
-anarcat@angela:presentations$ ls -alL re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm*
--r--r--r-- 1 anarcat anarcat 419359123 oct  9 23:41 re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
--r--r--r-- 1 anarcat anarcat 419359123 oct 11 19:40 re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm-bak
-anarcat@angela:presentations$ md5sum re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm*
-7892df24a9e1c40e2587be1035728ef0  re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-7892df24a9e1c40e2587be1035728ef0  re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm-bak
-"""]]
-
-There are two separate bugs here: one is the above need to use --relaxed even though the file is the same.
-
-The second is probably simply that quvi doesn't support the internet archive, and maybe that one should be moved to a separate [[todo]]/[[wishlist]]. I was expecting this to "do the right thing" (ie. download the video):
-
-    git annex addurl http://archive.org/details/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia
-
-... but instead it downloads the HTML.
-### What version of git-annex are you using? On what operating system?
-
-my good old faithful `4.20130921-g434dc22` i compiled manually some time ago. :)
-
-This is [[done]] in git-annex version: 4.20131011-g2c0badc. Thanks!
-
-### Please provide any additional information below.
-
-[[!format sh """
-anarcat@marcos:presentations$ git annex addurl --file=re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm http://archive.org/download/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-addurl re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-  failed to verify url exists: http://archive.org/download/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-failed
-git-annex: addurl: 1 failed
-anarcat@marcos:presentations$ git annex addurl --debug --file=re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-[2013-10-09 18:26:30 EDT] call: quvi ["-v","mute","--support","http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm"]
-addurl re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm [2013-10-09 18:26:30 EDT] read: curl ["-s","--head","-L","http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm","-w","%{http_code}"]
-
-  failed to verify url exists: http://ia601009.us.archive.org/9/items/Republica2012-EbenMoglen-FreedomOfThoughtRequiresFreeMedia/re_publica_2012___Eben_Moglen___Freedom_of_Thought_Requires_Free_Media.webm
-failed
-git-annex: addurl: 1 failed
-"""]]
-
-Originally reported in [[tips/Internet_Archive_via_S3]]. --[[anarcat]]
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/allows_repository_with_the_same_name_twice.mdwn b/doc/bugs/allows_repository_with_the_same_name_twice.mdwn
deleted file mode 100644
--- a/doc/bugs/allows_repository_with_the_same_name_twice.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-What steps will reproduce the problem?
-
-Unsure. I believe:
-
-* Add a git remote
-* Mark it as dead
-* Remove the git remote, re-add with the same name
-
-What is the expected output? What do you see instead?
-
-When I do a `git annex status` I see:
-
- 	04e701b5-8a22-4391-ad74-d75dde715c7b -- bigserver
- 	6ddfda5d-0f17-45a9-b41a-2a626a823101 -- bigserver
-
-What version of git-annex are you using? On what operating system?
-
-4.20130323 on OSX and Linux
-
-Please provide any additional information below.
-
-Trying to get a file from bigserver kept on failing with the message "Try making some of these repositories available". Which led me on a wild goose chases blaming SSH keys and PATH issues.
-
-> [[done]]; not a bug --[[Joey]]
diff --git a/doc/bugs/android_cannot_get_from_5.20131221.mdwn b/doc/bugs/android_cannot_get_from_5.20131221.mdwn
deleted file mode 100644
--- a/doc/bugs/android_cannot_get_from_5.20131221.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-## Reproduce
-
- - run `git annex get --from mylinuxbox` on git-annex Android 5.20131213 or 5.20131221
- - `mylinuxbox` is running 5.20131221 standalone
-
-## Expected result
-
-The Android box gets the missing file.
-
-## Actual result
-
-    git-annex: unknown command sendkey
-
-## Workaround
-
-Run 5.20131213 on `mylinuxbox`, which does not have this problem.
-
-## Additional
-
-linux standalone 5.20131213 and 5.20131221 are both able to `get` from linux standalone 5.20131221 -- this only affects the Android version.
-
-*Edit:* On second thought, Android is not the only distinguishing factor. Apart from being Android, the box and repo having trouble have the following distinguishing factors from the ones I tried that worked:
-
- - Android
- - Direct mode
- - Remote was set up by the Assistant
-
-> [[clacke]]
-
-> There was a bug in the linux standalone tarball distributed
-> with 5.20131221 that made the `git-annex-shell` wrapper accidentially run
-> `git-annex` instead of `git-annex-shell`. Which results in 
-> this error about recvkey, which is a git-annex-shell command, not a
-> git-annex command.
-> 
-> So, the problem is not in the android build, but in the git-annex
-> installed on the server (or laptop or whatever) that the android is
-> trying to access. 
-
-> This bug is fixed in the daily builds, and I have updated the
-> tarballs for the release too, now. [[done]] --[[Joey]]
diff --git a/doc/bugs/annex-rsync-options_shell-split_carelessly.mdwn b/doc/bugs/annex-rsync-options_shell-split_carelessly.mdwn
deleted file mode 100644
--- a/doc/bugs/annex-rsync-options_shell-split_carelessly.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-with rsync, it is sometimes the case that one needs to specify ssh options -- typical examples from the rsync man page are `rsync  -e 'ssh -p 2234'`. as git-annex does the shell splitting of the arguments in `annex-rsync-options` (see [[special remotes/rsync]]) itself by looking for whitespace, these options can't be passed directly. (`annex-rsync-options = -e 'ssh -p 2234'` gets split to `["rsync", "-e", "'ssh", "-p", "2234'"]` instead of `["rsync", "-e", "ssh -p 2234"]`).
-
-git-annex should respect shell splitting rules when looking at annex-rsync-options. (i suppose there is a haskell library or module for that; in python, we have the `shlex` module for that).
-
-## workaround
-
-put this in .git/ssh and mark it as executable:
-
-    #!/bin/sh
-    exec ssh -p 2234 $@
-
-put this in your git annex config in the particular remote's section:
-
-    annex-rsync-options = -e /local/path/to/your/repo/.git/ssh
-
-(typical bug report information: observed with git-annex 3.20121127 on debian)
diff --git a/doc/bugs/annex.numcopies_not_overriden_by_--numcopies_option.mdwn b/doc/bugs/annex.numcopies_not_overriden_by_--numcopies_option.mdwn
deleted file mode 100644
--- a/doc/bugs/annex.numcopies_not_overriden_by_--numcopies_option.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-### Please describe the problem.
-Using "--numcopies=N" on the command line doesn't overrides (as advertised) the annex.numcopies variable when set via .gitattributes. 
-
-### What steps will reproduce the problem?
-
-$ echo '* annex.numcopies=2' > .gitattributes
-
-$ git annex drop --numcopies=1 somefile.txt
-
-Second line fails if only one other copy exists.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130627
-
-> I don't think this was ever handled correctly.
-> I've fixed it now. [[done]] --[[Joey]] 
diff --git a/doc/bugs/annex_add_in_annex.mdwn b/doc/bugs/annex_add_in_annex.mdwn
deleted file mode 100644
--- a/doc/bugs/annex_add_in_annex.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-I accidentally annexed some files in the .git-annex directory and it cause git-annex/git to be very unhappy when i pulled the repo to somewhere else. It might be worth teaching git-annex to disallow annex'ing of files inside the .git-annex/.git directories.
-
-> There is a guard against `git annex add .git-annex/foo`, but it doesn't
-> notice `cd .git-annex; git annex add foo`. --[[Joey]]
-
-> Now fixed, by removing the .git-annex directory. [[done]] --[[Joey]] 
diff --git a/doc/bugs/annex_get_over_SSH_is_very_slow.mdwn b/doc/bugs/annex_get_over_SSH_is_very_slow.mdwn
deleted file mode 100644
--- a/doc/bugs/annex_get_over_SSH_is_very_slow.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-### Please describe the problem.
-Attempting to populate one annex from another over an SSH connection is very slow.
-
-### What steps will reproduce the problem?
-1. Create an annex on Linux
-2. Clone annex to Windows system
-3. Set up sshd on Linux system, access keys, etc.
-4. "git annex get ."
-5. Checking if an individual file exists takes a few seconds, and downloading it takes a few seconds. on a 100Mbps LAN, transfers at an average of 7Mbps.
-6. By comparison operating over a working HTTP connection transfers between 20~40 Mbps.
-
-
-### What version of git-annex are you using? On what operating system?
-Windows 7: 4.20140627-g8a36ec5 (from the git-annex download page)
-
-Debian Linux: 3.20120629 (from the package manager)
-
-> The problem is that git-annex is designed to be used with ssh connection
-> caching. However, I have not gotten ssh connection caching to work on 
-> Windows. I did try getting this to work with IIRC, cygwin's ssh, but
-> it seems that the Unix sockets it expects to use with `-o ControlMaster`
-> don't work, or it's not been ported to use the Windows equivilant.
->
-> It's not practical to make git-annex reuse a single ssh connection
-> itself, due to the way rsync is run over ssh.
-> 
-> Since this is basically a bug in ssh for Windows, and not in git-annex
-> per se, I am going to close this bug report. However, I do mention
-> this in [[todo/windows_support]].
-> 
-> [[done]] --[[Joey]]
-
-[[!meta title="No ssh connection caching support on Windows"]]
diff --git a/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn b/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn
deleted file mode 100644
--- a/doc/bugs/annex_seems_to_ignore_core.bare_setting.mdwn
+++ /dev/null
@@ -1,45 +0,0 @@
-### Please describe the problem.
-I have a transfer repository on a thumbdrive with a FAT file system mounted. It has been working very well for almost a year.
-However, the current annex version overrides the core.bare setting with 'false' and tries to checkout the work tree on my thumbdrive (e.g. on a 'git annex status').
-
-### What version of git-annex are you using? On what operating system?
-
-Broken git-annex versions:
-
- * 5.20131130-gc25be33
- * 5.20131118-gc7e5cde
-
-Working version:
-
- * 4.20131101-gf59a6d1
-
-OS is Linux.
-
-### Please provide any additional information below.
-
-[[!format sh """
-$> git config --list
-core.repositoryformatversion=0
-core.filemode=false
-core.bare=true
-core.symlinks=false
-core.ignorecase=true
-annex.uuid=3fb63b01-40cf-4613-b171-d6cba04028af
-annex.version=4
-annex.crippledfilesystem=true
-annex.direct=true
-"""]]
-
-[[!format sh """
-$> git annex status -d
-[2013-12-05 15:01:30 CET] read: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","symbolic-ref","HEAD"]
-[2013-12-05 15:01:30 CET] read: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","show-ref","--hash","refs/heads/master"]
-[2013-12-05 15:01:30 CET] call: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","update-ref","refs/heads/annex/direct/master","eb688442ea29660e9bc604434a77821b9c0349ad"]
-[2013-12-05 15:01:30 CET] call: git ["--git-dir=/media/transfer/annex-media.git","--work-tree=/media/transfer","-c","core.bare=false","checkout","-q","-B","annex/direct/master"]
-...
-git-annex: git [Param "checkout",Param "-q",Param "-B",Param "annex/direct/master"] failed
-"""]]
-
-> If I understand the followup comment corretcly, it confirms my hypothesis
-> that this is about the bug that has since been fixed. So, [[done]].
-> --[[Joey]] 
diff --git a/doc/bugs/another_build_error_in_assistant.mdwn b/doc/bugs/another_build_error_in_assistant.mdwn
deleted file mode 100644
--- a/doc/bugs/another_build_error_in_assistant.mdwn
+++ /dev/null
@@ -1,79 +0,0 @@
-What steps will reproduce the problem?
-Just trying to install git-annex last release (20121120) from cabal or from bundled sources
-
-What is the expected output? What do you see instead?
-Build stop like this :
-(doing cabal install or build from the bundle)
-...
-[161 of 284] Compiling Assistant.Alert  ( Assistant/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert.o )
-[162 of 284] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o )
-[163 of 284] Compiling Assistant.Monad  ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o )
-
-Assistant/Monad.hs:86:16:
-    Couldn't match expected type `Assistant a'
-                with actual type `Reader AssistantData a'
-    Expected type: (AssistantData -> a) -> Assistant a
-      Actual type: (AssistantData -> a) -> Reader AssistantData a
-    In the expression: reader
-    In an equation for `getAssistant': getAssistant = reader
-
-Assistant/Monad.hs:93:15:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: st <- reader threadState
-    In the expression:
-      do { st <- reader threadState;
-           liftIO $ runThreadState st a }
-
-Assistant/Monad.hs:99:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           liftIO $ io $ runAssistant d a }
-
-Assistant/Monad.hs:105:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ runAssistant d a }
-
-Assistant/Monad.hs:110:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ \ v -> runAssistant d $ a v }
-
-Assistant/Monad.hs:115:14:
-    Couldn't match expected type `Assistant t0'
-                with actual type `Reader r0 a0'
-    In the return type of a call of `reader'
-    In a stmt of a 'do' block: d <- reader id
-    In the expression:
-      do { d <- reader id;
-           return $ \ v1 v2 -> runAssistant d (a v1 v2) }
-
-Assistant/Monad.hs:120:12:
-    Couldn't match expected type `Assistant a0'
-                with actual type `Reader r0 a1'
-    In the return type of a call of `reader'
-    In the first argument of `(>>=)', namely `reader v'
-    In the expression: reader v >>= liftIO . io
-
-
-
-
-What version of git-annex are you using? On what operating system?
-- version 3.20121112
-- Ubuntu 12.04 LTS, 64 bits
-
-> Dup of [[3.20121112_build_fails_on_Ubuntu_12.04]]. --[[Joey]] [[done]]
diff --git a/doc/bugs/archiving_git_repositories.mdwn b/doc/bugs/archiving_git_repositories.mdwn
deleted file mode 100644
--- a/doc/bugs/archiving_git_repositories.mdwn
+++ /dev/null
@@ -1,1 +0,0 @@
-In a true dropbox-like fashion, I tried to import my entire homefolder into the git-annex assistant. However, it seems that git-annex breaks on the several git repositories I've got checked out in my "Projects" folder. Is this a possible use case, or should I look at other tools to perform this with?
diff --git a/doc/bugs/assistant_always_assumes_port_22__63__.mdwn b/doc/bugs/assistant_always_assumes_port_22__63__.mdwn
deleted file mode 100644
--- a/doc/bugs/assistant_always_assumes_port_22__63__.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-### Please describe the problem.
-git-annex assistant always assumes port 22 (I use a different port), despite my editing .ssh/config to correct this.
-
-Also, assistant doesn't give me a port option like it did in the intro screencast.
-
-### What steps will reproduce the problem?
-Using my version of git-annex, I assume.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 3.20121112ubuntu2
-
-xubuntu 13.04
-
-### Please provide any additional information below.
-I don't see any .git/annex/daemon.log.
-
-I click the "remote server" link, sign in just fine [note below]. I click "Use a git repository on the server" (but "Use an encrypted rsync repository on the server" also does this), and eventually I get an error:
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-Failed to make repository
-
-Something went wrong setting up the repository on the remote server.
-
-Transcript: ssh: connect to host <host> port 22: Connection timed out 
-
-# End of transcript or log.
-"""]]
-
-> Your version of git-annex is too old. 
-> Support for setting the port was added in version 3.20121211 --
-> about a month after the version you have installed
-> (ah, the period where everything was 11 and 12.. I don't miss it!)
-> 
-> I don't recommend using such an old version of the assistant,
-> *massive* numbers of bugs have been fixed since then. Upgrade to 
-> the Ubuntu PPA. [[done]] --[[Joey]]
-
-note:  if I use "git-annex webapp" in the terminal it works fine; if I use xfce's "internet -> git annex" menu, it errors trying to use ssh_askpass, which I don't have. I'm going to make a new thread about this.
diff --git a/doc/bugs/assistant_does_not_allow_adding_an_existing_repo.mdwn b/doc/bugs/assistant_does_not_allow_adding_an_existing_repo.mdwn
--- a/doc/bugs/assistant_does_not_allow_adding_an_existing_repo.mdwn
+++ b/doc/bugs/assistant_does_not_allow_adding_an_existing_repo.mdwn
@@ -6,3 +6,5 @@
 [[!meta title="assistant does not interoperate with gitolite when adding a repository"]]
 
 [2013-09-13 17:00:55 CEST] chat: ssh ["-p","22","git@example.org","sh -c 'mkdir -p '\"'\"'my-annex.git'\"'\"'&&cd '\"'\"'my-annex.git'\"'\"'&&if [ ! -d .git ]; then git init --bare --shared; fi&&git annex init'"]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/assistant_does_not_list_remote___39__origin__39__.mdwn b/doc/bugs/assistant_does_not_list_remote___39__origin__39__.mdwn
deleted file mode 100644
--- a/doc/bugs/assistant_does_not_list_remote___39__origin__39__.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-What steps will reproduce the problem?
-
-1. create a git annex repo on a server
-2. clone it on workstation
-3. open the webapp on the workstation
-
-
-What is the expected output? What do you see instead?
-
-The webapp should show the 'origin' remote and the assistant should ensure syncing.
-Instead the remote does not show up in the webapp.
-I checked with `git annex status` and the remote is there.
-
-What version of git-annex are you using? On what operating system?
-
-3.20130207 on latest Ubuntu
-
-Please provide any additional information below.
-
-I tried both with direct and indirect mode for the local annex repo.
-
-I am sorry if I am missing the point. I checked the docs, however without much success.
-
-[[!tag /design/assistant]]
-
-[[done]]
diff --git a/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add.mdwn b/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add.mdwn
deleted file mode 100644
--- a/doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-What steps will reproduce the problem?
-
-Unable to reproduce as it seems to happen randomly, to very few files (4/250).
-
-What is the expected output? What do you see instead?
-
-I expect to see the assistant warn if it attempts to add a file which fails to add to the annex.
-Instead, I see no output from the assistant, but lines like this in the log.
-
-daemon.log.2:add Indie Game Stand/Deadly 30/Deadly30_MAC.zip (checksum...) failed
-daemon.log.2:add Indie Game Stand/Wyv and Keep/xnafx40_redist.msi (checksum...) failed
-daemon.log.2:add Indie Game Stand/Blueberry Garden/Blueberry_Garden_1.1.zip (checksum...) failed
-daemon.log.2:add Indie Game Stand/Flatspace Bundle/fsmusicpack3setup.exe (checksum...) failed
-
-There is no reason given for the failure in the log file. The assistant also never tries to add them again in normal running (but did add them when it was started again after a reboot).
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130314
-OS: Arch Linux
-
-Please provide any additional information below.
-
-The assistant in this case is being used as nothing more than a way for me to see which files have been added (--verbose, --foreground and --debug with 'watch' outputs nothing..). No remotes or anything like that.
-
-> I have made the assistant re-queue any file that it fails to add,
-> so it will retry it later. Typically within a few seconds. [[done]]
-> 
-> I have only been able to think of one scenario in which this could
-> happen. It's pretty unusual:
-> 
-> * Something writes to a file, and closes it.
-> * Assistant sees file has no writers, and locks it down in preparation
->   to add it.
-> * Something then re-opens the file to write to it some more.
->   Note that it would seem to need to bypass permissions that prevent
->   the file from being written to in order to do this. It makes a change
->   to the file.
-> * Assistant is checksumming file, reaches end, and detects it has been
->   tampered with and gives up.
-> 
-> I would still like more information about circumstances that
-> cause this to happen, because while a possible scenario, the 
-> above is too weird to believe anyone could run into it.
-> 
-> --[[Joey]] 
diff --git a/doc/bugs/assistant_doesn__39__t_sync_empty_directories.mdwn b/doc/bugs/assistant_doesn__39__t_sync_empty_directories.mdwn
--- a/doc/bugs/assistant_doesn__39__t_sync_empty_directories.mdwn
+++ b/doc/bugs/assistant_doesn__39__t_sync_empty_directories.mdwn
@@ -28,3 +28,5 @@
 Release:	12.04
 Codename:	precise
 """]]
+
+> [[confirmed]] (but may be out of scope) --[[Joey]] 
diff --git a/doc/bugs/assistant_doesn__39__t_sync_file_permissions.mdwn b/doc/bugs/assistant_doesn__39__t_sync_file_permissions.mdwn
--- a/doc/bugs/assistant_doesn__39__t_sync_file_permissions.mdwn
+++ b/doc/bugs/assistant_doesn__39__t_sync_file_permissions.mdwn
@@ -43,3 +43,5 @@
 Release:	12.04
 Codename:	precise
 """]]
+
+> [[confirmed]] (but may be out of scope) --[[Joey]] 
diff --git a/doc/bugs/assistant_fails_to_sync_in_preferred_content_mode_manual.mdwn b/doc/bugs/assistant_fails_to_sync_in_preferred_content_mode_manual.mdwn
deleted file mode 100644
--- a/doc/bugs/assistant_fails_to_sync_in_preferred_content_mode_manual.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-Thanks for git annex!
-
-### Please describe the problem.
-
-I've set up two computers A, B to sync to (and each other through) a remote server S. If I add files to A, it syncs with S. But B is not getting synced unless I run 'git annex sync' or restart the daemon in the webapp, i.e. I don't see these files on B at all, not even as broken symlinks. 
-The same happens if I manually copy files from A to S. B is not updating the copy count in 'git annex whereis' until I manually sync on B.
-
-It would be great if B could automatically sync when S is changed, either file locations or contents.
-
-### What steps will reproduce the problem?
-
-Both computers' local repos were setup with annex assistant, and switched into indirect mode. The server contains git repo and file data. All systems, computers and server are set to manual in the preferred content mode.
-
-### What version of git-annex are you using? On what operating system?
-
-A is running Debian testing with git-annex 4.20130827, B and S are running Debian stable with the backports version of git-annex 4.20130815~bpo70+1. A and S are 64 bit, B is 32 bit. All are up to date.
-
-### Please provide any additional information below.
-
-I tried this setup before with direct mode and different preferred content settings (A, B as client, S as backup or archive), and syncing of git and file data was working then.
-
-Despite being able to run 'sync' it is at least inconvenient to not have automatically updated file location information when I run the assistant. (I could then just run without it, but I had it happen to me that I setup a local repo w/o assistant, and when I ran assistant, expecting it would tell me "there are no local repos, would you like to create one?" it somehow automatically found the manually created one and started copying files. But that's another problem.)
-
-> [[done]] unless my diagnosis is wrong. --[[Joey]] 
diff --git a/doc/bugs/assistant_locked_my_files.mdwn b/doc/bugs/assistant_locked_my_files.mdwn
--- a/doc/bugs/assistant_locked_my_files.mdwn
+++ b/doc/bugs/assistant_locked_my_files.mdwn
@@ -26,3 +26,5 @@
 """]]
 
 ### Please provide any additional information below.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn b/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn
deleted file mode 100644
--- a/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-
-Internal Server Error
-
-internal error, /home/michele/assistannex is not absolute
-
-### What steps will reproduce the problem?
-
-create a transfer repository on a usb drive (from windows) merge it with a
-repository on linux, try to merge it on another target windows machine
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version 5.20140128-g29aea74
-
-> I'm not able to follow the steps to reproduce this, but I think 
-> I see what the problem is. `isAbsolute` on windows does not think that
-> unix-style path is absolute. Such a path can appear in a remote of a git
-> repository, particularly if part of that repository was set up on a
-> non-Windows system. While the remote won't be usable on Windows with a
-> path like that, git-annex should not choke on the path either.
-> I have fixed the code to deal with this.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/authentication_to_rsync.net_fails.mdwn b/doc/bugs/authentication_to_rsync.net_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/authentication_to_rsync.net_fails.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-### Please describe the problem.
-
-Used assistant to "Add a cloud repository".  Supplied hostname, username in webapp. Directory "annex" port 22.
-Clicked on "Use this rsync.net repository" and got
-
-**********************
-ssh_askpass: exec(/usr/bin/ssh-askpass): No such file or directory
-ssh_askpass: exec(/usr/bin/ssh-askpass): No such file or directory
-ssh_askpass: exec(/usr/bin/ssh-askpass): No such file or directory
-Received disconnect from 69.43.165.7: 2: Too many authentication failures for 2440
-**********************
-
-### What steps will reproduce the problem?
-See above?  A simple "ssh user@host.rsync.net ls /usr/bin" reveals that indeed no ssh-askpass is available in that namespace.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130521 on debian linux 7.1.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-That log is empty.
-# End of transcript or log.
-"""]]
-
-> I added ssh-askpass as a recommends, so I suppose
-> I can close this. [[done]] --[[Joey]] 
diff --git a/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn b/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn
deleted file mode 100644
--- a/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn
+++ /dev/null
@@ -1,72 +0,0 @@
-foo is a local repo, bar is a bare remote.
-
-I upgraded foo's git-annex to 0.20110325 and upgraded a local repo backend
-to version 2. I then ran `git annex copy . --to bar` and checked the
-remote. This created WORM:SHA512--123123 files in annex/objects.
-Understandable but unwanted. So I upgraded git-annex on bar's machine, as
-well.
-
-    % git annex copy . --to bar
-    copy quux (checking bar) git-annex-shell: Repository version 1 is not supported. Upgrade this repository: git-annex upgrade (to bar)
-    git-annex-shell: Repository version 1 is not supported. Upgrade this repository: git-annex upgrade
-    rsync: connection unexpectedly closed (0 bytes received so far) [sender]
-    rsync error: error in rsync protocol data stream (code 12) at io.c(601) [sender=3.0.7]
-    
-      rsync failed -- run git annex again to resume file transfer
-    failed
-
-Running `git annex upgrade` on bar's machine I get:
-
-    % git annex upgrade
-    upgrade  (v1 to v2) (moving content...) git-annex: Prelude.read: no parse
-
-Again, bar is a bare repo.
-Running the copy job again, I am still getting the same error as above (as expected). Partial contents of annex/objects on bar:
-
-    [...]
-    SHA512:123
-    WORM:SHA512--234
-    [...]
-
-
--- RichiH
-
-> Upgrading bare repos to v2 generally works fine, so I actually need
-> to see the full content of annex/, not a fragment, in order to debug this.
-> (Filename contents I don't need to see.) Feel free to email me the details at
-> joey@kitenet.net if you don't want to post them here. --[[Joey]]
-
->> Sent. -- RichiH
-
->>> Ok, I'm going to go work on my reading comprehension. I see now
->>> that you
->>> explained the problem pretty well. The problem is caused by these
->>> few weird v1 mixed with v2 keys in the annex.
->>> Ones like "annex/objects/WORM:SHA512--$sha512".
->>>
->>> That's a v1 key, but a corrupt form of the key; it's missing the 
->>> size and mtime fields that all WORM keys have in v1. And 
->>> the filename is itself a key, a v2 SHA512 key. These were
->>> created when you did the `git annex copy to the v1 bare repo.
->>> In v2, git-annex-shell takes a full key object, while in v1,
->>> it takes a key name and a backend name. This incompatability
->>> leads to the weird behavior seen.
->>>
->>> I had suggested you delete data.. don't. On second thought,
->>> you shouldn't delete anything. I'll simply make the v2 upgrade
->>> detect and work around this bug.
->>> --[[Joey]]
-
->>>> This should be fixed in current git. The scambled keys will be 
->>>> fixed up on upgrade. Thanks for your patience! [[done]] --[[Joey]]
-
->>>>> I should stop reading your answers via git; by the time I got to
->>>>> "second thoughts", I had already deleted the files & directories
->>>>> in question, upgraded the bare repo and was busy uploading from my
->>>>> local repo. I agree that taking care of this in the upgrade code
->>>>> is the cleanest approach, by the way.
->>>>> No need to thank me for my patience; thank you for your quickness!
->>>>> RichiH
->>>>> 
->>>>> PS: If I get a handle on the mtime issue in the SHA backend, git
->>>>> annex will be pretty much perfect :)
diff --git a/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa.mdwn b/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa.mdwn
deleted file mode 100644
--- a/doc/bugs/bad_comment_in_ssh_public_key_ssh-rsa.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-What steps will reproduce the problem?
-I was trying to pair two repositories on 2 different computers, 
-but my public key had this email address at the end:
-bachir@Bachirs-iMac.local
-
-What is the expected output? What do you see instead?
-I was expecting successful pairing.
-I got:
-bad comment in ssh public key ssh-rsa
-AAB3....SAK
-bachir@Bachirs-iMac.local
-
-What version of git-annex are you using? On what operating system?
-I am using the package git-annex  Version: 3.20120925 
-on MacOSX Lion
-
-Please provide any additional information below.
-I've checked your code, seems to complain about the dash '-' in the email address
-bachir@Bachirs-iMac.local
-
-> This bug is already fixed, the fix is in the 
-> 3.20121001 release. [[done]] --[[Joey]] 
diff --git a/doc/bugs/bare_git_repos.mdwn b/doc/bugs/bare_git_repos.mdwn
deleted file mode 100644
--- a/doc/bugs/bare_git_repos.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-It would be nice if git-annex could be used in bare git repos.
-However, that is not currently supported. Problems include:
-
-* git-annex often does not read a git repo's config before touching it,
-  so it doesn't know if the repo is bare or not
-  (reading the config when operating on ssh repos would be a pain and SLOW;
-  I had some of that code in as of 1aa19422ac8748eeff219ac4f46df166dae783c5,
-  but ripped it all out)
-* .. which results in creating `.git/annex` in a bare repo, which mightily
-  confuses git (so it will complain that the bare repo is not
-  a git repo at all!)
-* `.git-annex/` needs to have state recorded to it and committed, and that
-  is not possible with a bare repo. (If [[todo/branching]] were done,
-  that might be fixed.) (now fixed)
-
-----
-
-Update: Now that git-annex-shell is used for accessing remote repos,
-it would be possible to add smarts about bare repos there, and avoid
-some of the above problems. Probably only the state recording problem
-remains.
-
-A possible other approach to the state recording repo is to not
-record state changes on the remote in that case. Git-annex already
-records remote state changes locally whenever it modifies the state of a
-remote. --[[Joey]]
-
-> And... [[done]]! See [[/bare_repositories]] for current status
-> and gotchas. --[[Joey]] 
diff --git a/doc/bugs/bug_system_updates_when___34__done__34__.mdwn b/doc/bugs/bug_system_updates_when___34__done__34__.mdwn
deleted file mode 100644
--- a/doc/bugs/bug_system_updates_when___34__done__34__.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-### Please describe the problem.
-
-In lieu of a better place to ask/report this.  Is it possible to have an email sent when bugs are moved into another category?  I get emails on comments but not much when the bugs are moved elsewhere - they just seem to disappear.
-
-### What steps will reproduce the problem?
-
-
-### What version of git-annex are you using? On what operating system?
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> That's because I add a [[done]] to close bugs, not a comment and you are
-> only subscribed to comments. It's possible to subscribe to changes to
-> pages, but ikiwiki does not make this easy. You should file a bug on
-> ikiwiki. --[[Joey]]
diff --git a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn b/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
deleted file mode 100644
--- a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-the build is currently borked with
-
-<pre>
-ghc -O2 -threaded -Wall -ignore-package monads-fd -ignore-package monads-tf -outputdir tmp -IUtility -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING -DWITH_KQUEUE -DOSX --make git-annex -o tmp/git-annex Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
-Assistant/Install.hs:19:8:
-Could not find module `Utility'
-Use -v to see a list of the files searched for.
-make: *** [git-annex] Error 1
-</pre>
-
-This was first introduced at commit e88e3ba
-
-> oops, -DOSX is not a good idea. [[done]] --[[Joey]] 
diff --git a/doc/bugs/build_issue_with_latest_release_0.20110522-1-gde817ba.mdwn b/doc/bugs/build_issue_with_latest_release_0.20110522-1-gde817ba.mdwn
deleted file mode 100644
--- a/doc/bugs/build_issue_with_latest_release_0.20110522-1-gde817ba.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-A recent checkout of git-annex fails to build for me (I've installed the new dependancies as well)
-
-<pre>
-[70 of 81] Compiling Command.DropUnused ( Command/DropUnused.hs, Command/DropUnused.o )
-[71 of 81] Compiling Command.Status   ( Command/Status.hs, Command/Status.o )
-
-Command/Status.hs:133:37: Not in scope: `swap'
-make: *** [git-annex] Error 1
-</pre>
-
-it fails on OSX 10.6.x with ghc 6.12.3 and a corresponding haskell-platform install. I ran a bisect and found that commit 75a3f5027f74565d909fb940893636d081d9872a seems to have broken git-annex for me, reverting the commit allows me to build git-annex, I have not run the tests to verify everything is working correctly though.
-
-> Probably `swap` appeared only in a newer GHC. I've reverted to avoid a
-> versioned build dependency. [[done]] --[[Joey]]
diff --git a/doc/bugs/build_problem_on_OSX.mdwn b/doc/bugs/build_problem_on_OSX.mdwn
deleted file mode 100644
--- a/doc/bugs/build_problem_on_OSX.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-I just squelched a bunch of build issues (to do with dependancies) on my autobuilder for OSX, this is currently happening
-
-<pre>
-install -d tmp
-ghc -O2 -Wall -outputdir tmp -IUtility  -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS -DWITH_KQUEUE -threaded --make git-annex -o tmp/git-annex Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
-
-Assistant/Threads/NetWatcher.hs:29:0:
-     warning: #warning Building without dbus support; will poll for network connection changes
-
-Assistant/Threads/MountWatcher.hs:36:0:
-     warning: #warning Building without dbus support; will use mtab polling
-[ 29 of 259] Compiling Utility.OSX      ( Utility/OSX.hs, tmp/Utility/OSX.o )
-
-Utility/OSX.hs:22:17: Not in scope: `myHomeDir'
-make: *** [git-annex] Error 1
-</pre>
-
-> Someone else reported that too; I fixed it. [[done]] --[[Joey]] 
diff --git a/doc/bugs/building_on_lenny.mdwn b/doc/bugs/building_on_lenny.mdwn
deleted file mode 100644
--- a/doc/bugs/building_on_lenny.mdwn
+++ /dev/null
@@ -1,80 +0,0 @@
-hi,
-
-I am trying to build git annex on lenny.
-
-I checked out the latest from git c88d4939453845efee04da811d64aa41046f9c11,
-installed all the packages (some from backports) as required by dpkg-buildpackage
-
-Then I get this:
-
-	...
-	mkdir -p build
-	ghc -odir build -hidir build --make git-annex
-	[ 1 of 19] Compiling Utility          ( Utility.hs, build/Utility.o )
-	[ 2 of 19] Compiling GitRepo          ( GitRepo.hs, build/GitRepo.o )
-	[ 3 of 19] Compiling GitQueue         ( GitQueue.hs, build/GitQueue.o )
-	[ 4 of 19] Compiling TypeInternals    ( TypeInternals.hs, build/TypeInternals.o )
-	[ 5 of 19] Compiling Types            ( Types.hs, build/Types.o )
-	[ 6 of 19] Compiling Annex            ( Annex.hs, build/Annex.o )
-	[ 7 of 19] Compiling Locations        ( Locations.hs, build/Locations.o )
-	[ 8 of 19] Compiling UUID             ( UUID.hs, build/UUID.o )
-	[ 9 of 19] Compiling LocationLog      ( LocationLog.hs, build/LocationLog.o )
-	[10 of 19] Compiling Core             ( Core.hs, build/Core.o )
-	[11 of 19] Compiling Backend.URL      ( Backend/URL.hs, build/Backend/URL.o )
-	[12 of 19] Compiling Backend          ( Backend.hs, build/Backend.o )
-
-	Backend.hs:114:50:
-	    Not in scope: type constructor or class `SomeException'
-	make[1]: *** [git-annex] Error 1
-	make[1]: Leaving directory `/home/cstamas/tmp/git-annex'
-	dh_auto_build: make -j1 returned exit code 2
-	make: *** [build] Error 2
-	dpkg-buildpackage: failure: debian/rules build gave error exit status 2
-
-I will try to check the mentioned file for error, but I do not know how to program in haskell.
-
-Thanks for your help! --[[cstamas]]
-
-> Newer versions of ghc changed their exception handling types, and
-> I coded git-annex to use the new style and not the old. gch6 6.12 will
-> work. I do not think there is a backport available though. --[[Joey]]
->
-> Ok, found and deployed a workaround. It is not tested. Let me know how it
-> works for you. --[[Joey]]
-
->> I did a git pull and now I get:
-
-	mkdir -p build
-	ghc -cpp -odir build -hidir build --make git-annex
-	[ 1 of 20] Compiling Portability      ( Portability.hs, build/Portability.o )
-
-	Portability.hs:13:21:
-	    Not in scope: type constructor or class `Exception'
-	make[1]: *** [git-annex] Error 1
-	make[1]: Leaving directory `/home/cstamas/tmp/git-annex'
-	dh_auto_build: make -j1 returned exit code 2
-	make: *** [build] Error 2
-	dpkg-buildpackage: failure: debian/rules build gave error exit status 2
-
->> --[[cstamas]]
-
->>> Ok well, I'm not going to try to reimplement all of
->>> Control.Exception.Extensible so I've made it use it. You will have to
->>> figure out how to install that library yourself though, I don't know
->>> how to use cabal with such an old ghc. Library is here:
->>> <http://hackage.haskell.org/package/extensible-exceptions> 
->>> and I asked how to get it on stable here:
->>> <http://ask.debian.net/questions/how-to-get-haskell-extensible-extceptions-on-stable> --[[Joey]] 
-
->>>> I made some effort with cabal on lenny. I can install (and I did it) cabal
->>>> from squeeze as dependencies are ok. Then I installed extensible
->>>> exceptions, but it places it in some local dir that git-annex's installer
->>>> (or ghc itself) does not know about.
->>>>
->>>> Later I realized that *only* for the compilation ghc6 and its friends are
->>>> needed. So I built the package on my other machine running squeeze. Then
->>>> resulting deb packages cleanly installs on lenny
->>>> 
->>>> For me this is OK. Thanks! --[[cstamas]]
-
-[[done]]
diff --git a/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn b/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn
deleted file mode 100644
--- a/doc/bugs/bup_initremote_failed_with_localhost_+_username.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-### Please describe the problem.
-Attempted to create a bup remote on the current system via ssh. It appears to have created the bup remote fine, but fails when sshing to it and does not add the remote.
-This is a normal indirect annex (currently containing a single test jpg in its root)
-I'm presuming the error is "(storing uuid...) sh: 1: cd: can't cd to /~/archie" 
-
-
-### What steps will reproduce the problem?
-git annex initremote bup type=bup encryption=none buprepo=sshservername:path
-
-I've tried using .ssh/config to remove the username from the servername passed to bup repo and it still fails.
-
-### What version of git-annex are you using? On what operating system?
-[[!format sh """
->git-annex version
-git-annex version: 4.20130615-g29d5bb9
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-"""]]
-debian wheezy i686
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-> git annex initremote bup type=bup encryption=none buprepo=bup@localhost:archie
-initremote bup (bup init...)
-Reinitialized existing Git repository in /media/backup/home/archie/.bup/
-Initialized empty Git repository in /media/backup/bup/archie/
-(storing uuid...) sh: 1: cd: can't cd to /~/archie
-git-annex: ssh failed
-
-> ssh bup@localhost
-Last login: Mon Jun 17 10:35:45 2013 from localhost
-$ ls
-archie
-$ cd archie
-$ ls
-branches  config  description  HEAD  hooks  info  objects  refs
-
-
-# End of transcript or log.
-"""]]
-
-> applied patchm, [[done]] --[[Joey]]
diff --git a/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn b/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn
deleted file mode 100644
--- a/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-Seems the last few commits have borked 'cabal configure' on OSX with the following error message
-
-<pre>
-[jtang@laplace git-annex (master)]$ cabal configure 
-Resolving dependencies...
-
-Build/InstallDesktopFile.hs:19:8:
-    Could not find module `Assistant.OSX'
-    Use -v to see a list of the files searched for.
-</pre>
-
-Looks like a missing module.
-
-> Was broken everywhere really, so I fixed it. [[done]] --[[Joey]] 
diff --git a/doc/bugs/cabal_install_fails_to_install_manpage.mdwn b/doc/bugs/cabal_install_fails_to_install_manpage.mdwn
deleted file mode 100644
--- a/doc/bugs/cabal_install_fails_to_install_manpage.mdwn
+++ /dev/null
@@ -1,43 +0,0 @@
-### Please describe the problem.
-
-The git-annex manual page is not installed when using [[install/cabal]] to install git-annex.
-
-### What steps will reproduce the problem?
-
-Follow [[install/cabal]] with `--bin-dir=/usr/local` and try `man git-annex`.
-
-I was expecting the manpage to be installed in `/usr/local/share/man`.
-
-### What version of git-annex are you using? On what operating system?
-
-git annex from a recent git build (4.20130909-g7f079d6) in Debian wheezy.
-
-### Please provide any additional information below.
-
-<del>This could be just a documentation problem...</del> Actually, the manpage can be read directly from the source tree in `doc/git-annex.mdwn`, but I still think it should be installed, for [[!wikipedia POLA]]'s sake. --[[anarcat]]
-
-I figured it out - that stuff is in the makefile, I updated [[install/cabal]] accordingly, so <del>done</del> - not done just yet. --[[anarcat]]
-
-> Doesn't seem right to me; Setup.hs has some stuff to do with
-> installing man pages. This does currently require that they 
-> are distributed in pre-built form in the .tar.gz on hackage, 
-> which I've just checked and they are.
-> 
-> Perhaps cabal put the man pages somewhere else? After all, you 
-> apparently did not set --datadir --[[Joey]] 
-
-> > True, I didn't - the docs didn't say to. ;) But really, it's one of two things, either Setup.hs can install manpages, and then the Makefile shouldn't install it, or we should update documentation to use the makefile only. I'll try this again next time I reinstall through cabal i guess... -- [[anarcat]]a
-
->>> The default location cabal installs man pages to is
->>> `~/.cabal/share/man/man1`. That is insane, but it is not as
->>> insane as not installing programs into PATH, which is why
->>> the documentation tells how to set --bindir to fix that particular
->>> cabal insanity. (Also, many systems don't have a good per-user
->>> man directory anyway.)
->>>
->>> `make install` does not use `cabal install` because as noted, cabal
->>> install is thurougly bat shit crazy. Not all systems that have
->>> cabal have make, which is why the cabal documentation is the way it is.
->>> --[[Joey]]
-
-[[done]]
diff --git a/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn b/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn
deleted file mode 100644
--- a/doc/bugs/can__39__t_annex_get_from_annex_in_direct_mode.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-When trying to annex get *from* an annex on a Windows machine, over HTTP, annex get fails with 404 errors.
-
-### What steps will reproduce the problem?
-1. Create an annex on a Windows and Linux machine.
-2. annex add some content on Windows repository.
-3. Configure Windows repository for HTTP access
-4. on Linux machine, fetch updates. this succeeds.
-5. attempt to "annex get <new files>"
-6. requests for files of the format ".git/annex/objects/<3-char-hash>/<3-char-hash>/SHA<filehash>.<extension>" fail with 404 errors. the annex get fails.
-
-
-### What version of git-annex are you using? On what operating system?
-Windows 7: 4.20140627-g8a36ec5 (from the git-annex download page)
-
-Debian Linux: 3.20120629 (from the package manager)
-
-### Please provide any additional information below.
-there is no <filehash>.<extension> file in the relevant directories, there are only .map and .cache files. The Windows annex is in direct mode, and the Linux annex fails to annex get from this correctly.
-
-[[!meta title="can't use a direct mode repository as a http remote"]]
-
-> [[done]]; unsupported configuration. --[[Joey]] 
diff --git a/doc/bugs/can__39__t_drop_unused_files_that_never_were_added.mdwn b/doc/bugs/can__39__t_drop_unused_files_that_never_were_added.mdwn
deleted file mode 100644
--- a/doc/bugs/can__39__t_drop_unused_files_that_never_were_added.mdwn
+++ /dev/null
@@ -1,86 +0,0 @@
-### Please describe the problem.
-
-When adding files to the annex and then deciding against it in an "unusual" way, git-annex gets confused and the file left behind can't be removed from the annex...
-
-### What steps will reproduce the problem?
-
-1. Add file with "git annex add"
-2. Decide you don't need the file add all
-3. "git rm -f newfile"
-4. "git annex unused"
-5. "git annex dropunused all"
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 5.20140210 on Debian unstable
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-$ git init
-Initialized empty Git repository in /tmp/foo/.git/
-$ ls -l
-total 0
-$ cp ~/download/hub-ctrl.c .
-$ git add hub-ctrl.c
-$ git commit
-[master (root-commit) ed7eb68] A file.
- 1 file changed, 412 insertions(+)
- create mode 100644 hub-ctrl.c
-$ cp ~/download/hub-ctrl .
-$ ls -l
-total 28
--rwxr-xr-x 1 tobias tobias 14130 Feb 19 00:49 hub-ctrl
--rw-r--r-- 1 tobias tobias  9270 Feb 19 00:48 hub-ctrl.c
-$ git annex init
-init  ok
-(Recording state in git...)
-$ git annex add
-add hub-ctrl ok
-(Recording state in git...)
-$ git status
-On branch master
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   hub-ctrl
-
-$ git rm hub-ctrl
-error: the following file has changes staged in the index:
-    hub-ctrl
-(use --cached to keep the file, or -f to force removal)
-$ git rm -f hub-ctrl
-rm 'hub-ctrl'
-$ git status
-On branch master
-nothing to commit, working directory clean
-$ git annex unused
-unused . (checking for unused data...) (checking HEAD...) 
-  Some annexed data is no longer used by any files:
-    NUMBER  KEY
-    1       SHA256E-s14130--d4e777ba2b99ed0a520fbabe7b93cf2165373b4945afe8dcb626231d9051f19d
-  (To see where data was previously used, try: git log --stat -S'KEY')
-  
-  To remove unwanted data: git-annex dropunused NUMBER
-  
-ok
-$ git annex dropunused all
-dropunused 1 (unsafe) 
-  Could only verify the existence of 0 out of 1 necessary copies
-
-  Rather than dropping this file, try using: git annex move
-
-  (Use --force to override this check, or adjust numcopies.)
-failed
-git-annex: dropunused: 1 failed
-$
-
-# End of transcript or log.
-"""]]
-
-> It seems to me that if you run `git annex dropunused --force`, it will
-> remove the file. This needing --force is a recent change; git-annex
-> tries to never posibly lose data unless forced. Dropping the last
-> copy of a file certianly qualifies. [[done]] --[[Joey]]
diff --git a/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn b/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn
deleted file mode 100644
--- a/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-What steps will reproduce the problem?
-
-I can reproduce it locally:
-
-    % annex -d add Eigene\ Bilder/
-    [2013-03-19 15:44:01 CET] read: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","ls-files","--others","--exclude-standard","-z","--","Eigene Bilder/"]
-    [2013-03-19 15:44:01 CET] read: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","diff","--name-only","--diff-filter=T","-z","--","Eigene Bilder/"]
-    add Eigene Bilder/20070311/Bild023.jpg [2013-03-19 15:44:01 CET] chat: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","check-attr","-z","--    stdin","annex.backend","annex.numcopies","--"]
-    (checksum...) [2013-03-19 15:44:01 CET] read: sha512sum ["/Users/fschulze/Bilder/.git/annex/tmp/Bild02366551.jpg"]
-
-git-annex: user error (sha512sum ["/Users/fschulze/Bilder/.git/annex/tmp/Bild02366551.jpg"] exited 127)
-failed
-
-What is the expected output? What do you see instead?
-
-The file isn't added.
-
-What version of git-annex are you using? On what operating system?
-
-OS X from dmg
-
-    git-annex version: 4.20130314
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS
-
-> The OSX app is now changed so that git-annex is a wrapper
-> script using runshell. This allows putting `git-annex.app/Contents/MacOS`
-> into PATH and using git-annex, and it will find all the libraries and
-> utilities bundled with it. [[done]] --[[Joey]]
diff --git a/doc/bugs/cannot_connect_to_xmpp_server.mdwn b/doc/bugs/cannot_connect_to_xmpp_server.mdwn
deleted file mode 100644
--- a/doc/bugs/cannot_connect_to_xmpp_server.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-I cannot get the assistant to connect to my jabber account, db48x@db48x.net. I get the message stating that it may take a minute, which is never updated. At the very least I would expect some sort of error message.
-
-I get the same symptoms if I connect to an account @gmail.com, but type in the wrong password. If I put in the correct password, it connects quite quickly.
-
-### What version of git-annex are you using? On what operating system?
-
-[[!format txt """
-[db48x@celebdil ~]$ git annex version
-git-annex version: 4.20130709
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-[db48x@celebdil ~]$ uname -a
-Linux celebdil 3.9.9-201.fc18.x86_64 #1 SMP Fri Jul 5 16:42:02 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
-"""]]
-
-(Fedora 18)
-
-I get exactly the same behavior on my phone, which is running Android 4.1.2
-
-
-### Please provide any additional information below.
-
-[[!format txt """
-[db48x@celebdil books]$ cat .git/annex/daemon.log
-[2013-07-20 16:21:28 PDT] main: starting assistant version 4.20130709
-(scanning...) [2013-07-20 16:21:28 PDT] Watcher: Performing startup scan
-(started...) 
-"""]]
-
-> Closing this bug, since it's not something I can fix in git-annex,
-> but would have to be dealt with in the haskell XMPP library. 
-> Which seems unlikely given John's reply, but you never know --
-> and the bug I filed is still open ;) [[done]] --[[Joey]]
diff --git a/doc/bugs/cannot_determine_uuid_for_origin.mdwn b/doc/bugs/cannot_determine_uuid_for_origin.mdwn
deleted file mode 100644
--- a/doc/bugs/cannot_determine_uuid_for_origin.mdwn
+++ /dev/null
@@ -1,135 +0,0 @@
-[[!toc]]
-
-### Please describe the problem.
-
-I get this error when trying to copy annexed files from my laptop to the bare repository on my server:
-
-    anarcat@angela:ohm2013$ git annex copy -t origin .
-    git-annex: cannot determine uuid for origin
-
-### What steps will reproduce the problem?
-
-Here's my setup:
-
- * `angela`: regular git repository on my laptop (`angela`) where i ran `git annex init` and `git annex add`ed 4 big files (in `~anarcat/presentations/ohm2013`)
- * `marcos-bare`: a bare git repository where i ran `git annex init` on a different server (`marcos`) (in `~anarcat/repos/presentations/ohm2013.git`)
- * `marcos-checkout`: a checkout of the above repository on marcos (in `~anarcat/presentations/ohm2013`)
-
-I ran `git pull/push` everwhere in there, and still get the error.
-
-Remotes on all repos:
-
- * `angela`: `origin  anarcat.ath.cx:repos/presentations/ohm2013.git`
- * `marcos-bare`: no remote
- * `marcos-checkout`: `origin  /home/anarcat/repos/presentations/ohm2013.git`
-
-Note that file added with `git annex addurl` on `marcos-checkout` properly gets propagated on `angela` once i do `git annex get` there.
-
-### What version of git-annex are you using? On what operating system?
-
-`angela` runs:
-
-[[!format txt """
-git-annex version: 4.20130730-ge59a8c6
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-"""]]
-
-I was able to reproduce with the backport version too.
-
-I compiled it by hand from git.
-
-`marcos` runs:
-
-[[!format txt """
-git-annex version: 3.20120629
-local repository version: unknown
-default repository version: 3
-supported repository versions: 3
-upgrade supported from repository versions: 0 1 2
-"""]]
-
-### Please provide any additional information below.
-
-In addition, there's this error on `marcos-bare`:
-
-[[!format sh """
-anarcat@marcos:ohm2013.git$ git annex status -d
-supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-supported remote types: git S3 bup directory rsync web hook
-trusted repositories: git ["--git-dir=/home/anarcat/repos/presentations/ohm2013.git","show-ref","git-annex"]
-git ["--git-dir=/home/anarcat/repos/presentations/ohm2013.git","show-ref","--hash","refs/heads/git-annex"]
-git ["--git-dir=/home/anarcat/repos/presentations/ohm2013.git","log","refs/heads/git-annex..6063e958c02259a39b87d0f1dc44c9272c52df3f","--oneline","-n1"]
-git ["--git-dir=/home/anarcat/repos/presentations/ohm2013.git","cat-file","--batch"]
-0
-semitrusted repositories: 4
-        00000000-0000-0000-0000-000000000001 -- web
-        5868f840-02e7-11e3-94e9-9b3701bd28bb -- marcos-checkout
-        aafdd242-02e7-11e3-bb6a-6f16a5c6103e -- here (marcos-bare)
-        befc3057-d23d-4312-843a-0645e93107d8 -- angela
-untrusted repositories: 0
-dead repositories: 0
-available local disk space: 14 gigabytes (+1 megabyte reserved)
-local annex keys: 0
-local annex size: 0 bytes
-known annex keys: git ["--git-dir=/home/anarcat/repos/presentations/ohm2013.git","ls-files","--cached","-z","--","/home/anarcat/repos/presentations/ohm2013.git"]
-fatal: '/home/anarcat/repos/presentations/ohm2013.git' is outside repository
-0
-known annex size: 0 bytes
-bloom filter size: 16 mebibytes (0% full)
-backend usage:
-"""]]
-
-### Workaround!
-
-I found that I could succesfully push to the non-bare repo, like this:
-
-[[!format txt """
-anarcat@angela:ohm2013$ git remote add marcos-checkout ssh://anarcat.ath.cx/~/presentations/ohm2013
-anarcat@angela:ohm2013$ git fetch marcos-checkout
-From ssh://anarcat.ath.cx/~/presentations/ohm2013
- * [new branch]      git-annex  -> marcos-checkout/git-annex
- * [new branch]      master     -> marcos-checkout/master
-anarcat@angela:ohm2013$ git annex copy AlerteRouge.webm --to marcos-checkout
-copy AlerteRouge.webm (checking marcos-checkout...) (to marcos-checkout...)
-SHA256E-s138903105--a69db8d4c3835b03bdb08cb1cccfde5c76f586f934d63283694e7101b25352a8.webm
-[...]
-"""]]
-
-It seems that git-annex doesn't like bare repos at all...
-
-### Fix
-
-It seems that my problem was specifically related to [[bare repositories]], which are not well supported historically. There has been other reports of problems in the past, which I missed in my search because symptoms were different:
-
- * [[bugs/bare git repos]]
- * [[forum/get and copy with bare repositories]]
-
-Yet while I was able to do `git annex get --all` *from* the `marcos-bare` repository, I still get the original error message while trying to `git annex copy -t marcos-bare`, which is pretty annoying considering the original files are on my laptop, which is not publicly accessible. So I basically need to add the `marcos-checkout` as a remote, copy there, then get from the bare repo to make this work, which is a rather convoluted way of doing things. :)
-
-It seems to me a proper fix would be to be able to `git annex copy --to marcos-bare`. Thanks!
-
-Update: it seems te problem was that I had the following in my `.git/config`:
-
-    [remote "marcos-bare"]
-            url = ssh://anarcat.ath.cx/~/repos/presentations/ohm2013.git
-            annex-ignore = true
-            fetch = +refs/heads/*:refs/remotes/marcos-bare/*
-
-I have *no* idea how that `annex-ignore` got there, but that was the root of my problem. Removing it it allowed my to do `git annex copy`. I really don't know how this happened, but I guess this is [[done]], although I believe this error message is really confusing and could be improved. --[[anarcat]]
-
-> `annex-ignore` is set automatically by git-annex if it fails to query
-> the uuid of a remote the first time it tries to use it. It will say
-> when it does that. The assumption
-> is that a remote whose uuid cannot be looked up is a git remote
-> on a server w/o git-annex support (like github) and it would be annoying
-> to constantly be trying and failing to get that uuid.
-> 
-> So, I've improved the error message. Now when annex-ignore is set
-> for a remote, the error you got will mention that.
-> 
-> (Also, there is not currently anything lacking in git-annex's support
-> for bare repositories.) --[[Joey]]
diff --git a/doc/bugs/case_sensitivity_on_FAT.mdwn b/doc/bugs/case_sensitivity_on_FAT.mdwn
deleted file mode 100644
--- a/doc/bugs/case_sensitivity_on_FAT.mdwn
+++ /dev/null
@@ -1,49 +0,0 @@
-I was copying files to a directory remote with `git annex copy`.  Out of 114 files, 9 of them failed with no message, just:
-
-    copy data/foo.dat (to usbdrive...) failed
-    copy data/bar.dat (to usbdrive...) failed
-
-According to strace:
-
-    31338 mkdir("/media/annex/Zp/9v/SHA256-s1362999320--d650297c8cf8c2dc0575110a52d0c5cc0ff266f294a0599f85796a6b44b23492", 0777) = -1 ENOENT (No such file or directory)
-    31338 mkdir("/media/annex/Zp/9v", 0777) = -1 ENOENT (No such file or directory)
-    31338 mkdir("/media/annex/Zp", 0777)    = -1 EEXIST (File exists)
-    31338 stat("/media/annex/Zp", 0x7f8449f170d0) = -1 ENOENT (No such file or directory)
-
-The filesystem is FAT32 and has weird case semantics.  This was mounted by udisks with its default options:
-
-    /dev/sdb1 on /media/annex type vfat (rw,nosuid,nodev,uhelper=udisks,uid=1000,gid=1000,shortname=mixed,dmask=0077,utf8=1,showexec)
-
-I wonder if the directory remote should use hashDirLower instead of hashDirMixed?
-
-> git-annex intentionally uses the same layout for directory and rsync
-> special remotes as it does for the .git/annex directory. As far
-> as I know it works ok on (truely) case-insensative filesystems.
-> 
-> Based on your strace, if you `ls /media/annex/Zp`, you will see
-> "No such file or directory", but if you `mkdir /media/annex/Zp` it will
-> fail with "File exists". Doesn't make much sense to me.
-> 
-> The (default) VFAT mount option shortname=mixed causes this behavior.
-> With shortname=lower it works ok. --[[Joey]]
-> 
->> So, the options for fixing this bug seem to be to fix Linux (which would
->> be a good idea IMHO but I don't really want to go there), or generally
->> convert git-annex to using lowercase for its hashing (which would be a
->> large amount of pain to rewrite all the symlinks in every git repo),
->> or some special hack around this problem. 
->> 
->> I've put in a workaround for the problem in the directory special
->> remote; it will use mixed case but fall-back to lowercase as necessary.
->> 
->> That does leave the case of a bare git repository with annexed content
->> stored on VFAT. More special casing could fix it, but that is, I
->> think, an unusual configuration. Leaving the bug open for that case,
->> and for the even more unlikely configuration of a rsync special remote
->> stored on VFAT. --[[Joey]] 
-
->>> Bare repositories now use lowercase. rsync is the only remaining
->>> unsupported possibility. --[[Joey]]
->>>> Everything now uses lowercase, with the exception of non-bare
->>>> repos, which cannot be on FAT anyway due to using symlinks. [[done]]
->>>> --[[Joey]] 
diff --git a/doc/bugs/check_for_curl_in_configure.hs.mdwn b/doc/bugs/check_for_curl_in_configure.hs.mdwn
deleted file mode 100644
--- a/doc/bugs/check_for_curl_in_configure.hs.mdwn
+++ /dev/null
@@ -1,92 +0,0 @@
-[[!meta title="arbitrary/configurable backends"]]
-
-(Retitling as this has drifted..)
-
----
-
-I thought this might be useful, since curl is being used for the URL backend, it might be worth checking for it's existence.
-
-<pre>
-diff --git a/configure.hs b/configure.hs
-index 772ba54..1a563e0 100644
---- a/configure.hs
-+++ b/configure.hs
-@@ -13,6 +13,7 @@ tests = [
-        , TestCase "uuid generator" $ selectCmd "uuid" ["uuid", "uuidgen"]
-        , TestCase "xargs -0" $ requireCmd "xargs_0" "xargs -0 </dev/null"
-        , TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null"
-+       , TestCase "curl" $ requireCmd "curl" "curl --version >/dev/null"
-        , TestCase "unicode FilePath support" $ unicodeFilePath
-        ] ++ shaTestCases [1, 256, 512, 224, 384]
-</pre>
-
-> Well, curl is an optional extra, so requireCmd is too strong. Changed
-> to testCmd and applied, thank you!
->
-> I thought about actually *using* the resulting SysConfig.curl
-> to disable the URL backend if False.. but probably it's better
-> to just let it fail if curl is not available. Although, if we wanted
-> to add a check for wget or something and use it when curl was not
-> available, that might be worth doing. --[[Joey]] 
-
->> I was thinking that is it worth doing a generic "stat", "delete", "get" 
->> and "put" options, I do like the idea of having the possibility of 
->> being about to use completely arbitrary storage systems or arbitrary 
->> transfer systems. If there was the capability of doing so it would be 
->> interesting to see possibilities of using aria2 for using something 
->> like bittorrent as backend, or using something like irods or some 
->> grid storage system as the storage archive. It's just an idea as 
->> I have seen it implemented quite well in irods.
-
->>> I'm unsure about the idea of having a backend where that is
->>> parameterized. It would mean that one annex's GENERIC-foo key
->>> might be entirely different from another's key with the same backend
->>> and details. And a misconfiguration could get data the wrong
->>> way and get the wrong data, etc.
->>>
->>> I mostly look at the URL backend as an example that can be modified to
->>> make this kind of custom backend. You already probably know enough to
->>> make a TORRENT backend where keys are the urls to torrents to download
->>> with `aria2c --follow-torrent=mem`.
->>>
->>> I am also interested in doing backends that use eg, cloud storage.
->>> A S3 backend that could upload files to S3 in addition to downloading
->>> them, for example, would be handy. --[[Joey]]
-
->>>> So, rather than use backends to do this, it instead made more sense
->>>> to make them [[special_remotes]]. The URL backend remains a bit
->>>> of a special case, and a bittorrent backend that downloaded a file
->>>> from a bittorrent url would still be a good use of backend, but for
->>>> storing files in external data stores like S3, making it a remote
->>>> makes better sense. I think I can close this bug now, [[done]]
->>>> --[[Joey]] 
-
-also in Backend/URL.hs is it worth making a minor change to the way curl is called (I'm not sure if the following is correct or not)
-
-> It's correct, typewise, but I don't see any real reason to bother
-> with the change. But I do appreciate patches, which have been rare
-> so far, probaby because of Haskell.. :) --[[Joey]] 
-
->> heh agreed
-
-<pre>
-diff --git a/Backend/URL.hs b/Backend/URL.hs
-index 29dc8fe..4afcf86 100644
---- a/Backend/URL.hs
-+++ b/Backend/URL.hs
-@@ -50,10 +50,13 @@ dummyFsck _ _ _ = return True
- dummyOk :: Key -> Annex Bool
- dummyOk _ = return True
- 
-+curl :: [CommandParam] -> IO Bool
-+curl = boolSystem "curl"
-+
- downloadUrl :: Key -> FilePath -> Annex Bool
- downloadUrl key file = do
-        showNote "downloading"
-        showProgress -- make way for curl progress bar
--       liftIO $ boolSystem "curl" [Params "-# -o", File file, File url]
-+       liftIO $ curl [Params "-# -o", File file, File url]
-        where
-                url = join ":" $ drop 1 $ split ":" $ show key 
-</pre>
diff --git a/doc/bugs/clicking_back_in_the_web_browser_crashes.mdwn b/doc/bugs/clicking_back_in_the_web_browser_crashes.mdwn
deleted file mode 100644
--- a/doc/bugs/clicking_back_in_the_web_browser_crashes.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-
-When I click on the "back" button in my web browser, I get the following error message:
-
-    git-annex has shut down
-    
-    You can now close this browser window.
-
-### What steps will reproduce the problem?
-
- 1. git annex webapp
- 2. click on "configuration" (or whatever)
- 3. click on the back button of your web browser
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130815~bpo70+1 on Debian Wheezy, with Chromium Version 29.0.1547.57 Debian 7.1 (217859)
-
-### Please provide any additional information below.
-
-Click "forward" actually brings us back to sanity, and the webapp doesn't actually *crash*. -- [[anarcat]]
-
-> I have applied the page reload fix/hack. [[done]] --[[Joey]] 
diff --git a/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn b/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn
deleted file mode 100644
--- a/doc/bugs/com.branchable.git-annex.assistant.plist_is_invalid.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-What steps will reproduce the problem?
-`cat com.branchable.git-annex.assistant`
-
-What version of git-annex are you using? On what operating system?
-  git-annex version: 3.20121112 on OS X Mountain Lion
-
-Please provide any additional information below.
-The '`RunAtLoad`'  key is missing a value.
-
-It should say:
-
-`<key>RunAtLoad</key>`<br>
-`<true/>`
-
-> Fixed in git. [[done]] --[[Joey]] 
diff --git a/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn b/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn
deleted file mode 100644
--- a/doc/bugs/commit_f20a40f_breaks_on_OSX_as_mntent.h_doesn__39__t_exist.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-commit f20a40f breaks on OSX as mntent.h doesn't exist, the closet thing available to what mntent.h provides is getmntinfo(), it looks yet another bunch of ifdef's might be needed to work around OSX. This problem maybe similarly true with FreeBSD, libfam  seems to have worked around the issue - <http://oss.sgi.com/projects/fam/download/contrib/freebsd-mntent.patch>
-
-hope the above report helps.
-
-> Thanks, that was a very useful pointer. I couldn't figure out how to
-> use Haskell's FFI to loop over the list of statfs structs returned by
-> getmntinfo, so I incorporated that C code into a little library, 
-> and it seems to work ok. [[done]] --[[Joey]]
diff --git a/doc/bugs/configure_script_should_detect_uuidgen_instead_of_just_uuid.mdwn b/doc/bugs/configure_script_should_detect_uuidgen_instead_of_just_uuid.mdwn
deleted file mode 100644
--- a/doc/bugs/configure_script_should_detect_uuidgen_instead_of_just_uuid.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-On RHEL5 (and clones) systems uuidgen is available as an alternative to
-uuid, the configure script fails, it should probably detect either uuid or
-uuidgen, or let the user decide? - also uuidgen behaves differently from
-uuid on debian.
-
-> uuidgen is now supported. --[[Joey]] [[done]]
diff --git a/doc/bugs/confirmed.mdwn b/doc/bugs/confirmed.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/confirmed.mdwn
@@ -0,0 +1,8 @@
+These bug reports have been confirmed to be real bugs, and so are likely
+to be the next bugs fixed.
+
+If your bug report is not listed here, you probably need to provide more
+information so that the bug can be reproduced. See also: [[unconfirmed]]
+
+[[!inline pages="./* and link(./confirmed) and !link(./done) and !./unconfirmed" show=0
+archive=yes]]
diff --git a/doc/bugs/conflicting_haskell_packages.mdwn b/doc/bugs/conflicting_haskell_packages.mdwn
deleted file mode 100644
--- a/doc/bugs/conflicting_haskell_packages.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-The compilation command should states which packages are used and avoid the default mechnasim that automatically search for them.
-
-This can be done by the flags -hide-packages and then -package foo
-
-> My ghc does not have a `--hide-packages` option.
-> 
-> Could you just show the build problem that you are suggesting I work
-> around? --[[Joey]]
-
-
-> Thanks npouillard, I see the problem now.
-> <http://stackoverflow.com/questions/2048953/control-monad-state-found-in-multiple-packages-haskell>
-> 
-> I've added "-ignore-package monads-fd" to GHCFLAGS. I hope I don't
-> really have to hide all packages and individually turn them back on;
-> surely this monads-fd/mtl conflict is an exception, and Haskell's module
-> system is not a mess of conflicting modules? --[[Joey]] [[done]]
diff --git a/doc/bugs/copy_doesn__39__t_scale.mdwn b/doc/bugs/copy_doesn__39__t_scale.mdwn
deleted file mode 100644
--- a/doc/bugs/copy_doesn__39__t_scale.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-It seems that git-annex copies every individual file in a separate
-transaction. This is quite costly for mass transfers: each file involves a
-separate rsync invocation and the creation of a new commit. Even with a
-meager thousand files or so in the annex, I have to wait for fifteen
-minutes to copy the contents to another disk, simply because every
-individual file involves some disk thrashing. Also, it seems suspicious
-that the git-annex branch would get a thousands commits of history from the
-simple procedure of copying everything to a new repository. Surely it would
-be better to first copy everything and then create only a single commit
-that registers the changes to the files' availability?
-
-> git-annex is very careful to commit as infrequently as possible,
-> and the current version makes *1* commit after all the copies are
-> complete, even if it transferred a billion files. The only overhead
-> incurred for each file is writing a journal file.
-> You must have an old version.
-> --[[Joey]]
-
-(I'm also not quite clear on why rsync is being used when both repositories
-are local. It seems to be just overhead.)
-
-> Even when copying to another disk it's often on 
-> some slow bus, and the file is by definition large. So it's
-> nice to support resumes of interrupted transfers of files.
-> Also because rsync has a handy progress display that is hard to get with cp.
-> 
-> (However, if the copy is to another directory in the same disk, it does
-> use cp, and even supports really fast copies on COW filesystems.)
-> --[[Joey]]
-
----
-
-Oneshot mode is now implemented, making git-annex-shell and other
-short lifetime processes not bother with committing changes.
-[[done]] --[[Joey]] 
-
-Update: Now it makes one commit at the very end of such a mass transfer.
---[[Joey]]
diff --git a/doc/bugs/copy_fast_confusing_with_broken_locationlog.mdwn b/doc/bugs/copy_fast_confusing_with_broken_locationlog.mdwn
deleted file mode 100644
--- a/doc/bugs/copy_fast_confusing_with_broken_locationlog.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-Conversation moved from [[tips/recover_data_from_lost+found]]
-to a proper bug. --[[Joey]]
-
-(Unfortunatly that scrambled the comment creation times and thus order.)
-
-> Added a message [[done]] --[[Joey]] 
diff --git a/doc/bugs/copy_to_webdav_sometimes_doesn__39__t_work.mdwn b/doc/bugs/copy_to_webdav_sometimes_doesn__39__t_work.mdwn
deleted file mode 100644
--- a/doc/bugs/copy_to_webdav_sometimes_doesn__39__t_work.mdwn
+++ /dev/null
@@ -1,74 +0,0 @@
-### Please describe the problem.
-Copying to a gpg encrypted webdav remote (with davfs) seems to work, but fails.
-The command "git annex copy --to 1und1 some/file" returns ok, but a fsck fails and running
-the copy again copies the file again to the remote.
-
-### What steps will reproduce the problem?
-[[!format sh """
-git annex copy --to 1und1 some/file # seems ok
-git annex copy --to 1und1 some/file # copies again
-git annex fsck --from 1und1 some/file # fails
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-4.20131002 on debian (mostly stable), armel.
-
-### Please provide any additional information below.
-
-I used strace to see what is going on. It seems the chunkcount file is not written. When I create that file by hand fsck is happy.
-(git annex seems to have two different locations for that file (dcf/85a and 3W/Qm). The second (3W/Qm) doesn't exist.)
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-copy to webdav (git annex copy --to 1und1 some/file)
-output of basically "strace git annex ... | grep media":
-
-9871  stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount",  <unfinished ...>
-9871  stat64("/media/1und1/git-annex/3W/Qm/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", 0xb65145d0) = -1 ENOENT (No such file or directory)
-9871  mkdir("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33", 0777 <unfinished ...>
-9871  statfs("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/",  <unfinished ...>
-9871  stat64("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", {st_mode=S_IFDIR|0755, st_size=0, ...}) = 0
-9871  open("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK|O_LARGEFILE, 0666 <unfinished ...>
-9871  stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/",  <unfinished ...>
-9871  chmod("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", 040755 <unfinished ...>
-9871  openat(AT_FDCWD, "/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 15
-9871  unlink("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1" <unfinished ...>
-9871  rmdir("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/" <unfinished ...>
-9871  mkdir("/media/1und1/git-annex/dcf/85a", 0777) = -1 EEXIST (File exists)
-9871  stat64("/media/1und1/git-annex/dcf/85a", {st_mode=S_IFDIR|0755, st_size=64, ...}) = 0
-9871  stat64("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", {st_mode=S_IFDIR|0755, st_size=0, ...}) = 0
-9871  rename("/media/1und1/git-annex/tmp/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", "/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/" <unfinished ...>
-9871  openat(AT_FDCWD, "/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|O_CLOEXEC) = 15
-9871  stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", {st_mode=S_IFREG|0644, st_size=11705, ...}) = 0
-9871  chmod("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", 0100444) = 0
-9871  stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", {st_mode=S_IFDIR|0755, st_size=152, ...}) = 0
-9871  chmod("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/", 040555 <unfinished ...>
-
-fsck webdav, but fails (git annex fsck --from 1und1 some/file):
-
-10208 stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount",  <unfinished ...>
-10208 stat64("/media/1und1/git-annex/3W/Qm/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", 0xb6428160) = -1 ENOENT (No such file or directory)
-
-
-manual file creation:
-chmod u+w ...
-echo -n 1 > /media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount
-chmod u-w ...
-
-
-fsck webdav again, now all is fine ("fixing location log"):
-10670 stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", {st_mode=S_IFREG|0444, st_size=1, ...}) = 0
-10670 open("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", O_RDONLY|O_NOCTTY|O_NONBLOCK|O_LARGEFILE) = 14
-10670 stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", {st_mode=S_IFREG|0444, st_size=11705, ...}) = 0
-10670 stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", {st_mode=S_IFREG|0444, st_size=1, ...}) = 0
-10670 open("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunkcount", O_RDONLY|O_NOCTTY|O_NONBLOCK|O_LARGEFILE) = 14
-10670 stat64("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", {st_mode=S_IFREG|0444, st_size=11705, ...}) = 0
-10672 open("/media/1und1/git-annex/dcf/85a/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33/GPGHMACSHA1--10ff9e1cc8191235670c2fd95375bccf62004f33.chunk1", O_RDONLY|O_NOCTTY|O_NONBLOCK|O_LARGEFILE) = 20
-# End of transcript or log.
-"""]]
-
-> There was a bug that caused it not to write the chunkcount file.
-> I have fixed it, and put in a workaround so fsck, etc, will
-> see that the file is stored on the remote despite there being no
-> chunkcount file present. [[done]] --[[Joey]]
diff --git a/doc/bugs/creating_a_plain_directory_where_a_mountpoint_should_have_been.mdwn b/doc/bugs/creating_a_plain_directory_where_a_mountpoint_should_have_been.mdwn
--- a/doc/bugs/creating_a_plain_directory_where_a_mountpoint_should_have_been.mdwn
+++ b/doc/bugs/creating_a_plain_directory_where_a_mountpoint_should_have_been.mdwn
@@ -25,3 +25,5 @@
 I wasn't logging when this happened.
 
 Again, just a heads-up; I'll keep my eye open for this happening again and post more info if it does.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/cross_platform_permissions_woes.mdwn b/doc/bugs/cross_platform_permissions_woes.mdwn
deleted file mode 100644
--- a/doc/bugs/cross_platform_permissions_woes.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-a little introduction:
-i am forced to use windows on my work laptop and workstation, also my wife needs windows.
-my "servers" would be linux, i am actually using fedora and i upgraded from fc17 since i was not able to get a recent version of git annex to compile there.
-
-what happens, is that once i try to copy from the windows machine where the file is to the linux through ssh+rsync, i receive this error - as long as the user owning the linux repository isn't root:
-
-    c:\locale>git annex copy --to linux myfile
-    copy myfile (checking linux...) (to linux...)
-    rsync: failed to open "/linux/annex/tmp/SHA256E-s10--937a89b559820f8658892"
-    myfile
-          10 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-    rsync error: syntax or usage error (code 1) at /home/lapo/package/rsync-3.0.9-1/src/rsyn
-    total size is 10  speedup is 0.09
-    failed
-    git-annex: copy: 1 failed
-
-the file in tmp has no permissions at all:
-
-    me@linux annex]$ ls -lart tmp/SHA256E-s10--937a89b559820f86588921ef3eb12c13074d078b62ef205bb597bf2e895408c3
-    ----------. 1 me me 10 Oct 13 22:50 tmp/SHA256Es10--937a89b559820f86588921ef3eb12c13074d078b62ef205bb597bf2e895408c3
-
-(just consider the following if the above makes any sense:) in another case (i cannot reproduce it now, possibly due to having upgraded git annex from some 2012 release), it happened that a failed download via copy/move from linux to windows (failed for permissions) would not be recorded as failed (on windows side), causing files to possibly be killed at the first subsequent drop command.
-
-my question is: are these 0-permissions on tmp files a bug or just due to some ignorance i did put in setting up the git/annex repo ? is a git/annex repo to be run solely as root/sudoer ? or shall i take any other step in configuring it ? 
-
-technicalities:
-
-"client": windows version:
-
-    git-annex version: 4.20131002-gf25991c
-
-"server": linux version:
-
-    git-annex version: 3.20130207
-
-> [[done]]; fixed in newer git-annex versions. --[[Joey]]
diff --git a/doc/bugs/cyclic_drop.mdwn b/doc/bugs/cyclic_drop.mdwn
deleted file mode 100644
--- a/doc/bugs/cyclic_drop.mdwn
+++ /dev/null
@@ -1,104 +0,0 @@
-drop's verification that a remote still has content can fail
-if the remote is also dropping the content at the same time. Each
-repository checks that the other still has the content, and then both
-drop it. Could also happen with larger cycles of repositories.
-
-> Confirmed fixed now. All cases tested. [[done]]
-
----
-
-Fixing this requires locking. (Well, there are other ways, like moving the
-content to a holding area when checking if it's safe to drop, but they
-seem complicated, and would be hard to implement for move --from.)
-
-Add per-content lock files. An exclusive lock is held on content when
-it's in the process of being dropped, or moved. The lock is taken
-nonblocking; if it cannot be obtained, something else is acting on the
-content and git-annex should refuse to do anything.
-
-Then when checking inannex, try to take a shared lock. Note that to avoid
-deadlock, this must be a nonblocking lock. (Actually, with fcntl locking,
-can just check if there is a lock, without needing to take one.) 
-If it fails, the status of the content is unknown, so inannex should fail.
-Note that this failure needs to be distinguishable from "not in annex".
-
-> Thinking about these lock files, this would be a lot more files, 
-> and would possibly break some assumptions that everything in
-> `.git/annex/objects` is a key's content. (Or would need lots more
-> directories to put the lock files elsewhere.) There would be more
-> overhead to manage these and have them on disk.
-> 
-> What if it just locked the actual content file? The obvious limitation
-> is only content that was already inannex could be locked, but that
-> happens to be exactly what's needed here; if content is not present,
-> it's not going to get dropped or moved.
->
-> Of course, if some consumer of a file locked it, then it could prevent it
-> from being dropped or moved. This could be considered a bug, or a feature. :)
-> 
-> However, this would mean that such a hypothetical consumer could also
-> make inannex checks fail.
->
-> The other downside is that, for fcntl exclusive locking, the file has to
-> be opened for write. Normally the modes of content files are locked down
-> to prevent modifcation. Dealt with, but oh so nasty. Almost makes flock
-> locking seem worth using.
-
----
-
-drop --from could also cycle. Locking should fix.
-
-> Confirmed fixed now. 
-
----
-
-move --to can also be included in the cycle, since it can drop data. 
-
-Consider move to a remote that already has the content and 
-is at the same time doing a drop (or a move). The remote
-verifies the content is present on the movee, and removes its copy.
-The movee removes its copy.
-
-So move --to needs to take the content lock on start. Then the inannex
-will fail.
-
-This is why it's important for inannex to fail in a way that is
-distinguishable from "not in annex". Otherwise, move --to
-would see the cycle as the remote not having content, and try to
-redundantly send it, drop it locally, and still race.
-
-> Confirmed fixed now.
-
--- 
-
-move --from is similar. Consider a case where both the local and the remote
-are doing a move --from. Both have the content, and confirm the other does,
-via inannex checks. Then both run git-annex-shell dropkey, removing both
-copies.
-
-So move --from needs to take the content lock on start, so the inannex will
-fail.  NB: If the content is not locally present, don't take the lock.
-
-> Confirmed fixed now.
-
----
-
-Another cycle might be running move --to and move --from on the same file,
-locally. The exclusivity of the content lock solves this, as only one can
-run at a time.
-
-Would it work with a shared lock? The --to would run git-annex-shell
-inannex. The --from would also be running, and would run git-annex-shell
-dropkey. So inannex and dropkey would end up running on the remote
-at the same time. Dropkey takes the content lock, and inannex checks it,
-but what if inannex runs first? Then it returns true, and then the content
-is removed, so both the --to and --from see success and the --to proceeds
-to remove the local content that the --from already caused to be removed
-from the remote. So, no, the nasty exclusive lock is needed.
-
-> Confirmed fixed now.
-
----
-
-Another cycle might involve move --from and drop, both run on the same
-file, locally. Again, the exclusive lock solves this.
diff --git a/doc/bugs/detected_bad_bare_repository_with___60__SCREECH__62___files.mdwn b/doc/bugs/detected_bad_bare_repository_with___60__SCREECH__62___files.mdwn
deleted file mode 100644
--- a/doc/bugs/detected_bad_bare_repository_with___60__SCREECH__62___files.mdwn
+++ /dev/null
@@ -1,73 +0,0 @@
-### Please describe the problem.
-
-Fun one: I have a backup repository created with the assistant. For some reason it's a bare repository, not sure why. It makes my hard drive scream with pain.
-
-### What steps will reproduce the problem?
-
-When I tried `git annex copy --to backup`, I saw this:
-
-[[!format sh """
-[2014-01-29 23:46:03 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","git-annex"]
-[2014-01-29 23:46:04 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","--hash","refs/heads/g
-[2014-01-29 23:46:11 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..ac42
-[2014-01-29 23:46:12 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..9ab4
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..5795
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..8006
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..320e
-[2014-01-29 23:46:22 EST] chat: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","cat-file","--batch"]
-[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
-[2014-01-29 23:46:22 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3/.git","--work-tree=/med
-[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
-[2014-01-29 23:46:22 EST] Detected bad bare repository with
-"""]]
-
-Then this stopped and my hard drive started scratching. It makes this horrible screeching sound because it's quite old, hence the bug title.
-
-It seems that this debug message tries to list all the objects in the filesystem, which in this case is quite large:
-
-[[!format haskell """
-fixBadBare :: Annex ()
-fixBadBare = whenM checkBadBare $ do
-        ks <- getKeysPresent
-        liftIO $ debugM "Init" $ unwords
-                [ "Detected bad bare repository with"
-                , show (length ks)
-                , "objects; fixing"
-                ]
-"""]]
-
-Maybe this could be skipped? It takes forever (7 minutes) to compute that length (21353 objects)...
-
-### What version of git-annex are you using? On what operating system?
-
-5.20140102-gd93f946, provided by joeyh as part of [[bugs/assistant_eats_all_CPU/]].
-
-### Please provide any additional information below.
-
-Here's the complete transcript of that copy:
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2014-01-29 23:46:03 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","git-annex"]
-[2014-01-29 23:46:04 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","show-ref","--hash","refs/heads/g
-[2014-01-29 23:46:11 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..ac42
-[2014-01-29 23:46:12 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..9ab4
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..5795
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..8006
-[2014-01-29 23:46:22 EST] read: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","log","refs/heads/git-annex..320e
-[2014-01-29 23:46:22 EST] chat: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","cat-file","--batch"]
-[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
-[2014-01-29 23:46:22 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3/.git","--work-tree=/med
-[2014-01-29 23:46:22 EST] read: git ["config","--null","--list"]
-[2014-01-29 23:46:22 EST] Detected bad bare repository with 21353 objects; fixing
-[2014-01-29 23:53:06 EST] call: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3","config","core.bare","true"]
-[2014-01-29 23:53:06 EST] read: git ["config","--null","--list"]
-[2014-01-29 23:53:06 EST] chat: git ["--git-dir=/media/c7a29cf9-ad3e-42a8-8dd5-0f5618c218ee/mp3","cat-file","--batch"]
-[2014-01-29 23:57:22 EST] call: git ["--git-dir=/srv/mp3/.git","--work-tree=/srv/mp3","config","remote..annex-uuid","c32322fa-8873-4635-8d4c-1dc27977eb6f"]
-[2014-01-29 23:57:22 EST] read: git ["config","--null","--list"]
-# End of transcript or log.
-"""]]
-
-> [[done]] per my comment --[[Joey]]
diff --git a/doc/bugs/direct_mode_renames.mdwn b/doc/bugs/direct_mode_renames.mdwn
deleted file mode 100644
--- a/doc/bugs/direct_mode_renames.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-When in direct mode, renaming a file with `git mv` does not update the
-direct mode mapping to use the new filename. --[[Joey]]
-
-Consistency checks now prevent anything bad happening when the mapping file
-contains old filenames. Still, missing the new filename will prevent that
-file working properly in direct mode.
-
-Perhaps the pre-commit hook needs to update the mapping for files that were
-deleted or added.
-
-This also affects moves of files when the assistant is being used.
-In this case, the assistant updates the mapping to add the new name,
-but does not delete the old name from the mapping.
-
-> [[done]]; the pre-commit hook now updates the mappings. --[[Joey]]
diff --git a/doc/bugs/direct_mode_sync_should_avoid_git_commit.mdwn b/doc/bugs/direct_mode_sync_should_avoid_git_commit.mdwn
deleted file mode 100644
--- a/doc/bugs/direct_mode_sync_should_avoid_git_commit.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Per forum post linking to this bug, git commit can be very slow when run in a filesystem without symlink support, and seems to be reading the content of files just in order to show typechanged messages in the status.
-
-So, git annex sync should stop using git commit when in direct mode, and instead manually make its own commit. Git.Branch.commit and Git.Branch.update should be able to easily be used for this.
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/dotdot_problem.mdwn b/doc/bugs/dotdot_problem.mdwn
deleted file mode 100644
--- a/doc/bugs/dotdot_problem.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-cannot "git annex ../foo"   (GitRepo.relative is buggy and
-git-ls-files also refuses w/o --full-name, which would need other changes)
-
-[[done]]
diff --git a/doc/bugs/drop_fails_to_see_copies_that_whereis_sees.mdwn b/doc/bugs/drop_fails_to_see_copies_that_whereis_sees.mdwn
deleted file mode 100644
--- a/doc/bugs/drop_fails_to_see_copies_that_whereis_sees.mdwn
+++ /dev/null
@@ -1,69 +0,0 @@
-What steps will reproduce the problem?
-------------------------------------------------------
-
-I haven't tried doing this again, but here's what I did:
-
-I was copying files to my usb drive (hugex) with probably this command:
-
-    git annex copy --to=hugex .
-
-While doing that, I did something stupid in another window, and filled my local hard drive (the one I was copying from) and git annex spit out some errors about not being able to write to log files (because my local drive was full.)
-
-I suspended (^Z) git annex, made some hard drive space, then resumed (fg).
-
-At first, git annex whereis didn't see the copies of some of the files in hugex (apparently the ones where git annex had trouble writing the local log files). After a "git remote update hugex" and I think a ``git annex merge``, whereis was able to see both copies.
-
-But git drop can't see both copies, and won't let me drop my local copy. I ran ``git annex fsck .`` on the directory with the now files I was copying above, and that didn't seem to change anything (or report errors.)
-
-Here's a terminal session where I'm showing the problem and some hopefully useful text:
-
-	compy compy compy ~/video/tv/keen-eddie> git annex whereis 02-horse-heir.avi 
-	whereis 02-horse-heir.avi (2 copies) 
-  		5bfe091c-ed07-11df-842e-eb791a485889 -- here (compy)
-   		e15161ec-f1bf-11df-a7b5-eb1f0e6921ee -- hugex
-	ok
-	compy compy compy ~/video/tv/keen-eddie> git annex drop 02-horse-heir.avi 
-	drop 02-horse-heir.avi (unsafe) 
-  	  Could only verify the existence of 1 out of 2 necessary copies
-
-  	  No other repository is known to contain the file.
-
-  	  (Use --force to override this check, or adjust annex.numcopies.)
-	failed
-	git-annex: drop: 1 failed
-	zsh: exit 1     git annex drop 02-horse-heir.avi
-	compy compy compy ~/video/tv/keen-eddie> ls -lh 02-horse-heir.avi              
-	lrwxrwxrwx 1 jasonwoof jasonwoof 149 Nov 15 04:19 02-horse-heir.avi -> ../../../.git/annex/objects/KV/8G/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7
-	compy compy compy ~/video/tv/keen-eddie> ls --dereference -lh 02-horse-heir.avi
-	-r--r--r-- 1 jasonwoof jasonwoof 342M Nov 15 04:19 02-horse-heir.avi
-	compy compy compy ~/video/tv/keen-eddie> ls -lh ../../../.git/annex/objects/KV/8G/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7
-	-r--r--r-- 1 jasonwoof jasonwoof 342M Nov 15 04:19 ../../../.git/annex/objects/KV/8G/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7
-	compy compy compy ~/video/tv/keen-eddie> ls -lh /media/hugex/jason/home.git/annex/objects/5bd/6a1/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7
-	-r--r--r-- 1 jasonwoof jasonwoof 342M Jan  7 16:27 /media/hugex/jason/home.git/annex/objects/5bd/6a1/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7/SHA1-s358316330--7fcbf33b711e41def269f042842212d0bf3736a7
-
-That last command is showing that the file is indeed in hugex's annex/objects
-
-
-Oh, and another wrinkle. hugex is a bare repo. I tried to fsck hugex's video/tv directory, but it said that directory doesn't exist (I assume because there's no working copy.)
-
-
-What is the expected output? What do you see instead?
-------------------------------------------------------------------------------
-
-I'd like ``git annex drop`` to have the same kind of confidence in the copies of these files on hugex.
-
-How can I resolve this. I tried ``git annex copy --to=hugex .`` again, but that command knows that these files are already copied to hugex.
-
-What version of git-annex are you using? On what operating system?
-
-3.20130102 on debian unstable (thanks for packaging!)
-
-Please provide any additional information below.
-------------------------------------------------------------------
-
-You can also reach me at ``jason@jasonwoof.com``
-
-> [[done]]; the confusing message has been improved.
-> 
-> BTW, you can use `git annex move` to ensure a file is on another repo and
-> drop it locally. --[[Joey]]
diff --git a/doc/bugs/dropping_and_re-adding_from_web_remotes_doesn__39__t_work.mdwn b/doc/bugs/dropping_and_re-adding_from_web_remotes_doesn__39__t_work.mdwn
deleted file mode 100644
--- a/doc/bugs/dropping_and_re-adding_from_web_remotes_doesn__39__t_work.mdwn
+++ /dev/null
@@ -1,139 +0,0 @@
-In experimenting with the web remote, I found that dropping a URL gave an error, but still succeeded, while re-adding the same URL fails to work correctly.
-
-#What steps will reproduce the problem?
-
-<pre>
-/tmp $ dd if=/dev/zero of=/tmp/file.bin count=1024
-1024+0 records in
-1024+0 records out
-524288 bytes (524 kB) copied, 0.0135652 s, 38.6 MB/s
-/tmp $ mkdir /tmp/repo
-/tmp $ cd /tmp/repo
-/tmp/repo $ git init
-Initialized empty Git repository in /tmp/repo/.git/
-/tmp/repo $ git annex init "test"
-init test ok
-(Recording state in git...)
-/tmp/repo $ git annex addurl file:///tmp/file.bin --file annexed.bin
-######################################################################## 100.0%
-(checksum...) ok
-(Recording state in git...)
-/tmp/repo $ git annex drop annexed.bin 
-drop annexed.bin (checking file:///tmp/file.bin...) ok
-(Recording state in git...)
-/tmp/repo $ mv /tmp/file.bin /tmp/file2.bin 
-/tmp/repo $ git annex get annexed.bin 
-get annexed.bin (from web...) 
-curl: (37) Couldn't open file /tmp/file.bin
-
-  Unable to access these remotes: web
-
-  Try making some of these repositories available:
-        00000000-0000-0000-0000-000000000001 -- web
-failed
-git-annex: get: 1 failed
-/tmp/repo $ git annex drop --from web annexed.bin --force
-drop web annexed.bin
-  removal from web not supported
-failed
-(Recording state in git...)
-git-annex: drop: 1 failed
-/tmp/repo $ git annex get annexed.bin 
-get annexed.bin (not available) 
-  No other repository is known to contain the file.
-failed
-git-annex: get: 1 failed
-/tmp/repo $ mv /tmp/file2.bin /tmp/file.bin 
-/tmp/repo $ git annex addurl file:///tmp/file.bin --file annexed.bin
-addurl annexed.bin ok
-/tmp/repo $ git annex whereis annexed.bin
-whereis annexed.bin (0 copies) failed
-git-annex: whereis: 1 failed
-/tmp/repo $ git annex addurl file:///tmp/file.bin --file annexed2.bin
-######################################################################## 100.0%
-(checksum...) ok
-(Recording state in git...)
-/tmp/repo $ git annex whereis annexed.bin
-whereis annexed.bin (1 copy)
-        e2418e81-ec04-4091-aabe-ed75d65f93fa -- here (test)
-ok
-/tmp/repo $ git annex whereis annexed2.bin
-whereis annexed2.bin (1 copy)
-        e2418e81-ec04-4091-aabe-ed75d65f93fa -- here (test)
-ok
-/tmp/repo $ git annex drop annexed.bin
-drop annexed.bin (unsafe)
-  Could only verify the existence of 0 out of 1 necessary copies
-
-  No other repository is known to contain the file.
-
-  (Use --force to override this check, or adjust annex.numcopies.)
-failed
-git-annex: drop: 1 failed
-/tmp/repo $ git annex drop annexed2.bin
-drop annexed2.bin (unsafe)
-  Could only verify the existence of 0 out of 1 necessary copies
-
-  No other repository is known to contain the file.
-
-  (Use --force to override this check, or adjust annex.numcopies.)
-failed
-git-annex: drop: 1 failed
-/tmp/repo $ mv /tmp/file.bin /tmp/file2.bin 
-/tmp/repo $ git annex addurl file:///tmp/file2.bin --file annexed.bin
-addurl annexed.bin ok
-(Recording state in git...)
-/tmp/repo $ git annex whereis annexed2.bin 
-whereis annexed2.bin (2 copies) 
-        00000000-0000-0000-0000-000000000001 -- web
-        e2418e81-ec04-4091-aabe-ed75d65f93fa -- here (test)
-
-  web: file:///tmp/file.bin
-  web: file:///tmp/file2.bin
-ok
-/tmp/repo $ mv /tmp/file2.bin /tmp/file.bin 
-/tmp/repo $ git annex drop annexed.bin 
-drop annexed.bin (checking file:///tmp/file.bin...) ok
-(Recording state in git...)
-/tmp/repo $ git annex get annexed.bin 
-get annexed.bin (from web...) 
-######################################################################## 100.0%
-ok
-(Recording state in git...)
-/tmp/repo $ git annex drop annexed.bin 
-drop annexed.bin (checking file:///tmp/file.bin...) ok
-(Recording state in git...)
-/tmp/repo $ mv /tmp/file.bin /tmp/file2.bin 
-/tmp/repo $ git annex get annexed.bin 
-get annexed.bin (from web...) 
-curl: (37) Couldn't open file /tmp/file.bin
-######################################################################## 100.0%
-ok
-(Recording state in git...)
-</pre>
-
-#What is the expected output? What do you see inst
-
-
-When dropping one file and I see "git-annex: drop: 1 failed" I would expect the file to still be in the remote as far as git-annex is concerned.
-
-When re-adding the URL, I expect the file to be re-added to the web remote. (note that it re-appears after adding the same file via a different URL)
-
-
-#What version of git-annex are you using? On what operating system?
-
-
-3.20121112 on Gentoo Linux
-
-
-#Please provide any additional information below.
-
-This seems to be a corner case, and would probably have minimal impact on most people.
-
-> Yeah, dropping from the web is pretty weird.
-> 
-> I guess it makes sense to do if a website stops having a file and you don't
-> want git-annex to try to download from it anymore. So, I've made dropping
-> from the web remove all urls associated with the file, rather than failing.
-> 
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/dropunused_doesn__39__t_handle_double_spaces_in_filename.mdwn b/doc/bugs/dropunused_doesn__39__t_handle_double_spaces_in_filename.mdwn
deleted file mode 100644
--- a/doc/bugs/dropunused_doesn__39__t_handle_double_spaces_in_filename.mdwn
+++ /dev/null
@@ -1,87 +0,0 @@
-Unused files with double spaces in their name are not removed by `dropunused`:
-
-Script:
-
-    #!/bin/bash
-    
-    BASE=/tmp/unused-bug
-    
-    # setup
-    set -x
-    chmod -R +w $BASE
-    rm -rf $BASE
-    mkdir -p $BASE
-    cd $BASE
-    
-    # create annex
-    git init .
-    git annex init
-    
-    # make a file with two spaces
-    echo hello > 'foo  bar'
-    
-    # add it
-    git annex add --backend WORM 'foo  bar'
-    git commit -m 'add'
-    
-    # remove it
-    git rm 'foo  bar'
-    git commit -m 'remove'
-    
-    # unused
-    git annex unused
-    git annex dropunused 1
-    git annex unused
-
-Output:
-
-    + chmod -R +w /tmp/unused-bug
-    + rm -rf /tmp/unused-bug
-    + mkdir -p /tmp/unused-bug
-    + cd /tmp/unused-bug
-    + git init .
-    Initialized empty Git repository in /tmp/unused-bug/.git/
-    + git annex init
-    init  ok
-    + echo hello
-    + git annex add --backend WORM 'foo  bar'
-    add foo  bar ok
-    (Recording state in git...)
-    + git commit -m add
-    [master (root-commit) 926f7f5] add
-     1 files changed, 1 insertions(+), 0 deletions(-)
-     create mode 120000 foo  bar
-    + git rm 'foo  bar'
-    rm 'foo  bar'
-    + git commit -m remove
-    [master d025e3f] remove
-     1 files changed, 0 insertions(+), 1 deletions(-)
-     delete mode 120000 foo  bar
-    + git annex unused
-    unused . (checking for unused data...) (checking master...) 
-      Some annexed data is no longer used by any files:
-        NUMBER  KEY
-        1       WORM-s6-m1322200438--foo  bar
-      (To see where data was previously used, try: git log --stat -S'KEY')
-      
-      To remove unwanted data: git-annex dropunused NUMBER
-      
-    ok
-    + git annex dropunused 1
-    dropunused 1 ok
-    + git annex unused
-    unused . (checking for unused data...) (checking master...) 
-      Some annexed data is no longer used by any files:
-        NUMBER  KEY
-        1       WORM-s6-m1322200438--foo  bar
-      (To see where data was previously used, try: git log --stat -S'KEY')
-      
-      To remove unwanted data: git-annex dropunused NUMBER
-      
-    ok
-
-Strange that `dropunused` still said "ok" when it didn't succeed at removing the file.
-
-> It was misparsing the unused file, so it thought you'd asked it to drop a
-> key that didn't exist (which means already dropped) so no error. I've
-> fixed the bug. [[done]] --[[Joey]] 
diff --git a/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn b/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn
deleted file mode 100644
--- a/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn
+++ /dev/null
@@ -1,70 +0,0 @@
-What steps will reproduce the problem?
-
-I am unable to create a minimal setup to reproduce this unfortunately. But my case is the following:
-
-* Two synced repos, I have switched between direct and indirect in both, currently they are indirect
-* I have two submodules in the repos (not related to the unuesd files)
-
-* I used "git rm -r" to remove a bunch of files along with "git mv" to move some
-* I have three commits of actions like this
-
-* In one repo, the one where I did the deletions, I have 172 unused files, and all seem to come from the first of the three commits
-* In the second repo, to which I synced, I have 188 unused files, which includes a couple of files from the third commit as well
-
-* If I try to dropunused either a single file or the whole range of the files, from either repo, I get git-annex telling me "ok, recording state" but when I run unused again the files are still there. And looking into .git/objects/annex/ the file is still present
-
-This is the debug from the drop command:
-
-    dropunused 9 [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","git-annex"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..5f3fc9db5c7badb5fb25c3159c20584f11dadaf9","--oneline","-n1"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..8e5674078706864f2eade86d8aa43027e05afc1d","--oneline","-n1"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..cbe492cfa79728698f5d891d7f716fbcd9fc29e2","--oneline","-n1"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..48a1bdf98a10ad9a81c0587f8909e94c1c0dccc4","--oneline","-n1"]
-    [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","cat-file","--batch"]
-    [2013-02-07 12:47:24 CET] read: git ["config","--null","--list"]
-    [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","hash-object","-w","--stdin-paths"]
-    [2013-02-07 12:47:24 CET] feed: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-index","-z","--index-info"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"]
-    [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","write-tree"]
-    [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","commit-tree","76f5041bc6e8a109e0309a09b5f36cd0da8b204a","-p","refs/heads/git-annex"]
-    [2013-02-07 12:47:24 CET] call: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-ref","refs/heads/git-annex","96de755475bdd8f0f948dd6421c3956803a63e66"]
-    ok
-    (Recording state in git...)
-
-If I run it again, I get:
-
-    dropunused 9 [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","git-annex"]
-    [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"]
-    [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..96de755475bdd8f0f948dd6421c3956803a63e66","--oneline","-n1"]
-    [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..8e5674078706864f2eade86d8aa43027e05afc1d","--oneline","-n1"]
-    [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..cbe492cfa79728698f5d891d7f716fbcd9fc29e2","--oneline","-n1"]
-    [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..48a1bdf98a10ad9a81c0587f8909e94c1c0dccc4","--oneline","-n1"]
-    [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","cat-file","--batch"]
-    [2013-02-07 12:47:48 CET] read: git ["config","--null","--list"]
-    [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","hash-object","-w","--stdin-paths"]
-    [2013-02-07 12:47:48 CET] feed: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-index","-z","--index-info"]
-    [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"]
-    [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","write-tree"]
-    [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","commit-tree","e40d82db10c60519f6a3a72055e9577850972fdf","-p","refs/heads/git-annex"]
-    [2013-02-07 12:47:48 CET] call: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-ref","refs/heads/git-annex","6cf49f629251f9b39fa8b457cf6590c71c1d509b"]
-    ok
-    (Recording state in git...)
-
-
-What version of git-annex are you using? On what operating system?
-
-git-annex: 3.20130124
-Debian: sid 2013-02-01
-
-> I put a fix in for this in 57780cb3a4dfe1292b72e1412ec4d2a70b6d04ce 
-> but it was buggy and I had to revert it.
-> 
-> The bug is caused by direct mode cache and mapping info.
-> This makes getKeysPresent find keys that are not present.
-> It would be expensive to make getKeysPresent check that the
-> actual key files are present (it just lists the directories). 
-> But this seems to be needed, since direct mode can leave
-> cache and mapping files behind. --[[Joey]]
-
->> Now fixed properly. [[done]] --[[Joey]]
diff --git a/doc/bugs/enableremote_broken_with_direct_mode__63__.mdwn b/doc/bugs/enableremote_broken_with_direct_mode__63__.mdwn
deleted file mode 100644
--- a/doc/bugs/enableremote_broken_with_direct_mode__63__.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-### Please describe the problem.
-I have 2 regular annex locations plus one on glacier. I recently cloned one location, converted it to direct mode, then tried to enableremote glacier.
-
-When I ran the webapp everything seemed to be ok, it showed file transfers to glacier which appeared to be completing very quickly. When I looked in the log file however, I saw the files weren't actually transferring and I was getting lots of errors:
-
-  Set both AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY to use glacier
-
-In order to get glacier working I had to manually copy the creds file to the new repo. The transfer errors should also made obvious in the webapp.
-
-### What steps will reproduce the problem?
-[[!format sh """
-git clone server:/location
-git annex init "laptop"
-git remote add "server" server:/location
-git annex direct
-
-Then I ran:
-git annex enableremote glacier
-Which prints:
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-enableremote glacier (gpg) ok
-(Recording state in git...)
-"""]]
-But in fact it hasn't actually copied the creds to use it.
-
-
-### What version of git-annex are you using? On what operating system?
-5.20140221, debian.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Should be fixed in 5.20140227. [[done]] --[[Joey]]
diff --git a/doc/bugs/encrypted_S3_stalls.mdwn b/doc/bugs/encrypted_S3_stalls.mdwn
deleted file mode 100644
--- a/doc/bugs/encrypted_S3_stalls.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-Sending large-ish (few megabytes) files to encrypted S3 remotes stalls out.
-It works for the tiny files I was using to test while developing it, on
-dialup.
-
-There was a similar issue with bup, which I fixed by forking a process
-rather than using a thread to do some IO. Probably need the same here.
---[[Joey]]
-
-[[done]] --[[Joey]] 
diff --git a/doc/bugs/encryption_given_a_gpg_keyid_still_uses_symmetric_encryption.mdwn b/doc/bugs/encryption_given_a_gpg_keyid_still_uses_symmetric_encryption.mdwn
deleted file mode 100644
--- a/doc/bugs/encryption_given_a_gpg_keyid_still_uses_symmetric_encryption.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-What steps will reproduce the problem?
-    % > git annex initremote glacier type=glacier encryption=E9053BDA
-    -- SNIP --
-    initremote glacier [2013-01-10 14:50:12 PST] read: gpg ["--quiet","--trust-model","always","--with-colons","--list-public-keys","E9053BDA"]
-    [2013-01-10 14:50:12 PST] chat: gpg ["--quiet","--trust-model","always","--decrypt"]
-    
-    You need a passphrase to unlock the secret key for
-    user: "Andrew Mark Kraut <akraut@gmail.com>"
-    4096-bit ELG key, ID 353E49B9, created 2008-11-11 (main key ID E9053BDA)
-    
-    [2013-01-10 14:50:13 PST] chat: gpg ["--quiet","--trust-model","always","--encrypt","--no-encrypt-to","--no-default-recipient","--recipient","B608B8F6E9053BDA"]
-    (encryption updated with gpg key B608B8F6E9053BDA) [2013-01-10 14:50:13 PST] call: glacier ["--region=us-west-1","vault","create","glacier-06D927EC-5761-447B-86AC-CA66040BAC25"]
-    [2013-01-10 14:50:13 PST] call: git ["--git-dir=/Users/akraut/Desktop/annex/.git","--work-tree=/Users/akraut/Desktop/annex","config","remote.glacier.annex-glacier","true"]
-    [2013-01-10 14:50:13 PST] call: git ["--git-dir=/Users/akraut/Desktop/annex/.git","--work-tree=/Users/akraut/Desktop/annex","config","remote.glacier.annex-uuid","06D927EC-5761-447B-86AC-CA66040BAC25"]
-    (gpg) [2013-01-10 14:50:13 PST] chat: gpg ["--quiet","--trust-model","always","--decrypt"]
-    
-    You need a passphrase to unlock the secret key for
-    user: "Andrew Mark Kraut <akraut@gmail.com>"
-    4096-bit ELG key, ID 353E49B9, created 2008-11-11 (main key ID E9053BDA)
-    
-    [2013-01-10 14:50:14 PST] chat: gpg ["--quiet","--trust-model","always","--passphrase-fd","8","--symmetric","--force-mdc"]
-    ok
-
-What is the expected output? What do you see instead?
-
-> I expect any transfers to this remote (glacier) to use the given gpg key, but instead it uses --symmetric, as you can see above.
-
-What version of git-annex are you using? On what operating system?
-
-    git-annex version: 3.20130107
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-
-
-Please provide any additional information below.
-
-> Symmetric encryption is used as described in [[design/encryption]],
-> with the symmetric key stored encrypted using your gpg key.
-> 
-> The extra prompting described in the comments in the bug.
-> 
-> I've reproduced this with gpg 2.0.19. It is a documented incompatability
-> between gpg 1.x and 2.x; the latter needs --batch included in its
-> parameters. I've put in a fix. [[done]]
diff --git a/doc/bugs/encryption_key_is_surprising.mdwn b/doc/bugs/encryption_key_is_surprising.mdwn
deleted file mode 100644
--- a/doc/bugs/encryption_key_is_surprising.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-Crypto.hs seems to imply that the cipher key it's acting upon is 512 bytes long. Because of a probable programming mistake the key that's actually used is a bit surprising. The random key is generated by this snippet in Utility/Gpg.hs:
-
-    {- Creates a block of high-quality random data suitable to use as a cipher.
-     - It is armored, to avoid newlines, since gpg only reads ciphers up to the
-     - first newline. -}
-    genRandom :: Int -> IO String
-    genRandom size = readStrict
-        [ Params "--gen-random --armor"
-        , Param $ show randomquality
-        , Param $ show size
-        ]
-      where
-        -- 1 is /dev/urandom; 2 is /dev/random
-        randomquality = 1 :: Int
-
-This lets GPG generate the randomness and by passing armor, it avoids newlines. However, this base64 encoding is never undone on the way to Crypto.hs. Hence what cipherPassphrase and cipherHmac do is dropping or skipping the first 256 bytes of the base64 value. Base64, with its 6 bit per byte encoding, causes the Hmac function to operate on 192 bytes instead of 256 bytes. The key used by GPG will be larger. Some assertions that the resulting functions really operate on strings of the right length would've been helpful. Also GPG and HMAC get tested, the encryption/decryption part are not tested AFAICS.
-
-The encryption wiki page could have had more information. Enough code (sadly in Python, not reusing the Haskell code) to operate on the resulting files can be found in [this Gist](https://gist.github.com/pkern/5078559).
-
--- Philipp Kern
-
-> In addition to the comment below, I have added a check that gpg outputs
-> the expected quantity of data, and the storage of the cipher is now
-> documented in [[internals]]. Think I can call this [[done]]. --[[Joey]]
diff --git a/doc/bugs/error_building_git-annex_3.20120624_using_cabal.mdwn b/doc/bugs/error_building_git-annex_3.20120624_using_cabal.mdwn
deleted file mode 100644
--- a/doc/bugs/error_building_git-annex_3.20120624_using_cabal.mdwn
+++ /dev/null
@@ -1,159 +0,0 @@
-I am trying to install git-annex 3.20120624 using cabal.  My currently installed version of git-annex is 3.20120615.  After a "cabal update", the build of git-annex fails:
-
-    bram@falafel% cabal install git-annex
-    Resolving dependencies...
-    [1 of 4] Compiling Utility.SafeCommand ( /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/Utility/SafeCommand.hs, /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/dist/setup/Utility/SafeCommand.o )
-    [2 of 4] Compiling Build.TestConfig ( /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/Build/TestConfig.hs, /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/dist/setup/Build/TestConfig.o )
-    [3 of 4] Compiling Build.Configure  ( /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/Build/Configure.hs, /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/dist/setup/Build/Configure.o )
-    [4 of 4] Compiling Main             ( /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/Setup.hs, /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/dist/setup/Main.o )
-    Linking /tmp/git-annex-3.20120624-4173/git-annex-3.20120624/dist/setup/setup ...
-      checking version... 3.20120624
-      checking git... yes
-      checking git version... 1.7.9.5
-      checking cp -a... yes
-      checking cp -p... yes
-      checking cp --reflink=auto... yes
-      checking uuid generator... uuid
-      checking xargs -0... yes
-      checking rsync... yes
-      checking curl... no
-      checking wget... yes
-      checking bup... no
-      checking gpg... yes
-      checking lsof... yes
-      checking ssh connection caching... yes
-      checking sha1... sha1sum
-      checking sha512... sha512sum
-      checking sha224... sha224sum
-      checking sha384... sha384sum
-      checking sha256... sha256sum
-    Configuring git-annex-3.20120624...
-    Building git-annex-3.20120624...
-    Preprocessing executable 'git-annex' for git-annex-3.20120624...
-    [  1 of 183] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o )
-    [  2 of 183] Compiling Utility.Dot      ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o )
-    [  3 of 183] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o )
-    [  4 of 183] Compiling Utility.Base64   ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o )
-    [  5 of 183] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o )
-    [  6 of 183] Compiling Utility.JSONStream ( Utility/JSONStream.hs, dist/build/git-annex/git-annex-tmp/Utility/JSONStream.o )
-    [  7 of 183] Compiling Messages.JSON    ( Messages/JSON.hs, dist/build/git-annex/git-annex-tmp/Messages/JSON.o )
-    [  8 of 183] Compiling Build.SysConfig  ( Build/SysConfig.hs, dist/build/git-annex/git-annex-tmp/Build/SysConfig.o )
-    [  9 of 183] Compiling Types.KeySource  ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o )
-    [ 10 of 183] Compiling Types.UUID       ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o )
-    [ 11 of 183] Compiling Utility.State    ( Utility/State.hs, dist/build/git-annex/git-annex-tmp/Utility/State.o )
-    [ 12 of 183] Compiling Types.Messages   ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o )
-    [ 13 of 183] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o )
-    [ 14 of 183] Compiling Types.BranchState ( Types/BranchState.hs, dist/build/git-annex/git-annex-tmp/Types/BranchState.o )
-    [ 15 of 183] Compiling Git.Index        ( Git/Index.hs, dist/build/git-annex/git-annex-tmp/Git/Index.o )
-    [ 16 of 183] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o )
-    [ 17 of 183] Compiling Utility.Format   ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o )
-    [ 18 of 183] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o )
-    [ 19 of 183] Compiling Utility.Touch    ( dist/build/git-annex/git-annex-tmp/Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o )
-    [ 20 of 183] Compiling Utility.Monad    ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o )
-    [ 21 of 183] Compiling Utility.Path     ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o )
-    [ 22 of 183] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o )
-    [ 23 of 183] Compiling Utility.RsyncFile ( Utility/RsyncFile.hs, dist/build/git-annex/git-annex-tmp/Utility/RsyncFile.o )
-    [ 24 of 183] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o )
-    [ 25 of 183] Compiling Utility.TempFile ( Utility/TempFile.hs, dist/build/git-annex/git-annex-tmp/Utility/TempFile.o )
-    [ 26 of 183] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o )
-    [ 27 of 183] Compiling Utility.Misc     ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o )
-    [ 28 of 183] Compiling Git.Types        ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o )
-    [ 29 of 183] Compiling Common           ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o )
-    [ 30 of 183] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o )
-    [ 31 of 183] Compiling Git              ( Git.hs, dist/build/git-annex/git-annex-tmp/Git.o )
-    [ 32 of 183] Compiling Git.Command      ( Git/Command.hs, dist/build/git-annex/git-annex-tmp/Git/Command.o )
-    [ 33 of 183] Compiling Git.Ref          ( Git/Ref.hs, dist/build/git-annex/git-annex-tmp/Git/Ref.o )
-    [ 34 of 183] Compiling Git.FilePath     ( Git/FilePath.hs, dist/build/git-annex/git-annex-tmp/Git/FilePath.o )
-    [ 35 of 183] Compiling Utility.Matcher  ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o )
-    [ 36 of 183] Compiling Utility.Gpg      ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o )
-    [ 37 of 183] Compiling Types.Crypto     ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o )
-    [ 38 of 183] Compiling Types.Key        ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o )
-    [ 39 of 183] Compiling Types.Backend    ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o )
-    [ 40 of 183] Compiling Types.Remote     ( Types/Remote.hs, dist/build/git-annex/git-annex-tmp/Types/Remote.o )
-    [ 41 of 183] Compiling Git.Sha          ( Git/Sha.hs, dist/build/git-annex/git-annex-tmp/Git/Sha.o )
-    [ 42 of 183] Compiling Git.Branch       ( Git/Branch.hs, dist/build/git-annex/git-annex-tmp/Git/Branch.o )
-    [ 43 of 183] Compiling Git.UpdateIndex  ( Git/UpdateIndex.hs, dist/build/git-annex/git-annex-tmp/Git/UpdateIndex.o )
-    [ 44 of 183] Compiling Git.Queue        ( Git/Queue.hs, dist/build/git-annex/git-annex-tmp/Git/Queue.o )
-    [ 45 of 183] Compiling Git.Url          ( Git/Url.hs, dist/build/git-annex/git-annex-tmp/Git/Url.o )
-    [ 46 of 183] Compiling Git.Construct    ( Git/Construct.hs, dist/build/git-annex/git-annex-tmp/Git/Construct.o )
-    [ 47 of 183] Compiling Git.Config       ( Git/Config.hs, dist/build/git-annex/git-annex-tmp/Git/Config.o )
-    [ 48 of 183] Compiling Git.SharedRepository ( Git/SharedRepository.hs, dist/build/git-annex/git-annex-tmp/Git/SharedRepository.o )
-    [ 49 of 183] Compiling Git.Version      ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o )
-    [ 50 of 183] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o )
-    [ 51 of 183] Compiling Git.HashObject   ( Git/HashObject.hs, dist/build/git-annex/git-annex-tmp/Git/HashObject.o )
-    [ 52 of 183] Compiling Git.CatFile      ( Git/CatFile.hs, dist/build/git-annex/git-annex-tmp/Git/CatFile.o )
-    [ 53 of 183] Compiling Git.UnionMerge   ( Git/UnionMerge.hs, dist/build/git-annex/git-annex-tmp/Git/UnionMerge.o )
-    [ 54 of 183] Compiling Git.CheckAttr    ( Git/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Git/CheckAttr.o )
-    [ 55 of 183] Compiling Annex            ( Annex.hs, dist/build/git-annex/git-annex-tmp/Annex.o )
-    [ 56 of 183] Compiling Types.Option     ( Types/Option.hs, dist/build/git-annex/git-annex-tmp/Types/Option.o )
-    [ 57 of 183] Compiling Types            ( Types.hs, dist/build/git-annex/git-annex-tmp/Types.o )
-    [ 58 of 183] Compiling Messages         ( Messages.hs, dist/build/git-annex/git-annex-tmp/Messages.o )
-    [ 59 of 183] Compiling Types.Command    ( Types/Command.hs, dist/build/git-annex/git-annex-tmp/Types/Command.o )
-    [ 60 of 183] Compiling Locations        ( Locations.hs, dist/build/git-annex/git-annex-tmp/Locations.o )
-    [ 61 of 183] Compiling Common.Annex     ( Common/Annex.hs, dist/build/git-annex/git-annex-tmp/Common/Annex.o )
-    [ 62 of 183] Compiling Annex.Exception  ( Annex/Exception.hs, dist/build/git-annex/git-annex-tmp/Annex/Exception.o )
-    [ 63 of 183] Compiling Annex.BranchState ( Annex/BranchState.hs, dist/build/git-annex/git-annex-tmp/Annex/BranchState.o )
-    [ 64 of 183] Compiling Annex.CatFile    ( Annex/CatFile.hs, dist/build/git-annex/git-annex-tmp/Annex/CatFile.o )
-    [ 65 of 183] Compiling Annex.Perms      ( Annex/Perms.hs, dist/build/git-annex/git-annex-tmp/Annex/Perms.o )
-    [ 66 of 183] Compiling Annex.Journal    ( Annex/Journal.hs, dist/build/git-annex/git-annex-tmp/Annex/Journal.o )
-    [ 67 of 183] Compiling Annex.Branch     ( Annex/Branch.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch.o )
-    [ 68 of 183] Compiling Crypto           ( Crypto.hs, dist/build/git-annex/git-annex-tmp/Crypto.o )
-    [ 69 of 183] Compiling Usage            ( Usage.hs, dist/build/git-annex/git-annex-tmp/Usage.o )
-    [ 70 of 183] Compiling Annex.CheckAttr  ( Annex/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckAttr.o )
-    [ 71 of 183] Compiling Remote.Helper.Special ( Remote/Helper/Special.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Special.o )
-    [ 72 of 183] Compiling Logs.Presence    ( Logs/Presence.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence.o )
-    [ 73 of 183] Compiling Logs.Location    ( Logs/Location.hs, dist/build/git-annex/git-annex-tmp/Logs/Location.o )
-    [ 74 of 183] Compiling Logs.Web         ( Logs/Web.hs, dist/build/git-annex/git-annex-tmp/Logs/Web.o )
-    [ 75 of 183] Compiling Annex.LockPool   ( Annex/LockPool.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool.o )
-    [ 76 of 183] Compiling Backend.SHA      ( Backend/SHA.hs, dist/build/git-annex/git-annex-tmp/Backend/SHA.o )
-    [ 77 of 183] Compiling Backend.WORM     ( Backend/WORM.hs, dist/build/git-annex/git-annex-tmp/Backend/WORM.o )
-    [ 78 of 183] Compiling Backend.URL      ( Backend/URL.hs, dist/build/git-annex/git-annex-tmp/Backend/URL.o )
-    [ 79 of 183] Compiling Assistant.ThreadedMonad ( Assistant/ThreadedMonad.hs, dist/build/git-annex/git-annex-tmp/Assistant/ThreadedMonad.o )
-    [ 80 of 183] Compiling Logs.UUIDBased   ( Logs/UUIDBased.hs, dist/build/git-annex/git-annex-tmp/Logs/UUIDBased.o )
-    [ 81 of 183] Compiling Logs.Remote      ( Logs/Remote.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote.o )
-    [ 82 of 183] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o )
-    [ 83 of 183] Compiling Utility.Url      ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o )
-    [ 84 of 183] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o )
-    [ 85 of 183] Compiling Git.LsFiles      ( Git/LsFiles.hs, dist/build/git-annex/git-annex-tmp/Git/LsFiles.o )
-    [ 86 of 183] Compiling Git.AutoCorrect  ( Git/AutoCorrect.hs, dist/build/git-annex/git-annex-tmp/Git/AutoCorrect.o )
-    [ 87 of 183] Compiling Git.CurrentRepo  ( Git/CurrentRepo.hs, dist/build/git-annex/git-annex-tmp/Git/CurrentRepo.o )
-    [ 88 of 183] Compiling Utility.Daemon   ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o )
-    [ 89 of 183] Compiling Utility.LogFile  ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o )
-    [ 90 of 183] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o )
-    [ 91 of 183] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/DaemonStatus.o )
-    [ 92 of 183] Compiling Utility.Types.DirWatcher ( Utility/Types/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Types/DirWatcher.o )
-    [ 93 of 183] Compiling Utility.INotify  ( Utility/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/INotify.o )
-    [ 94 of 183] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o )
-    [ 95 of 183] Compiling Utility.Lsof     ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o )
-    [ 96 of 183] Compiling Git.Merge        ( Git/Merge.hs, dist/build/git-annex/git-annex-tmp/Git/Merge.o )
-    [ 97 of 183] Compiling Git.Filename     ( Git/Filename.hs, dist/build/git-annex/git-annex-tmp/Git/Filename.o )
-    [ 98 of 183] Compiling Git.LsTree       ( Git/LsTree.hs, dist/build/git-annex/git-annex-tmp/Git/LsTree.o )
-    [ 99 of 183] Compiling Config           ( Config.hs, dist/build/git-annex/git-annex-tmp/Config.o )
-    [100 of 183] Compiling Annex.UUID       ( Annex/UUID.hs, dist/build/git-annex/git-annex-tmp/Annex/UUID.o )
-    [101 of 183] Compiling Logs.UUID        ( Logs/UUID.hs, dist/build/git-annex/git-annex-tmp/Logs/UUID.o )
-    [102 of 183] Compiling Backend          ( Backend.hs, dist/build/git-annex/git-annex-tmp/Backend.o )
-    [103 of 183] Compiling Remote.Helper.Hooks ( Remote/Helper/Hooks.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Hooks.o )
-    [104 of 183] Compiling Remote.Helper.Encryptable ( Remote/Helper/Encryptable.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Encryptable.o )
-    [105 of 183] Compiling Annex.Queue      ( Annex/Queue.hs, dist/build/git-annex/git-annex-tmp/Annex/Queue.o )
-    [106 of 183] Compiling Annex.Content    ( Annex/Content.hs, dist/build/git-annex/git-annex-tmp/Annex/Content.o )
-    [107 of 183] Compiling Remote.S3        ( Remote/S3.hs, dist/build/git-annex/git-annex-tmp/Remote/S3.o )
-    [108 of 183] Compiling Remote.Directory ( Remote/Directory.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory.o )
-    [109 of 183] Compiling Remote.Rsync     ( Remote/Rsync.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync.o )
-    [110 of 183] Compiling Remote.Web       ( Remote/Web.hs, dist/build/git-annex/git-annex-tmp/Remote/Web.o )
-    [111 of 183] Compiling Remote.Hook      ( Remote/Hook.hs, dist/build/git-annex/git-annex-tmp/Remote/Hook.o )
-    [112 of 183] Compiling Upgrade.V2       ( Upgrade/V2.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V2.o )
-    [113 of 183] Compiling Assistant.Changes ( Assistant/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Changes.o )
-    
-    Assistant/Changes.hs:73:30:
-        Not in scope: `tryReadTChan'
-        Perhaps you meant `readTChan' (imported from Control.Concurrent.STM)
-    cabal: Error: some packages failed to install:
-    git-annex-3.20120624 failed during the building phase. The exception was:
-    ExitFailure 1
-
-This is using haskell-platform 2012.1.0.0~debian1 on Ubuntu 12.04.
-
-> Turns out it needs version 2.3 of the STM library. (libghc-stm-dev
-> package). I've made cabal detect an older version and skip building
-> the new `git annex watch` command, so you'll be able to build the next
-> release. [[done]] --[[Joey]]
diff --git a/doc/bugs/error_propigation.mdwn b/doc/bugs/error_propigation.mdwn
deleted file mode 100644
--- a/doc/bugs/error_propigation.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-If a subcommand fails w/o throwing an error, no error is propigated to the
-git-annex exit code. With --quiet, this makes it look like the command
-succeeded. [[done]]
diff --git a/doc/bugs/error_when_using_repositories_with_non-ASCII_characters.mdwn b/doc/bugs/error_when_using_repositories_with_non-ASCII_characters.mdwn
deleted file mode 100644
--- a/doc/bugs/error_when_using_repositories_with_non-ASCII_characters.mdwn
+++ /dev/null
@@ -1,62 +0,0 @@
-*What steps will reproduce the problem?*
-
-    hactar% mkdir demonstração
-    hactar% cd demonstração
-    hactar% cp ~/tmp/*(.) .
-    hactar% git init
-    Initialized empty Git repository in /tmp/demonstração/.git/
-    hactar% git annex init
-    init  ok
-    (Recording state in git...)
-    hactar% git annex add .
-    add Equipment Consumption.ods (checksum...) ok
-    add Personal.vcard (checksum...) ok
-    add Trampo.vcard (checksum...) ok
-    add blah.txt (checksum...) ok
-    [ more git output ]
-    hactar% git commit -m initial
-    [master (root-commit) d16bafb] initial
-     42 files changed, 42 insertions(+)
-    [ more git output ]
-    hactar% cd /var/tmp
-    hactar% git clone ssh://localhost//tmp/demonstração demonstração
-    Cloning into 'demonstração'...
-    remote: Counting objects: 176, done.
-    remote: Compressing objects: 100% (134/134), done.
-    remote: Total 176 (delta 1), reused 0 (delta 0)
-    Receiving objects: 100% (176/176), 17.23 KiB, done.
-    Resolving deltas: 100% (1/1), done.
-    hactar% cd demonstração
-    hactar% git annex init
-    init  ok
-    (Recording state in git...)
-    hactar% git annex status
-    supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-    supported remote types: git S3 bup directory rsync web hook
-    trusted repositories: (merging origin/git-annex into git-annex...)
-
-    git-annex: fd:14: commitBuffer: invalid argument (invalid character)
-    failed
-    git-annex: status: 1 failed
-
-*What is the expected output? What do you see instead?*
-
-I expect that "git annex status" will complete successfuly and show information about all repositories.
-Instead of that I get the "git-annex: fd:14: commitBuffer: invalid argument (invalid character)" error above.
-
-*What version of git-annex are you using? On what operating system?*
-
-This is with Debian's git-annex_3.20121001_i386.deb installed on an Ubuntu 12.04 system.
-Using Ubuntu's original version (3.20120406) the error message is a bit different (here I used the name acentuação instead of demonstração):
-
-    trusted repositories: git-annex-shell: //tmp/acentuação: changeWorkingDirectory: does not exist (No such file or directory)
-    Command ssh ["-S","/var/tmp/acentua\231\227o/.git/annex/ssh/localhost","-o","ControlMaster=auto","-o","ControlPersist=yes","localhost","git-annex-shell 'configlist' '//tmp/acentua\195\167\195\163o'"] failed; exit code 1
-
-> I think this is the last unvalid utf-8 bug in git-annex. At least,
-> the last one I hypothesized exists. It's in the union merge code. I will
-> try to look at it again soon; the last 2 times I looked at that code
-> I could not see an easy way to make it allow invalid utf-8 encoded data.
-> --[[Joey]] 
-
->> [[done]], although I am no longer so sure this was the last utf-8
->> encoding bug.. --[[Joey]]
diff --git a/doc/bugs/error_with_file_names_starting_with_dash.mdwn b/doc/bugs/error_with_file_names_starting_with_dash.mdwn
deleted file mode 100644
--- a/doc/bugs/error_with_file_names_starting_with_dash.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-git annex add has problems if items start with dashes, example:
-
--wut-a-directory-name-/file1
-
-leads to
-
-[[!format bash """
-add -wut-a-directory-name-/file1 (checksum...) sha1sum: invalid option -- 'u'
-„sha1sum --help“ gibt weitere Informationen.
-
-  git-annex: <file descriptor: 15>: hGetLine: end of file
-"""]]
-
-> This is fixed in git, at least I think I've found all cases where
-> filenames are passed to programs and escaped them. --[[Joey]] [[done]]
diff --git a/doc/bugs/fails_to_handle_lot_of_files.mdwn b/doc/bugs/fails_to_handle_lot_of_files.mdwn
deleted file mode 100644
--- a/doc/bugs/fails_to_handle_lot_of_files.mdwn
+++ /dev/null
@@ -1,445 +0,0 @@
-    git-annex version: 3.20111011
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-
-I just created a new remote on a USB drive and wanted to copy my files over. git-annex wasn't too happy about that ;)
-I included a few OK transfers as there was an error before git-annex ran into a wall. As I could easily access that temp file after it aborted, I suspect something went wrong internally before git-annex started to throw those errors.
-
-Please note the "_n TIMES_" comments. It's how often I got the same error message...
-
-
-
-    git annex copy . --to USB --fast
-    
-    copy redacted.JPG (to USB...) 
-    redacted
-         4035668 100%   77.91MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4036374 bytes  received 31 bytes  8072810.00 bytes/sec
-    total size is 4035668  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18002094 100%   74.19MB/s    0:00:00 (xfer#1, to-check=0/1)
-    WARNING: redacted failed verification -- update retained (will try again).
-    redacted
-        18002094 100%   19.60MB/s    0:00:00 (xfer#2, to-check=0/1)
-    rsync: open "copy_target/.git/annex/tmp/redacted_E13" failed: Permission denied (13)
-    
-    sent 36008841 bytes  received 52 bytes  24005928.67 bytes/sec
-    total size is 18002094  speedup is 0.50
-    rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1070) [sender=3.0.8]
-    
-      rsync failed -- run git annex again to resume file transfer
-    failed
-    copy redacted.JPG (to USB...) 
-    redacted
-         3687111 100%   39.16MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 3687773 bytes  received 31 bytes  2458536.00 bytes/sec
-    total size is 3687111  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17877177 100%   79.15MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17879573 bytes  received 31 bytes  11919736.00 bytes/sec
-    total size is 17877177  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         3694921 100%   40.14MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 3695583 bytes  received 31 bytes  2463742.67 bytes/sec
-    total size is 3694921  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17875448 100%   71.20MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17877844 bytes  received 31 bytes  11918583.33 bytes/sec
-    total size is 17875448  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         3833377 100%   62.49MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 3834055 bytes  received 31 bytes  2556057.33 bytes/sec
-    total size is 3833377  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17938200 100%   65.43MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17940604 bytes  received 31 bytes  11960423.33 bytes/sec
-    total size is 17938200  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4512557 100%   83.77MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4513319 bytes  received 31 bytes  3008900.00 bytes/sec
-    total size is 4512557  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18001641 100%   76.16MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18004053 bytes  received 31 bytes  12002722.67 bytes/sec
-    total size is 18001641  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4394272 100%   50.11MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4395022 bytes  received 31 bytes  8790106.00 bytes/sec
-    total size is 4394272  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18095781 100%   73.30MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18098205 bytes  received 31 bytes  12065490.67 bytes/sec
-    total size is 18095781  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4683795 100%   65.23MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4684577 bytes  received 31 bytes  9369216.00 bytes/sec
-    total size is 4683795  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18172801 100%   74.25MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18175233 bytes  received 31 bytes  36350528.00 bytes/sec
-    total size is 18172801  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4486231 100%   77.22MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4486989 bytes  received 31 bytes  8974040.00 bytes/sec
-    total size is 4486231  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17860427 100%   68.56MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17862823 bytes  received 31 bytes  35725708.00 bytes/sec
-    total size is 17860427  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4499768 100%   36.41MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4500530 bytes  received 31 bytes  9001122.00 bytes/sec
-    total size is 4499768  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17840132 100%   74.48MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17842524 bytes  received 31 bytes  11895036.67 bytes/sec
-    total size is 17840132  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4358032 100%   75.00MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4358774 bytes  received 31 bytes  8717610.00 bytes/sec
-    total size is 4358032  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18084753 100%   61.48MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18087173 bytes  received 31 bytes  12058136.00 bytes/sec
-    total size is 18084753  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4270213 100%   68.49MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4270947 bytes  received 31 bytes  2847318.67 bytes/sec
-    total size is 4270213  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17661246 100%   68.34MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17663614 bytes  received 31 bytes  11775763.33 bytes/sec
-    total size is 17661246  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4538305 100%   63.19MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4539071 bytes  received 31 bytes  9078204.00 bytes/sec
-    total size is 4538305  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18672466 100%   68.90MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18674958 bytes  received 31 bytes  12449992.67 bytes/sec
-    total size is 18672466  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4453445 100%   73.96MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4454199 bytes  received 31 bytes  8908460.00 bytes/sec
-    total size is 4453445  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18495494 100%   59.28MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18497966 bytes  received 31 bytes  12331998.00 bytes/sec
-    total size is 18495494  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4255858 100%   70.66MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4256588 bytes  received 31 bytes  1702647.60 bytes/sec
-    total size is 4255858  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18376531 100%   69.15MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18378987 bytes  received 31 bytes  36758036.00 bytes/sec
-    total size is 18376531  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4013365 100%   48.67MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4014067 bytes  received 31 bytes  8028196.00 bytes/sec
-    total size is 4013365  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17606341 100%   51.73MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17608705 bytes  received 31 bytes  11739157.33 bytes/sec
-    total size is 17606341  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4179869 100%   74.62MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4180591 bytes  received 31 bytes  8361244.00 bytes/sec
-    total size is 4179869  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18382569 100%   67.05MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18385025 bytes  received 31 bytes  12256704.00 bytes/sec
-    total size is 18382569  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4318363 100%   44.91MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4319101 bytes  received 31 bytes  8638264.00 bytes/sec
-    total size is 4318363  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17715958 100%   72.69MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17718334 bytes  received 31 bytes  11812243.33 bytes/sec
-    total size is 17715958  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4241893 100%   65.81MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4242623 bytes  received 31 bytes  8485308.00 bytes/sec
-    total size is 4241893  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17717287 100%   71.77MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17719663 bytes  received 31 bytes  11813129.33 bytes/sec
-    total size is 17717287  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4488380 100%   49.99MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4489138 bytes  received 31 bytes  2992779.33 bytes/sec
-    total size is 4488380  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        17770208 100%   38.80MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 17772592 bytes  received 31 bytes  11848415.33 bytes/sec
-    total size is 17770208  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4603958 100%   76.48MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4604732 bytes  received 31 bytes  9209526.00 bytes/sec
-    total size is 4603958  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18744380 100%   74.66MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18746884 bytes  received 31 bytes  12497943.33 bytes/sec
-    total size is 18744380  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4592098 100%   79.06MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4592872 bytes  received 31 bytes  3061935.33 bytes/sec
-    total size is 4592098  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18746205 100%   43.00MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18748709 bytes  received 31 bytes  12499160.00 bytes/sec
-    total size is 18746205  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         7493353 100%   80.85MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 7494479 bytes  received 31 bytes  14989020.00 bytes/sec
-    total size is 7493353  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        19496768 100%   81.77MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 19499360 bytes  received 31 bytes  12999594.00 bytes/sec
-    total size is 19496768  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         5462482 100%   82.19MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 5463360 bytes  received 31 bytes  10926782.00 bytes/sec
-    total size is 5462482  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        19669815 100%   80.37MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 19672431 bytes  received 31 bytes  13114974.67 bytes/sec
-    total size is 19669815  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         5449487 100%   57.40MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 5450365 bytes  received 31 bytes  3633597.33 bytes/sec
-    total size is 5449487  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        19633259 100%   74.18MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 19635871 bytes  received 31 bytes  13090601.33 bytes/sec
-    total size is 19633259  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         5392184 100%   62.33MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 5393054 bytes  received 31 bytes  3595390.00 bytes/sec
-    total size is 5392184  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        18912104 100%   65.00MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 18914628 bytes  received 31 bytes  12609772.67 bytes/sec
-    total size is 18912104  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4869300 100%   80.92MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4870106 bytes  received 31 bytes  9740274.00 bytes/sec
-    total size is 4869300  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        20178932 100%   68.13MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 20181608 bytes  received 31 bytes  13454426.00 bytes/sec
-    total size is 20178932  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         4995425 100%   86.05MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 4996247 bytes  received 31 bytes  9992556.00 bytes/sec
-    total size is 4995425  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        19970679 100%   76.36MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 19973331 bytes  received 31 bytes  13315574.67 bytes/sec
-    total size is 19970679  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         7905795 100%   66.45MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 7906973 bytes  received 31 bytes  15814008.00 bytes/sec
-    total size is 7905795  speedup is 1.00
-    ok
-    copy redacted.NEF (to USB...) 
-    redacted
-        21234069 100%   78.07MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 21236877 bytes  received 31 bytes  8494763.20 bytes/sec
-    total size is 21234069  speedup is 1.00
-    ok
-    copy redacted.JPG (to USB...) 
-    redacted
-         7963979 100%   62.51MB/s    0:00:00 (xfer#1, to-check=0/1)
-    
-    sent 7965165 bytes  received 31 bytes  5310130.67 bytes/sec
-    total size is 7963979  speedup is 1.00
-    git ["--git-dir=copy_target/.git","--work-tree=copy_target","update-index","-z","--index-info"]: Error in fork: forkProcess: resource exhausted (Resource temporarily unavailable)
-    
-    git-annex: user error (git ["--git-dir=copy_target/.git","--work-tree=copy_target","update-index","-z","--index-info"]: Error in fork: forkProcess: resource exhausted (Resource temporarily unavailable))
-    failed
-    _506 TIMES_ (user error (Error in fork: forkProcess: resource exhausted (Resource temporarily unavailable))) failed
-    _11 TIMES_ copy foo (createPipe: resource exhausted (Too many open files)) failed
-    _2 TIMES_ (user error (Error in fork: forkProcess: resource exhausted (Resource temporarily unavailable))) failed
-    _8574 TIMES_: copy foo (createPipe: resource exhausted (Too many open files)) failed
-    git-annex: createPipe: resource exhausted (Too many open files)
-    failed
-    git-annex: 9101 failed
-    
-    % ls copy_target/.git/annex/tmp/redacted_E13 copy_target/.git/annex/tmp/SHA512E-redacted_E13 # works
-    % find source -type l | wc -l
-    13554
-    % find copy_target -type l | wc -l
-    13554
-    % find copy_target/.git/annex/objects -type f | wc -l
-    4455
-    % find source -type f | wc -l
-    13554
-
-> Fixed unreaped process leak.
-> (This has nothing to do with NTFS). Ran test with 10k files
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/file_access__47__locking_issues_with_the_assitant.mdwn b/doc/bugs/file_access__47__locking_issues_with_the_assitant.mdwn
deleted file mode 100644
--- a/doc/bugs/file_access__47__locking_issues_with_the_assitant.mdwn
+++ /dev/null
@@ -1,54 +0,0 @@
-### Please describe the problem.
-
-I have a latex file which takes two passes to build.  It is in a directory managed by git-annex assistant and configured to use a remote SSH server as a transfer back-end.
-
-If I use latexmk to build the file with the git-assistant on then the build fails.  If I turn off the git-assistant it succeeds.
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-~/current/www.cmt.mhs.man.ac.uk $ git-annex assistant --autostart
-~/current/www.cmt.mhs.man.ac.uk $ latexmk -c admin_guide_cmt.tex
-~/current/www.cmt.mhs.man.ac.uk $ latexmk -pdf -silent admin_guide_cmt.tex
-
-Latexmk: Run number 1 of rule 'pdflatex'
-This is pdfTeX, Version 3.1415926-2.5-1.40.13 (TeX Live 2013/dev)
- restricted \write18 enabled.
-entering extended mode
-print() on closed filehandle GEN32 at /usr/bin/latexmk line 4742.
-print() on closed filehandle GEN32 at /usr/bin/latexmk line 4759.
-print() on closed filehandle GEN32 at /usr/bin/latexmk line 4761.
-"""]]
-
-Dropping the silent option shows that the admin_guide_cmt.aux file is not available for writing - despite being created.  I suspect that the assistant is somehow locking the file, or using it between passes of latex.  If the auxillary files all ready exist then there is no problem (i.e., don't do the cleanup via latexmk -c)
-
-Disabling the assistant makes everything work.  Latexmk is doing something odd - I can't replicate with the native latex build commands.
-
-### What version of git-annex are you using? On what operating system?
-
-Latest version, via cabal, on Fedora 18.
-
-### Please provide any additional information below.
-
-Nothing appears wrong with the assistant transfer wise.
-[[!format sh """
-add www.cmt.mhs.man.ac.uk/admin_guide_cmt.aux (checksum...) ok
-add www.cmt.mhs.man.ac.uk/admin_guide_cmt.fdb_latexmk (checksum...) [2013-06-11 14:42:17 BST] Committer: Committing changes to g
-it                                                                                                                             
-admin_guide_cmt.fdb_latexmk
-         264 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 372 bytes  received 42 bytes  828.00 bytes/sec
-total size is 264  speedup is 0.64
-[2013-06-11 14:42:17 BST] Transferrer: Uploaded admin_gui..b_latexmk
-[2013-06-11 14:42:18 BST] Committer: Adding 3 files
-ok
-(Recording state in git...)
-add www.cmt.mhs.man.ac.uk/admin_guide_cmt.fls (checksum...) ok
-add www.cmt.mhs.man.ac.uk/admin_guide_cmt.log (checksum...) ok
-
-# End of transcript or log.
-"""]]
-
-> Ok, I was able to remove the write bit fiddling in direct mode. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/file_modification_times.mdwn b/doc/bugs/file_modification_times.mdwn
deleted file mode 100644
--- a/doc/bugs/file_modification_times.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-### Please describe the problem.
-The files created in another remote when syncing is "now" rather than keeping the modification time of the source file. As such, git-annex assistant is removing an important bit of information about the file.
-
-### What steps will reproduce the problem?
-1) create two repositories in your computer using webapp
-2) add files to RepoA, see that they are synced to the RepoB.
-3) check the file modification times from any file manager. you will see that while files in RepoA carry correct modification time, synced file in RepoB carries current time.
-
-### What version of git-annex are you using? On what operating system?
-Ubuntu 13.10 32bit version 4.20130815 from apt-get.
-
-> duplicate of [[todo/add_metadata_to_annexed_files]] --[[Joey]]
-> [[done]]
diff --git a/doc/bugs/forget_corrupts_non-ascii_chars.mdwn b/doc/bugs/forget_corrupts_non-ascii_chars.mdwn
--- a/doc/bugs/forget_corrupts_non-ascii_chars.mdwn
+++ b/doc/bugs/forget_corrupts_non-ascii_chars.mdwn
@@ -72,3 +72,7 @@
 """]]
 
 well that's interesting - the above paste is broken by ikiwiki as well... in the text area where i paste it, "rachel@topcrapn:~/Vidéos/anarcat" shows up as "rachel@topcrapn:~/Vidéos/anarcat" but when i preview, the character gets corrupted. and obviously, the second instance then gets *double* corrupted - wheepee. the original paste has "rachel@topcrapn:~/Vidéos/anarcat". --[[anarcat]]
+
+> [[fixed|done]]; writes to git-annex branch now preserve the original
+> encoding, and I've tested that lots of interesting unicode is preserved
+> across a forget run. --[[Joey]]
diff --git a/doc/bugs/free_space_checking.mdwn b/doc/bugs/free_space_checking.mdwn
deleted file mode 100644
--- a/doc/bugs/free_space_checking.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-Should check that there is enough free space before trying to copy a
-file around.
-
-* Need a way to tell how much free space is available on the disk containing
-  a given repository.
-
-* And, need a way to tell the size of a file before copying it from
-  a remote, to check local disk space.
-
-  As of annex.version 2, this metadata can be available for any type
-  of backend. Newly added files will always have file size metadata,
-  while files that used a SHA backend and were added before the upgrade
-  won't.
-
-  So, need a migration process from eg SHA1 to SHA1+filesize. It will
-  find files that lack size info, and rename their keys to add the size
-  info. Users with old repos can run this on them, to get the missing
-  info recorded.
-
-> [[done]]; no migtation process for old SHA1 keys from v1 repo though.
-> --[[Joey]] 
diff --git a/doc/bugs/fsck_output.mdwn b/doc/bugs/fsck_output.mdwn
deleted file mode 100644
--- a/doc/bugs/fsck_output.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-When you check several files and the fsck fails, you get confusing output:
-
-<pre>
-O fsck test1 (checksum...) 
-E  Only 1 of 2 trustworthy copies of test1 exist.
-E  Back it up with git-annex copy.
-O
-O failed
-O fsck test2 (checksum...) 
-E  Only 1 of 2 trustworthy copies of test2 exist.
-E  Back it up with git-annex copy.
-O 
-O failed
-</pre>
-
-The newline is in the wrong place and confuses the user. It should be printed _after_ "failed".
-
-> This is a consequence of part of the output being printed to stderr, and
-> part to stdout. I've marked the lines above with E and O.
-> 
-> Normally a "failed" is preceeded by a message output to stdout desribing
-> the problem; such a message will not be "\n" terminated, so a newline
-> is always displayed before "failed". In this case, since the message
-> is sent to stderr, it is newline terminated.
-> 
-> Fixing this properly would involve storing state, or rethinking 
-> when git-annex displays newlines (and I rather like its behavior
-> otherwise).
-> 
-> A related problem occurs if an error message is unexpetedly printed.
-> Dummying up an example:
-> 
-> O get test1 (from foo...) E git-annex: failed to run ssh
-> failed
-> 
-> --[[Joey]] 
-
->> Well, I fixed this in all cases except a thrown non-IO error (last
->> example aboce), which output is printed by haskell's runtime. I'd
->> have to add a second error handler to handle those, and it's not
->> clear what it would do. Often an error will occur before anything
->> else is printed, and then the current behavior is right; if something
->> has been printed it would be nice to have a newline before the error,
->> but by the time the error is caught we'd be out of the annex monad
->> and not really have any way to know if something has been printed.
->> I think my fix is good enough [[done]] --[[Joey]] 
diff --git a/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn b/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-git annex fsck marks files as bad when the checksumming fails. But this could also be due to a read error when the actual data stored is correct. So, fsck should check twice when a checksum fails.
-
-> [[done]]; apparently problem was caused by bad RAM. --[[Joey]]
diff --git a/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn b/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn
deleted file mode 100644
--- a/doc/bugs/fsck_thinks_file_content_is_bad_when_it_isn__39__t.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-What steps will reproduce the problem?
-What is the expected output? What do you see instead?
-
-I can reproduce it locally, but don't know what's causing it. The file content is the same, I checked with md5sum and sha512sum. But fsck still thinks the content is different. Are there other factors I could check which fsck looks at? I'm using SHA512E backend.
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 3.20120807 Ubuntu 12.04 updated on Aug 20th annex was installed via cabal on Aug 20th, all other packages are from ubuntu.
-
-> What is the error message from fsck? --[[Joey]] 
-
-This is the output:
-
-> reinject ....Moon.avi (checksum...) 
-> Bad file content; moved to /mnt/.../.git/annex/bad/SHA512E-s94402560--ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d.Moon.avi
-failed
-> (Recording state in git...)
-> git-annex: reinject: 1 failed
-
-The original file also has sha512 ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d
-
->> And what sha512 does the file in .git/annex/bad have **now**? (fsck
->> preserves the original filename; this says nothing about what the
->> current checksum is, if the file has been corrupted). --[[Joey]]
-
-The same, as it's the file I was trying to inject:
-
-ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d  .git/annex/bad/SHA512E-s94402560--ead9db1f34739014a216239d9624bce74d92fe723de06505f9b94cb4c063142ba42b04546f11d3d33869b736e40ded2ff779cb32b26aa10482f09407df0f3c8d.Moon.avi
-
-That's what puzzles me, it is the same file, but for some weird reason git annex thinks it's not.
-
-> Ok, reproduced and fixed the bug. The "E" backends recently got support
-> for 2 levels of filename extensions, but were not made to drop them both
-> when fscking. [[done]] (I'll release a fixed version probably tomorrow;
-> fix is in git now.) --[[Joey]] 
diff --git a/doc/bugs/gcrypt_initremote_pushes_git-annex_but_not_master.mdwn b/doc/bugs/gcrypt_initremote_pushes_git-annex_but_not_master.mdwn
deleted file mode 100644
--- a/doc/bugs/gcrypt_initremote_pushes_git-annex_but_not_master.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-git-annex 4.20130911 on Debian Wheezy.
-
-Using `git annex initremote type=gcrypt` as described [here](http://git-annex.branchable.com/tips/fully_encrypted_git_repositories_with_gcrypt/) creates the repository and pushes the `git-annex` branch to it.  It doesn't push `master` (or more generally: the currently checked out branch), as I have verified using `git remote show`.
-
-Manually pushing the branch makes `git annex sync` sync both branches with the gcrypt remote.
-
-I think that it should push the current branch upon creation of the special remote, since for at least me, the whole reason for wanting `git-remote-gcrypt` is that metadata as well as data can be stored encrypted on an SSH server.
-
-Thanks for considering this.
-
-> The git-annex branch is pushed by initremote because I have to push
-> *something* to determine the gcrypt-id. However, this is an implementation
-> detail, and not a feature of initremote. (It's more like a bug of
-> git-remote-gcrypt.)
-> 
-> `git annex sync` will always push your currently checked out branch,
-> as well as the git-annex branch, no matter what `initremote` has done.
-> 
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/get_failed__44___but_remote_has_the_file.mdwn b/doc/bugs/get_failed__44___but_remote_has_the_file.mdwn
deleted file mode 100644
--- a/doc/bugs/get_failed__44___but_remote_has_the_file.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-Not sure what caused this, but I have a file that exists on two remotes, but I can only get it from one of them.  If I try to get it from the other, it fails immediately (without even connecting):
-
-    pilot:~/vid/tv/Show$ git annex whereis Show\ -\ S03E08.mp4
-    whereis Show - S03E08.mp4 (2 copies) 
-            09c0b436-f8de-11e0-842f-b7644539d57f -- psychosis
-            82814942-f8e0-11e0-b053-e70a61e98e19 -- bucket
-    ok
-
-    pilot:~/vid/tv/Show$ git annex fsck Show\ -\ S03E08.mp4
-    fsck Show - S03E08.mp4 ok
-
-    pilot:~/vid/tv/Show$ git annex get --from bucket Show\ -\ S03E08.mp4
-    get Show - S03E08.mp4 failed
-    git-annex: get: 1 failed
-
-    pilot:~/vid/tv/Show$ git annex get --debug --from bucket Show\ -\ S03E08.mp4
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","show-ref","git-annex"]
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","show-ref","--hash","refs/heads/git-annex"]
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","log","refs/heads/git-annex..e41c3b1ee9127129f2c9fc3fa5d4771afcb5ffd7","--oneline","-n1"]
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","log","refs/heads/git-annex..a7ae08bccede282f46c2073f6c3e52685a593482","--oneline","-n1"]
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","log","refs/heads/git-annex..ae0f84e906423f4da465e3d3df9d46545684d3f5","--oneline","-n1"]
-    [2013-01-17 19:05:13 EST] chat: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","cat-file","--batch"]
-    [2013-01-17 19:05:13 EST] read: git ["--git-dir=/home/jim/vid/.git","--work-tree=/home/jim/vid","ls-files","--cached","-z","--","Show - S03E08.mp4"]
-    get Show - S03E08.mp4 failed
-    git-annex: get: 1 failed
-
-Same `git annex version` on both `pilot` and `bucket`, and I ran `git annex sync` on both.
-
-    git-annex version: 3.20130114
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-
-How should I debug this?
-
-> [[done]], in c6fbed48 I had made some changes to allow transfers
-> to work from readonly filesystems, but a too broad error trapping
-> hid the "transfer already in progress" error it is supposed to display
-> in this case. --[[Joey]]
diff --git a/doc/bugs/get_from_bup-remote_with_pubkey_failing.mdwn b/doc/bugs/get_from_bup-remote_with_pubkey_failing.mdwn
deleted file mode 100644
--- a/doc/bugs/get_from_bup-remote_with_pubkey_failing.mdwn
+++ /dev/null
@@ -1,93 +0,0 @@
-### Please describe the problem.
-
-I'm unable to 'git annex get' a file from a bup-remote with encryption set to 'pubkey'.
-
-### What steps will reproduce the problem?
-     
-I added a bup-remote using [these instructions](http://git-annex.branchable.com/walkthrough/using_bup/):
-
-        bash-3.2$ git annex initremote mybup type=bup encryption=pubkey keyid=0xABE8244505D63E81 buprepo=gumdrop:/home/gert/.bup
-
-        # now adding files and moving them:
-        bash-3.2$ mkdir orgmode && touch orgmode/some.org
-        bash-3.2$ git annex add orgmode/some.org
-        add orgmode/some.org (checksum...) ok
-        (Recording state in git...)
-        bash-3.2$ git commit
-        [master bce8c83] Some.org
-         1 file changed, 1 insertion(+)
-         create mode 120000 orgmode/some.org
-        bash-3.2$ git annex move orgmode/ --to=mybup
-        move orgmode/another.org (gpg)
-        U moet een geheime zin opgeven om de geheime sleutel te gebruiken
-        van: “email”
-        4096-bit RSA key, ID 0xFF8DE378DE223820, created 2013-11-10
-                 (sub-sleutel bij hoofd sleutel ID 0xE9B90528FDA4E1E6)
-
-        (checking mybup...) ok
-        (Recording state in git...)
-        bash-3.2$ less orgmode/another.org
-        orgmode/another.org: No such file or directory
-        bash-3.2$ git annex get orgmode/another.org --debug
-        [2013-11-13 16:18:07 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","ls-files","--cached","-z","--","orgmode/another.org"]
-        get orgmode/another.org [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","show-ref","git-annex"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","show-ref","--hash","refs/heads/git-annex"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..f25f9bb2b78a8b9c4b64087f1378c68fb5c0a2f1","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..1b0a3dd72be437d800e58d659837d6e528cbbc39","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..f62419efea58245d232a52ceaf0eaefe3b0fdced","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..eb6f0cd983d9a3637e984aa815537fe20a5c2a69","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..5362118e643462a0875bfe31d493ffe64413f2d8","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] read: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","log","refs/heads/git-annex..e5afaf82ce25f60a108c0ae873b6fd57c5d28ca7","--oneline","-n1"]
-        [2013-11-13 16:18:08 CET] chat: git ["--git-dir=/Users/gert/annex/.git","--work-tree=/Users/gert/annex","cat-file","--batch"]
-        [2013-11-13 16:18:08 CET] read: git ["config","--null","--list"]
-        (from mybup...) (gpg) [2013-11-13 16:18:08 CET] chat: gpg ["--quiet","--trust-model","always","--decrypt"]
-
-        U moet een geheime zin opgeven om de geheime sleutel te gebruiken
-        van: “<email>”
-        4096-bit RSA key, ID 0xFF8DE378DE223820, created 2013-11-10
-                 (sub-sleutel bij hoofd sleutel ID 0xE9B90528FDA4E1E6)
-
-        [2013-11-13 16:18:15 CET] read: bup ["join","-r","gumdrop:/home/gert/.bup","GPGHMACSHA1--67aec1b62d05d000442cf8e7d9df8d327eaf26d5"]
-        [2013-11-13 16:18:15 CET] chat: gpg ["--quiet","--trust-model","always","--batch","--decrypt"]
-        gpg: kan geheime zin niet opvragen in batch modus
-        gpg: decoderen mislukt: secret key not available
-
-          Unable to access these remotes: mybup
-
-          Try making some of these repositories available:
-          080e97d2-4f82-4292-acb7-a48d82009258 -- mybup (mybupmy bup repository at gumdrop)
-
-          (Note that these git remotes have annex-ignore set: origin)
-        failed
-        git-annex: get: 1 failed
-
-### What version of git-annex are you using? On what operating system?
-
-Running git-annex version 4.20131105-g136b030 on OSX 10.8.5.
-
-### Please provide any additional information below.
-
-My ideas:
-
-"Unable to access these remotes: mybup" is weird, I just moved files there.
-
-"secret key not available" makes me think it's looking for the primary secret key (which is indeed offline).
-When I encrypt a file with the same key I used to create the remote it just works:
-
-    $ gpg --armor --recipient 0xABE8244505D63E81 --encrypt file.txt
-    $ gpg --decrypt file.txt.asc
-
-When prompting for my passphrase it states "4096-bit RSA key, ID 0xFF8DE378DE223820, created 2013-11-10".
-That is a different subkey than what I entered when I setting up the remote.
-
-My keys/subkeys:
-
-    pub  4096R/0xE9B90528FDA4E1E6  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: SC
-                               vertrouwen: ultimate      geldigheid: ultimate
-    sub  4096R/0x98816CFB398B4666  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: E
-    sub  4096R/0x91951718D5F11CDD  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: S
-    sub  4096R/0xABE8244505D63E81  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: E
-    sub  4096R/0xB44520A46B27144D  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: S
-    sub  4096R/0xFF8DE378DE223820  aangemaakt: 2013-11-10  vervaldatum: 2014-11-10  gebruik: E
-
-> This was already fixed in version 4.20131106. [[done]] --[[Joey]] 
diff --git a/doc/bugs/git-annex_3.20130216.1_tests_are_broken.mdwn b/doc/bugs/git-annex_3.20130216.1_tests_are_broken.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_3.20130216.1_tests_are_broken.mdwn
+++ /dev/null
@@ -1,43 +0,0 @@
-    $ pwd
-    [bla]/git-annex-3.20130216.1
-    $ runhaskell Setup configure --prefix=/usr --libdir=/usr/lib64 --docdir=/usr/share/doc/git-annex-3.20130216.1-r2 \
-    --htmldir=/usr/share/doc/git-annex-3.20130216.1-r2/html --with-compiler=ghc-7.6.2 --enable-shared \
-    --disable-executable-stripping --global --verbose --enable-tests --flags=S3 --flags=-WebDAV --flags=-Inotify \
-    --flags=Dbus --flags=-Assistant --flags=-Webapp --flags=-Pairing --flags=-XMPP --flags=-DNS
-    $ runhaskell Setup.hs build
-    Building git-annex-3.20130217...
-    Preprocessing test suite 'test' for git-annex-3.20130217...
-    
-    Annex/UUID.hs:30:8:
-        Could not find module `System.Random'
-        It is a member of the hidden package `random-1.0.1.1'.
-        Perhaps you need to add `random' to the build-depends in your .cabal file.
-        Use -v to see a list of the files searched for.
-
-Adding `random` to the dependencies of the test suite results in:
-
-    $ runhaskell Setup.hs build
-    Building git-annex-3.20130217...
-    Preprocessing test suite 'test' for git-annex-3.20130217...
-    
-    Annex/UUID.hs:29:18:
-        Could not find module `Data.UUID'
-        It is a member of the hidden package `uuid-1.2.9'.
-        Perhaps you need to add `uuid' to the build-depends in your .cabal file.
-        Use -v to see a list of the files searched for.
-
-Adding `uuid` results in:
-
-    $ runhaskell Setup.hs build
-    Building git-annex-3.20130217...
-    Preprocessing test suite 'test' for git-annex-3.20130217...
-    
-    Command/Add.hs:25:8:
-        Could not find module `Utility.Touch'
-        Use -v to see a list of the files searched for.
-
-
-Also: you included ".git-annex.cabal.swp" in the tarball.
-
-> These problems in the cabal file were fixed the other day. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/git-annex_add_hangs_indefinitely_on_all_files.mdwn b/doc/bugs/git-annex_add_hangs_indefinitely_on_all_files.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_add_hangs_indefinitely_on_all_files.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-Running "git annex add" on a file of any size (whether 10KB or 1GB) hangs forever, must be killed with ^C, and does not add the file.
-
-"git annex unannex" still works, as do other commands like "git annex status", "git annex whereis", etc.
-
-### What steps will reproduce the problem?
-
-Running "git annex add" from this computer on any git annex repository on any hard drive.
-
-### What version of git-annex are you using? On what operating system?
-
-I am using 3.20121127 on Arch Linux with git version 1.8.5.2.
-
-My hard drive has several gigabytes of free space, and I have no trouble using git itself for development in other repositories.
-
-I have been using this for over a year with no problem; I first noticed this about a week ago, and it must have started within the last ~3 weeks at most.
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-$git annex add test.txt
-add test.txt 
-
-# End of transcript or log.
-"""]]
-
-> [[done]]
diff --git a/doc/bugs/git-annex_add_should_repack_as_it_goes.mdwn b/doc/bugs/git-annex_add_should_repack_as_it_goes.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_add_should_repack_as_it_goes.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-What steps will reproduce the problem?
-
-1. Create a fresh git-annex repository
-2. Add a directory tree to it with about 300,000 files in it
-3. wait
-4. change the tree; attempt a git commit
-
-What is the expected output? What do you see instead?
-
-git commit hangs due to the large number of loose objects created during the git annex add. If git annex had stopped to repack the git repo a few times along the way, I think this might have been avoided.
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130323
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS
-
-Darwin pluto.local 12.3.0 Darwin Kernel Version 12.3.0: Sun Jan  6 22:37:10 PST 2013; root:xnu-2050.22.13~1/RELEASE_X86_64 x86_64
-(Mac OS 10.8.3)
-
-git version 1.8.2
-
-> Based on the benchmarks below, repacking even once does not speed things
-> up; repacking repeatedly as `git annex add` runs would slow things down.
-> 
-> It might be worth following up with the git developers why `git commit`
-> scans loose objects after it has already output the commit sha1sum.
-> 
-> Don't see any improvements git-annex can make. [[done]] --[[Joey]]
diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn
--- a/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn
+++ b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn
@@ -26,3 +26,5 @@
 """]]
 
 [[!meta title="upgrade loop when info file contains newer version than distributed version of git-annex"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git-annex_branch_corruption.mdwn b/doc/bugs/git-annex_branch_corruption.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_branch_corruption.mdwn
+++ /dev/null
@@ -1,95 +0,0 @@
-Below is a test case which shows a way that the git-annex branch
-can become corrupted and lose data, including location log records and
-uuid.log lines.
-
-At the end, a commit on the git-annex branch removes one of the 2 lines
-from the uuid.log; which should never happen.
-
-The actual problem occurs earlier, at the "push point". Here a repo is
-cloned from the main one, initialized (adding the last uuid.log line),
-and then pushed back to the main one. That push is a fast-forward, so is
-allowed to directly update the git-annex branch in the main repo:
-
-	b884fe5..c497739  git-annex -> git-annex
-
-Now the git-annex branch has a change that is not reflected in
-`.git/annex/index`, so the next time a change is made, it's committed
-using the out of date index, which causes a reversion of the changes
-that were pushed to the branch.
-
----
-
-## Thoughts
-
-This is essentially the same reason why git blocks pushes to the checked-out
-branch of a non-bare repository. 
-
-This problem only affects workflows that involve pushing. Pulling workflows
-do not directly update the local git-annex branch, so avoid the problem.
-
-And while bare repos are pushed to, they rarely have changes made directly
-to their git-annex branches, so while I think the same problem could
-happen with pushing to a bare repo, it's unlikely.
-
-None of which is to say this is not a bad bug that needs to be comprehensively
-fixed. 
-
-Probably git-annex needs to record which ref of the git-annex branch
-corresponds to its index, and if the branch is at a different ref,
-merge it into the index.
-
-> And now that's [[done]]. I managed to do it with very little slowdown.
-> 
-> A side benefit is that users can now safely check out the git-annex
-> branch and commit changes to it, and git-annex will notice them.
-> Before, it was documented to ignore such changes.
-> --[[Joey]] 
-
----
-
-## Workaround
-
-Users who want to prevent this bug from occuring when pushing to their
-non-bare repositories can install this script as `.git/hooks/update`
-
-<pre>
-#!/bin/sh
-if [ "$1" = refs/heads/git-annex ]; then
-	exit 1
-fi
-</pre>
-
---[[Joey]] 
-
----
-
-## Test Case
-<pre>
-#!/bin/sh
-mkdir annextest
-cd annextest
-
-git init dir1
-cd dir1
-git annex init
-touch foo 
-echo hi > bar
-git annex add
-git commit -m add
-
-cd ..
-git clone dir1 dir2
-cd dir2
-git annex init otherdir
-git annex get
-# push point
-git push
-
-cd ..
-cd dir1
-echo "before"
-git show git-annex:uuid.log
-git annex drop foo --force
-echo "after"
-git show git-annex:uuid.log
-</pre>
diff --git a/doc/bugs/git-annex_branch_push_race.mdwn b/doc/bugs/git-annex_branch_push_race.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_branch_push_race.mdwn
+++ /dev/null
@@ -1,45 +0,0 @@
-The fix for the [[git-annex_branch_corruption]] bug is subject to a race.
-With that fix, git-annex does this when committing a change to the branch:
-
-1. lock the journal file (this avoids git-annex racing itself, FWIW)
-2. check what the head of the branch points to, to see if a newer branch
-   has appeared
-3. if so, updates the index file from the branch
-4. stages changes in the index
-5. commits to the branch using the index file
-
-If a push to the branch comes in during 2-5, then
-[[git-annex_branch_corruption]] could still occur.
-
----
-
-## approach 1, using locking
-
-Add an update hook and a post-update hook. The update hook
-will use locking to ensure that no git-annex is currently running
-a commit, and block any git-annex's from starting one. It
-will background itself, and remain running during the push.
-The post-update hook will signal it to exit.
-
-I don't like this approach much, since it involves a daemon, two hooks,
-and lots of things to go wrong. And it blocks using git-annex during a
-push. This approach should be a last resort.
-
-## approach 2, lockless method
-
-After a commit is made to the branch, check to see if the parent of
-the commit is the same ref that the index file was last updated to. If it's
-not, then the race occurred.
-
-How to recover from the race? Well, just union merging the parent of the
-commit into the index file and re-committing should work, I think. When
-the race occurs, the commit reverts its parent's changes, and this will
-redo them. 
-
-(Of course, this re-commit will also be subject to the race, and
-will need the same check for the race as the other commits. It won't loop
-forever, I hope.)
-
-> [[done]] and tested.
-
---[[Joey]]
diff --git a/doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn b/doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn
+++ /dev/null
@@ -1,100 +0,0 @@
-Currently the hashed directories in .git-annex allow for upper and lower case directory names... on linux (or any case sensitive filesystem) the directory names such as 'Gg' and 'GG' are different and unique. However on systems like OSX (and probably windows if it is ever supported) the directory names 'Gg' is the same as 'GG'
-
-In one of the annex'd repos that I have this has occured...
-
-<pre>
-$ git add -i                                                                                          
-           staged     unstaged path
-  1:    unchanged        +1/-1 .git-annex/GM/GV/WORM-s183630166-m1301072171--somefile.log
-  2:    unchanged        +1/-1 .git-annex/Gm/GV/WORM-s183630166-m1301072171--somefile.log
-</pre>
-
-
-this has somewhat confused git when it tries to stage/merge files, I didn't notice this at first, but it is definately a problem for someone using case insensitive filesystems  like the default OSX HFS+ formats or vfat/fat32.
-
-> I feel a bit stupid to not have considered case-insensative filesystems.
-> They are just so far from where I have lived for 20 years that it's hard
-> to keep them in mind.
-> 
-> I guess that
-> [[git-annex_has_issues_with_git_when_staging__47__commiting_logs]] is
-> somehow a consequence (or cause?) of this, but I don't quite understand
-> how this is causing git to fail to stage files, or stage the same file
-> twice under different capitalizations. git-annex always will run git add
-> on the path with the "correct" capitalization. So unless something else
-> has added the path with the other capitalization (perhaps git add
-> .git-annex manually?) I don't understand how you get to this state.
-> --[[Joey]]
-
->> I think I got myself into this situation when I copied some files over from a HFS+ partition to a GPFS network share (which is pretty posix compliant) over samba. It probably is related to the [[git-annex_has_issues_with_git_when_staging__47__commiting_logs]]. I thought they were unique enough to have two bug reports logged as one is a git behavioural thing and the other is git-annex specific.
-
->>> If you copied `.git/` over, perhaps you got a git repo without
->>> core.ignorecase set right for the filesystem it landed on?
-
->>>> I usually git clone or do a fresh repository and pull things in, I was also unaware of this ignorecase setting as well.
-
->>> 
->>> Something like this might reproduce it:
-
-<pre>
-# mkdir test; cd test; git init
-# git config core.ignorecase false
-# mkdir Foo
-# touch Foo/bar
-# git add Foo/bar
-# git add foo/bar
-# git add fOo/bar
-# git status
-# touch foo/other
-# git add fOo/other
-# git status
-</pre>
-
->>>> And then either git commit or git clone would probably get confused
->>>> if it thought 3 distinct files had been committed.
->>>> --[[Joey]]
-
->>>>> Doing the above test on a HFS+ partition yields this
-
-<pre>
-## with ignorecase=false
-commit bb024c6fd7482b2d10f60ae899cb7a949aca1ad8
-Author: Jimmy Tang <jtang@exia>
-Date:   Sun Mar 27 18:40:24 2011 +0100
-
-    commit
-
-diff --git a/Foo/bar b/Foo/bar
-new file mode 100644
-index 0000000..e69de29
-diff --git a/fOo/bar b/fOo/bar
-new file mode 100644
-index 0000000..e69de29
-diff --git a/fOo/other b/fOo/other
-new file mode 100644
-index 0000000..e69de29
-diff --git a/foo/bar b/foo/bar
-new file mode 100644
-index 0000000..e69de29
-</pre>
-
->>>>> and without changing ignorecase
-
-<pre>
-commit 909a089158ffb98f8e91f98905e2bfdc7234666f
-Author: Jimmy Tang <jtang@exia>
-Date:   Sun Mar 27 18:46:57 2011 +0100
-
-    commit
-
-diff --git a/Foo/bar b/Foo/bar
-new file mode 100644
-index 0000000..e69de29
-diff --git a/Foo/other b/Foo/other
-new file mode 100644
-index 0000000..e69de29
-</pre>
-
-> Closing this bug, as it seems I have dealt with it adequately now.
-> [[done]]
-> --[[Joey]] 
diff --git a/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
--- a/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
+++ b/doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights.mdwn
@@ -20,3 +20,5 @@
 Installing git creates read-only directories that cannot be used by the
 git-annex install afterwards. Without admin rights, the read-only flag of
 the git dir cannot be altered.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git-annex_dropunused_has_no_effect.mdwn b/doc/bugs/git-annex_dropunused_has_no_effect.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_dropunused_has_no_effect.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-Hi Joey,
-
-I have a repository with many thousands of unused files.  It's hard to know exactly how many because it takes up to 5 seconds to print the name of every single one, so I'm largely guessing based on my knowledge of what I've recently deleted.
-
-When I run `git annex dropunused FOO`, it doesn't matter what `FOO` is -- a number, a range, the word "foo" -- the `dropunused` command returns to the prompt instantly in all cases.
-
-What can I do to drop all these unused files eating up i-nodes?  Is there a debug flag I can turn on?
-
-Thanks,
-  John
-
-> added a message [[done]] --[[Joey]]
diff --git a/doc/bugs/git-annex_fails_to_initialize_under_Windows.mdwn b/doc/bugs/git-annex_fails_to_initialize_under_Windows.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_fails_to_initialize_under_Windows.mdwn
+++ /dev/null
@@ -1,215 +0,0 @@
-### Please describe the problem.
-Git-annex fails to initialize and fails tests.
-
-### What steps will reproduce the problem?
-Attempted initialization:
-
-    C:\Users\Andrew\Documents\GitHub\git-annex-test [master]> git annex init
-    init
-      Detected a filesystem without fifo support.
-
-      Disabling ssh connection caching.
-
-      Detected a crippled filesystem.
-
-      Enabling direct mode.
-    fatal: index file open failed: Invalid argument
-    git-annex: git [Param "checkout",Param "-q",Param "-B",Param "annex/direct/master"] failed
-
-Tests:
-
-    C:\Users\Andrew\Documents\GitHub\git-annex-test [master]> git annex test
-    Tests
-      QuickCheck
-        prop_idempotent_deencode_git:                     OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_deencode:                         OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_fileKey:                          OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_key_encode:                       OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_key_decode:                       OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_shellEscape:                      OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_shellEscape_multiword:            OK
-          +++ OK, passed 1000 tests.
-        prop_logs_sane:                                   OK
-          +++ OK, passed 1000 tests.
-        prop_idempotent_configEscape:                     OK
-          +++ OK, passed 1000 tests.
-        prop_parse_show_Config:                           OK
-          +++ OK, passed 1000 tests.
-        prop_parentDir_basics:                            OK
-          +++ OK, passed 1000 tests.
-        prop_relPathDirToFile_basics:                     OK
-          +++ OK, passed 1000 tests.
-        prop_relPathDirToFile_regressionTest:             OK
-          +++ OK, passed 1000 tests.
-        prop_cost_sane:                                   OK
-          +++ OK, passed 1000 tests.
-        prop_matcher_sane:                                OK
-          +++ OK, passed 1000 tests.
-        prop_HmacSha1WithCipher_sane:                     OK
-          +++ OK, passed 1000 tests.
-        prop_TimeStamp_sane:                              OK
-          +++ OK, passed 1000 tests.
-        prop_addLog_sane:                                 OK
-          +++ OK, passed 1000 tests.
-        prop_verifiable_sane:                             OK
-          +++ OK, passed 1000 tests.
-        prop_segment_regressionTest:                      OK
-          +++ OK, passed 1000 tests.
-        prop_read_write_transferinfo:                     OK
-          +++ OK, passed 1000 tests.
-        prop_read_show_inodecache:                        OK
-          +++ OK, passed 1000 tests.
-        prop_parse_show_log:                              OK
-          +++ OK, passed 1000 tests.
-        prop_read_show_TrustLevel:                        OK
-          +++ OK, passed 1000 tests.
-        prop_parse_show_TrustLog:                         OK
-          +++ OK, passed 1000 tests.
-        prop_hashes_stable:                               OK
-          +++ OK, passed 1000 tests.
-        prop_schedule_roundtrips:                         OK
-          +++ OK, passed 1000 tests.
-        prop_duration_roundtrips:                         OK
-          +++ OK, passed 1000 tests.
-        prop_metadata_sane:                               OK
-          +++ OK, passed 1000 tests.
-        prop_metadata_serialize:                          OK
-          +++ OK, passed 1000 tests.
-        prop_branchView_legal:                            OK
-          +++ OK, passed 1000 tests.
-        prop_view_roundtrips:                             OK
-          +++ OK, passed 1000 tests.
-        prop_viewedFile_rountrips:                    I n i t  TOeKs
-    ts
-          i n+i+t+:  OK, passed 1000 tests.
-      Unit Tests
-        add sha1dup:                                      git-annex: System.PosixCompat.User.getEffectiveUserID: not support
-    ed: illegal operation
-    FAIL
-        init failed
-      add:  git-annex: System.PosixCompat.User.getEffectiveUserID: not supported: illegal operation
-    FAIL
-        add failed
-
-    2 out of 2 tests failed
-    FAIL
-          Exception: init tests failed! cannot continue
-        add extras:                                       FAIL
-          Exception: init tests failed! cannot continue
-        reinject:                                         FAIL
-          Exception: init tests failed! cannot continue
-        unannex (no copy):                                FAIL
-          Exception: init tests failed! cannot continue
-        unannex (with copy):                              FAIL
-          Exception: init tests failed! cannot continue
-        drop (no remote):                                 FAIL
-          Exception: init tests failed! cannot continue
-        drop (with remote):                               FAIL
-          Exception: init tests failed! cannot continue
-        drop (untrusted remote):                          FAIL
-          Exception: init tests failed! cannot continue
-        get:                                              FAIL
-          Exception: init tests failed! cannot continue
-        move:                                             FAIL
-          Exception: init tests failed! cannot continue
-        copy:                                             FAIL
-          Exception: init tests failed! cannot continue
-        lock:                                             FAIL
-          Exception: init tests failed! cannot continue
-        edit (no pre-commit):                             FAIL
-          Exception: init tests failed! cannot continue
-        edit (pre-commit):                                FAIL
-          Exception: init tests failed! cannot continue
-        fix:                                              FAIL
-          Exception: init tests failed! cannot continue
-        trust:                                            FAIL
-          Exception: init tests failed! cannot continue
-        fsck (basics):                                    FAIL
-          Exception: init tests failed! cannot continue
-        fsck (bare):                                      FAIL
-          Exception: init tests failed! cannot continue
-        fsck (local untrusted):                           FAIL
-          Exception: init tests failed! cannot continue
-        fsck (remote untrusted):                          FAIL
-          Exception: init tests failed! cannot continue
-        migrate:                                          FAIL
-          Exception: init tests failed! cannot continue
-        migrate (via gitattributes):                      FAIL
-          Exception: init tests failed! cannot continue
-         unused:                                          FAIL
-          Exception: init tests failed! cannot continue
-        describe:                                         FAIL
-          Exception: init tests failed! cannot continue
-        find:                                             FAIL
-          Exception: init tests failed! cannot continue
-        merge:                                            FAIL
-          Exception: init tests failed! cannot continue
-        info:                                             FAIL
-          Exception: init tests failed! cannot continue
-        version:                                          FAIL
-          Exception: init tests failed! cannot continue
-        sync:                                             FAIL
-          Exception: init tests failed! cannot continue
-        union merge regression:                           FAIL
-          Exception: init tests failed! cannot continue
-        conflict resolution:                              FAIL
-          Exception: init tests failed! cannot continue
-        conflict_resolution (mixed directory and file):   FAIL
-          Exception: init tests failed! cannot continue
-        conflict_resolution (mixed directory and file) 2: FAIL
-          Exception: init tests failed! cannot continue
-        map:                                              FAIL
-          Exception: init tests failed! cannot continue
-        uninit:                                           FAIL
-          Exception: init tests failed! cannot continue
-        uninit (in git-annex branch):                     FAIL
-          Exception: init tests failed! cannot continue
-        upgrade:                                          FAIL
-          Exception: init tests failed! cannot continue
-        whereis:                                          FAIL
-          Exception: init tests failed! cannot continue
-        hook remote:                                      FAIL
-          Exception: init tests failed! cannot continue
-        directory remote:                                 FAIL
-          Exception: init tests failed! cannot continue
-        rsync remote:                                     FAIL
-          Exception: init tests failed! cannot continue
-        bup remote:                                       FAIL
-          Exception: init tests failed! cannot continue
-        crypto:                                           FAIL
-          Exception: init tests failed! cannot continue
-        preferred content:                                FAIL
-          Exception: init tests failed! cannot continue
-        add subdirs:                                      FAIL
-          Exception: init tests failed! cannot continue
-    
-    45 out of 78 tests failed
-      (This could be due to a bug in git-annex, or an incompatability
-       with utilities, such as git, installed on this system.)
-
-### What version of git-annex are you using? On what operating system?
-    C:\Users\Andrew\Documents\GitHub\git-annex-test [master]> git --version
-    git version 1.8.4.msysgit.0
-    C:\Users\Andrew\Documents\GitHub\git-annex-test [master]> git annex version
-    git-annex version: 5.20140227-gd872677
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256
-    SKEIN512 WORM URL
-    remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
-    local repository version: 5
-    supported repository version: 5
-    upgrade supported from repository versions: 2 3 4
-    C:\Users\Andrew\Documents\GitHub\git-annex-test [master]> (Get-WmiObject -class Win32_OperatingSystem).Caption
-    Microsoft Windows 8.1
-
-### Please provide any additional information below.
-^^^ See above
-
-> [[done]]; I have made the windows documentation document the need for
-> msysgit 1.9. --[[Joey]]
diff --git a/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn b/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn
--- a/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn
+++ b/doc/bugs/git-annex_fails_to_initialize_under_Windows_with_cygwin.mdwn
@@ -36,3 +36,5 @@
 key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
 remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
 
+> [[fixed|done]]; documented the needed version of git on the windows
+> install page. --[[Joey]]
diff --git a/doc/bugs/git-annex_fix_not_noticing_file_renames.mdwn b/doc/bugs/git-annex_fix_not_noticing_file_renames.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_fix_not_noticing_file_renames.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-What steps will reproduce the problem?
-
-    ~$ mkdir testannex
-    ~$ cd testannex/
-    testannex$ git init
-    Initialized empty Git repository in /Users/ed/testannex/.git/
-    testannex$ git annex init "test annex"
-    init test annex ok
-    (Recording state in git...)
-    testannex$ echo "file1" > file1
-    testannex$ git annex add file1
-    add file1 (checksum...) ok
-    (Recording state in git...)
-    testannex$ mkdir directory
-    testannex$ mv file1 directory/
-    testannex$ cat directory/file1 
-    cat: directory/file1: No such file or directory
-    testannex$ git annex fix directory/file1
-    git-annex: directory/file1 not found
-
-
-What is the expected output? What do you see instead?
-
-    git annex fix should fix the symlink.  It looks like maybe it's *following* the symlink?
-
-What version of git-annex are you using? On what operating system?
-
-    checkout:  20d195f   compiled on OS X 10.7 using cabal.  
-
-Please provide any additional information below.
-
-    git annex assistant is not noticing file renames either.
-
-> git-annex commands (other than `git annex add`) only operate on files
-> checked into git, which `directory/file1` is not, since you did not use
-> `git mv`. Once you `git add` the file, it'll work. [[done]] --[[Joey]]
diff --git a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-After a series of pretty convoluted copying files around between annex'd repos and pulling changes around between repos. I noticed that occassionally when git-annex tries to stage files (the `.git-annex/*/*/*logs`) git some times gets wedged and doing a "git commit -a" doesn't seem to work or files might not get added thus leaving a bunch of untracked files or modified files that aren't staged for a commit.
-
-I tried running a *`git rm --cached -f -r *`* then *git add -u .git-annex/* or the usual *git add* then a commit fixes things for me. If I don't do that then my subsequent merges/pulls will fail and result in *no known copies of files* I suspect git-annex might have just touched some file modes and git picked up the changes but got confused since there was no content change. It might also just be a git on OSX thing and it doesn't affect linux/bsd users.
-
-For now it's just a bit of extra work for me when it does occur but it does not seem to occur often.
-
-> What do you mean when you say that git "got wedged"? It hung somehow?
->
-> If git-annex runs concurrently with another git command that locks
-> the repository, its git add of log files can fail.
-> 
-> Update: Also, of course, if you are running a "got annex get" or
-> similar, and ctrl-c it after it has gotten some files, it can
-> end up with unstaged or in some cases un-added log files that git-annex
-> wrote -- since git-annex only stages log files in git on shutdown, and
-> ctrl-c bypasses that.
-> --[[Joey]] 
-
->> It "got wedged" as in git doesn't let me commit anything, even though it tells me that there is stuff to be committed in the staging area.
-
->>> I've never seen git refuse to commit staged files. There would have to
->>> be some error message? --[[Joey]] 
-
->>>> there were no error messages at all
-
->>>>> Can I see a transcript? I'm having difficulty getting my head around
->>>>> what git is doing. Sounds like the files could just not be `git
->>>>> added` yet, but I get the impression from other things that you say
->>>>> that it's not so simple. --[[Joey]] 
-
-This turns out to be a bug in git, and I have posted a bug report on the mailing list.
-The git-annex behavior that causes this situation is being handled as
-another bug, [[git-annex directory hashing problems on osx]].
-So, closing this bug report. [[done]] --[[Joey]]
diff --git a/doc/bugs/git-annex_ignores_GIT__95__SSH.mdwn b/doc/bugs/git-annex_ignores_GIT__95__SSH.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_ignores_GIT__95__SSH.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-### Please describe the problem.
-
-git uses environment variable GIT_SSH to determine SSH client.
-
-I set it to plink.exe because I extensively use pageant infrastructure and do NOT want to have 2 systems lying around.
-
-Unfortunately git-annex seems to ignore that.
-
-Even worse, it results in unpredicted behavior because the git part works (e.g. clone) whereas annex/rsync does not resulting in half-ok repositories without meaningful error messages.
-
-It only becomes evident when ssh.exe in the git repository is deleted.
-
-### What steps will reproduce the problem?
-
-Set %GIT_SSH% and remove ssh.exe
-
-You will get
-
-     git-annex: ssh: createProcess: does not exist (No such file or directory)
-     failed
-     git-annex: drop: 1 failed
-
-### What version of git-annex are you using? On what operating system?
-
-Windows 8,
-
-     $ git annex version
-     git-annex version: 5.20140411-gda795e0
-     build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
-     key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-     remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
-     local repository version: 5
-     supported repository version: 5
-     upgrade supported from repository versions: 2 3 4
-
-
-### Please provide any additional information below.
-
-
diff --git a/doc/bugs/git-annex_immediately_re-gets_dropped_files.mdwn b/doc/bugs/git-annex_immediately_re-gets_dropped_files.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_immediately_re-gets_dropped_files.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-### Please describe the problem.
-
-I have some files that I want to drop from my laptop. However, as soon as I drop them (git-annex drop), the assistant starts to download them again from another repository. At first glance, this seems like a variant of [[bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time]].
-
-I would expect that after an explicit drop command, the files would not be re-downloaded.
-
-The repository that this is happening on is a "client" type, direct-mode repository.
-
-### What steps will reproduce the problem?
-
-    git annex drop drop-test/TestFile.data
-
-### What version of git-annex are you using? On what operating system?
-    git-annex version: 4.20130618-g333cb8e
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-    local repository version: 4
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-
-    I am running Ubuntu 13.04
-
-### Please provide any additional information below.
-
-log emailed.
-
-> [[done]]; not a bug, should use manual mode if manually deciding which files are in a repository --[[Joey]] 
diff --git a/doc/bugs/git-annex_incorrectly_parses_bare_IPv6_addresses.mdwn b/doc/bugs/git-annex_incorrectly_parses_bare_IPv6_addresses.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_incorrectly_parses_bare_IPv6_addresses.mdwn
+++ /dev/null
@@ -1,59 +0,0 @@
-I have a git remote in a git-annex-enabled repository. Here's what it looks like in .git/config:
-
-<pre>
-[remote "renaissance"]
-        url = ssh://[2001:0:53aa:64c:24ef:5ce4:2ef9:cdda]/home/paulproteus/Music/annex/
-        fetch = +refs/heads/*:refs/remotes/renaissance/*
-        annex-uuid = 2992752e-1a13-11e0-ba68-57d3c800da64
-</pre>
-
-I wanted to "git annex get" some data. git-annex appears to pass incorrectly-formatted IPv6 addresses to rsync:
-
-<pre>
-get primary/emusiq/Arab Strap/Monday At The Hug And Pint/01-The Shy Retirer.mp3 (copying from renaissance...) 
-ssh: Could not resolve hostname [2001:0:53aa:64c:24ef:5ce4:2ef9:cdda]: Name or service not known
-rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
-rsync error: unexplained error (code 255) at io.c(601) [Receiver=3.0.7]
-
-  rsync failed -- run git annex again to resume file transfer
-  Unable to access these remotes: renaissance
-  Try making some of these repositories available:
-  	2992752e-1a13-11e0-ba68-57d3c800da64
-failed
-</pre>
-
-In this case, the square brackets should not be there.
-
-I tried changing the .git/config syntax slightly, and got a different, also-incorrect behavior:
-
-<pre>
-[remote "renaissance"]
-        url = [2001:0:53aa:64c:24ef:5ce4:2ef9:cdda]:/home/paulproteus/Music/annex/
-        fetch = +refs/heads/*:refs/remotes/renaissance/*
-        annex-uuid = 2992752e-1a13-11e0-ba68-57d3c800da64
-</pre>
-
-<pre>
-paulproteus@pathi:~/Music/annex$ git annex get
-git-annex: bad url ssh://[2001/~/0:53aa:64c:24ef:5ce4:2ef9:cdda]:/home/paulproteus/Music/annex/
-</pre>
-
-(Note that both these .git/config entries work fine with "git fetch".)
-
--- Asheesh.
-
-> Technically, this seems to be a bug in the haskell URI library; it honors
-> the `[]` in parsing, but does not remove them when the URI is queried for
-> the host part. 
-
-<pre>
-Prelude Network.URI> let (Just u) = parseURI "http://foo@[2001:0:53aa:64c:24ef:5ce4:2ef9:cdda]/bar"
-Prelude Network.URI> let (Just a) = uriAuthority u
-Prelude Network.URI> uriRegName a
-"[2001:0:53aa:64c:24ef:5ce4:2ef9:cdda]"
-Prelude Network.URI> isIPv6address $ uriRegName a
-False
-</pre>
-
-> I have filed a [bug upstream](http://trac.haskell.org/network/ticket/40), and put a workaround in git-annex. [[done]]
-> --[[Joey]] 
diff --git a/doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn b/doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn
+++ /dev/null
@@ -1,103 +0,0 @@
-Somehow git-annex has again lost a complete rsync remote with encryption enabled...
-
-git-annex version was 3.20111111
-
-> "once again" ? When did it do it before?
-
->> It's the second time i uploaded all the files to an encrypted rsync remote and git-annex is not able to find it anymore. --[[gebi]]
-
-> "lost" ? How is the remote lost?
-
->> git-annex is not able to find any files on the encrypted rsync remote anymore.
->> Copy does not copy the content again but drop doesn't find it, thus it's somehow "lost" and in an strange state.
->> I've also had the state where the content was already on the remote side but git-annex copy would copy it again,
->> ignoring all the data on the remote side. --[[gebi]]
-
-Both *remoteserver* and *localserver* are rsync remotes with enabled encryption.
-All commands are executed on the git repository on my laptop.
-Target of origin is a gitolite repository without annex support (thus the two rsync remotes).
-
-Is there a way in git-annex to verify that all files fullfill the numcopies, in my case
-numcopies=2, and can be read from the remotes their are on?
-I thought that *copy* would verify that, but seems not.
-    
-    % g a copy --to remoteserver tools
-    copy tools/md5_sha1_utility.exe (gpg) (checking remoteserver...) ok
-    copy tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking remoteserver...) ok
-    
-    % g a copy --to localserver tools
-    copy tools/md5_sha1_utility.exe (gpg) (checking localserver...) ok
-    copy tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking localserver...) ok
-    
-    % g a drop tools
-    drop tools/md5_sha1_utility.exe (gpg) (checking localserver...) (checking remoteserver...) (unsafe)
-      Could only verify the existence of 1 out of 2 necessary copies
-      
-      Try making some of these repositories available:
-            718a9b5c-1b4a-11e1-8211-6f094f20e050 -- remoteserver (remote backupserver)
-      
-      (Use --force to override this check, or adjust annex.numcopies.)
-    failed
-    drop tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking localserver...) (checking remoteserver...) (unsafe)
-      Could only verify the existence of 1 out of 2 necessary copies
-      
-      Try making some of these repositories available:
-            718a9b5c-1b4a-11e1-8211-6f094f20e050 -- remoteserver (remote backupserver)
-      
-      (Use --force to override this check, or adjust annex.numcopies.)
-    failed
-    git-annex: drop: 2 failed
-    
-    % g a fsck tools
-    fsck tools/md5_sha1_utility.exe (checksum...) ok
-    fsck tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checksum...) ok
-
-> Copy does do an explicit check that the content is present on remoteserver,
-> and based on the above, the content was found to be already there,
-> which is why it did not copy it again.
-> 
-> Drop does an indentical check that the content is present, and 
-> since it failed to find it, I am left thinking something must have
-> happened to the remove in between the copy and the drop to cause the
-> content to go away.
-> 
-> What happens if you copy the data to remoteserver again? --[[Joey]]
-
-The commands above are executed within a few seconds and completely repeatable. --[[gebi]]
-
-> In that case, why don't you run the commands with `-d` to see the actual
-> rsync command it's running to check if the content is present. 
-> Then you can try repeatedly running the command by hand and see why it
-> sometimes succeeds and sometimes fail.
-
-The commands fail and succeed consistently, not either or.
-git annex copy succeeds consistently with not copying the content to remote because it checks and it's already there.
-
-git annex drop fails consistently with error because content is missing on the exact same remote git annex copy checks
-and thinks the content is there. --[[gebi]]
-
-> The command will be something like this:
-> `rsync --quiet hostname:/dir/file 2>/dev/null`
-> 
-> The exit status is what's used to see if content is present -- and
-> currently any failure even a failure to connect is taken to mean it's not
-> present. --[[Joey]]
-
-hm... thats interesting, git annex drop and git annex copy check for different hashes on the same file at the same remote...
-
-git annex drop -d tools/md5_sha1_utility.exe
-> Running: sh ["-c","rsync --quiet 'REMOVED_HOST:annex/work/JF/z7/'\"'\"'GPGHMACSHA1--7ffb3840f0e37aee964352e98808403655e8473a/GPGHMACSHA1--7ffb3840f0e37aee964352e98808403655e8473a'\"'\"'' 2>/dev/null"]
-
-git annex copy --to remoteserver -d tools/md5_sha1_utility.exe
-> Running: sh ["-c","rsync --quiet 'REMOVED_HOST:annex/work/1F/PQ/'\"'\"'GPGHMACSHA1--ff075e57f649300c5698e346be74fb6e22d70e35/GPGHMACSHA1--ff075e57f649300c5698e346be74fb6e22d70e35'\"'\"'' 2>/dev/null"]
-
-And yes, only the hash *annex copy* is checking for exists on the remote side. --[[gebi]]
-
-> Ok, this is due to too aggressive caching of the decrypted cipher
-> for a remote. When dopping, it decrypts localserver's cipher, 
-> caches it, and then when checking remoteserver it says hey, 
-> here's an already decrypted cipher -- it must be the right one!
-> 
-> Problem reproduced here, and fixed. [[done]] --[[Joey]]
-
-THX Joey! -- [[gebi]]
diff --git a/doc/bugs/git-annex_merge_stalls.mdwn b/doc/bugs/git-annex_merge_stalls.mdwn
--- a/doc/bugs/git-annex_merge_stalls.mdwn
+++ b/doc/bugs/git-annex_merge_stalls.mdwn
@@ -14,3 +14,5 @@
 dtruss output at https://www.dropbox.com/s/4b3yqn7ajfz5el2/annex-merge.log
 
 [[!meta title="no indication when git-annex is stuck waiting for a lock"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git-annex_on_crippled_filesystem_can_still_failed_due_to_case_.mdwn b/doc/bugs/git-annex_on_crippled_filesystem_can_still_failed_due_to_case_.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_on_crippled_filesystem_can_still_failed_due_to_case_.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-What steps will reproduce the problem?
-
-    $ git clone ~/corbeau/travail/ travail
-    Cloning into 'travail'...
-    done.
-    Checking out files: 100% (8670/8670), done.
-    $ cd travail
-    $ git annex init "portable USB drive"
-    init portable USB drive 
-      Detected a crippled filesystem.
-
-      Enabling direct mode.
-
-    git-annex: /media/LACIE/travail/.git/annex/objects/k1: createDirectory: already exists (File exists)
-    failed
-    git-annex: init: 1 failed
-
-What version of git-annex are you using? On what operating system?
-    $ apt-cache policy git-annex
-    git-annex:
-    Installé : 3.20130216
-
-This on a amd64 debian sid recently updated
-
-
-Please provide any additional information below.
-
-The problem is that git annex already created a /media/LACIE/travail/.git/annex/objects/K1 file (same name in uppercase) and FAT isn't realy case sensitive.
-
-
-> I *think* I've found the place that used createDirectory
-> rather than createDirectoryIfMissing and fixed it. [[done]] --[[Joey]]
diff --git a/doc/bugs/git-annex_quit_unexpectedly___40__macosx__41__.mdwn b/doc/bugs/git-annex_quit_unexpectedly___40__macosx__41__.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_quit_unexpectedly___40__macosx__41__.mdwn
+++ /dev/null
@@ -1,358 +0,0 @@
-### Please describe the problem.
-
-I installed the git-annex app for MacOSX (10.8.4)
-
-### What steps will reproduce the problem?
-
-- Created a repository
-- In the configuration, entered my google username/password
-
-### What version of git-annex are you using? On what operating system?
-
-bundle version: 0.0.1
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-Process:         git-annex [12934]
-Path:            /Applications/git-annex.app/Contents/MacOS/bundle/git-annex
-Identifier:      git-annex
-Version:         0
-Code Type:       X86-64 (Native)
-Parent Process:  ??? [1]
-User ID:         502
-
-Date/Time:       2013-08-17 12:27:12.495 -0700
-OS Version:      Mac OS X 10.8.4 (12E55)
-Report Version:  10
-Sleep/Wake UUID: 6DB42174-0147-4C8B-B83E-F305823297CA
-
-Interval Since Last Report:          294009 sec
-Crashes Since Last Report:           4
-Per-App Crashes Since Last Report:   4
-Anonymous UUID:                      0D492F72-DAE5-360C-A6D6-ECB38FD53115
-
-Crashed Thread:  3
-
-Exception Type:  EXC_BAD_ACCESS (SIGSEGV)
-Exception Codes: KERN_INVALID_ADDRESS at 0x0000000000000000
-
-VM Regions Near 0:
---> 
-    __TEXT                 000000010b5e6000-000000010e08d000 [ 42.7M] r-x/rwx SM=COW  /Applications/git-annex.app/Contents/MacOS/bundle/git-annex
-
-Thread 0:: Dispatch queue: com.apple.main-thread
-0   libsystem_kernel.dylib        	0x00007fff931400fa __psynch_cvwait + 10
-1   libsystem_c.dylib             	0x00007fff86adffe9 _pthread_cond_wait + 869
-2   git-annex                     	0x000000010df20179 0x10b5e6000 + 43229561
-3   git-annex                     	0x000000010defc8eb 0x10b5e6000 + 43084011
-4   git-annex                     	0x000000010df0bc86 0x10b5e6000 + 43146374
-5   git-annex                     	0x000000010df0c6fb 0x10b5e6000 + 43149051
-6   git-annex                     	0x000000010df07b46 0x10b5e6000 + 43129670
-7   git-annex                     	0x000000010df07c69 0x10b5e6000 + 43129961
-8   git-annex                     	0x000000010bcff518 0x10b5e6000 + 7443736
-9   libdyld.dylib                 	0x00007fff8c3e47e1 start + 1
-
-Thread 1:
-0   libsystem_kernel.dylib        	0x00007fff931400fa __psynch_cvwait + 10
-1   libsystem_c.dylib             	0x00007fff86adffe9 _pthread_cond_wait + 869
-2   git-annex                     	0x000000010df20179 0x10b5e6000 + 43229561
-3   git-annex                     	0x000000010defc8eb 0x10b5e6000 + 43084011
-4   git-annex                     	0x000000010df0bc86 0x10b5e6000 + 43146374
-5   git-annex                     	0x000000010df0c5e0 0x10b5e6000 + 43148768
-6   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-7   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 2:
-0   libsystem_kernel.dylib        	0x00007fff931400fa __psynch_cvwait + 10
-1   libsystem_c.dylib             	0x00007fff86adffe9 _pthread_cond_wait + 869
-2   git-annex                     	0x000000010df20179 0x10b5e6000 + 43229561
-3   git-annex                     	0x000000010defc8eb 0x10b5e6000 + 43084011
-4   git-annex                     	0x000000010df0bc86 0x10b5e6000 + 43146374
-5   git-annex                     	0x000000010df0c5e0 0x10b5e6000 + 43148768
-6   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-7   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 3 Crashed:
-0   libsystem_c.dylib             	0x00007fff86ae0bf9 pthread_mutex_lock + 20
-1   H                             	0x000000010e9fd29f gnutls_system_mutex_lock + 12
-2   H                             	0x000000010ea7fa29 wrap_nettle_rnd_refresh + 20
-3   H                             	0x000000010e9fee89 gnutls_deinit + 42
-4   git-annex                     	0x000000010caf0a3a 0x10b5e6000 + 22063674
-
-Thread 4:
-0   libsystem_kernel.dylib        	0x00007fff93140d2a kevent64 + 10
-1   git-annex                     	0x000000010deab5fa 0x10b5e6000 + 42751482
-
-Thread 5:
-0   libsystem_kernel.dylib        	0x00007fff931400fa __psynch_cvwait + 10
-1   libsystem_c.dylib             	0x00007fff86adffe9 _pthread_cond_wait + 869
-2   git-annex                     	0x000000010df20179 0x10b5e6000 + 43229561
-3   git-annex                     	0x000000010defc8eb 0x10b5e6000 + 43084011
-4   git-annex                     	0x000000010df0bc86 0x10b5e6000 + 43146374
-5   git-annex                     	0x000000010df0c5e0 0x10b5e6000 + 43148768
-6   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-7   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 6:: Dispatch queue: com.apple.libdispatch-manager
-0   libsystem_kernel.dylib        	0x00007fff93140d16 kevent + 10
-1   libdispatch.dylib             	0x00007fff8e6fedea _dispatch_mgr_invoke + 883
-2   libdispatch.dylib             	0x00007fff8e6fe9ee _dispatch_mgr_thread + 54
-
-Thread 7:
-0   libsystem_kernel.dylib        	0x00007fff9313e686 mach_msg_trap + 10
-1   libsystem_kernel.dylib        	0x00007fff9313dc42 mach_msg + 70
-2   com.apple.CoreFoundation      	0x00007fff8c1e2233 __CFRunLoopServiceMachPort + 195
-3   com.apple.CoreFoundation      	0x00007fff8c1e7916 __CFRunLoopRun + 1078
-4   com.apple.CoreFoundation      	0x00007fff8c1e70e2 CFRunLoopRunSpecific + 290
-5   com.apple.CoreFoundation      	0x00007fff8c1f5dd1 CFRunLoopRun + 97
-6   git-annex                     	0x000000010c72b3ec 0x10b5e6000 + 18109420
-7   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-8   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 8:
-0   libsystem_kernel.dylib        	0x00007fff9313e686 mach_msg_trap + 10
-1   libsystem_kernel.dylib        	0x00007fff9313dc42 mach_msg + 70
-2   com.apple.CoreFoundation      	0x00007fff8c1e2233 __CFRunLoopServiceMachPort + 195
-3   com.apple.CoreFoundation      	0x00007fff8c1e7916 __CFRunLoopRun + 1078
-4   com.apple.CoreFoundation      	0x00007fff8c1e70e2 CFRunLoopRunSpecific + 290
-5   com.apple.CoreFoundation      	0x00007fff8c1f5dd1 CFRunLoopRun + 97
-6   git-annex                     	0x000000010c72b3ec 0x10b5e6000 + 18109420
-7   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-8   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 9:
-0   libsystem_kernel.dylib        	0x00007fff9313e686 mach_msg_trap + 10
-1   libsystem_kernel.dylib        	0x00007fff9313dc42 mach_msg + 70
-2   com.apple.CoreFoundation      	0x00007fff8c1e2233 __CFRunLoopServiceMachPort + 195
-3   com.apple.CoreFoundation      	0x00007fff8c1e7916 __CFRunLoopRun + 1078
-4   com.apple.CoreFoundation      	0x00007fff8c1e70e2 CFRunLoopRunSpecific + 290
-5   com.apple.CoreFoundation      	0x00007fff8c1f5dd1 CFRunLoopRun + 97
-6   git-annex                     	0x000000010c72b3ec 0x10b5e6000 + 18109420
-7   libsystem_c.dylib             	0x00007fff86adb7a2 _pthread_start + 327
-8   libsystem_c.dylib             	0x00007fff86ac81e1 thread_start + 13
-
-Thread 3 crashed with X86 Thread State (64-bit):
-  rax: 0x000000010eaaca28  rbx: 0x00007f9dc38000c0  rcx: 0x000000010f87ce00  rdx: 0x000000010e3c28f0
-  rdi: 0x0000000000000000  rsi: 0x001c4500001c4500  rbp: 0x000000010f87ce10  rsp: 0x000000010f87cdd0
-   r8: 0x0000000000002060   r9: 0x000000010f87ce00  r10: 0x000000010eabf328  r11: 0x000000010e9fee5f
-  r12: 0x000000010f5585d8  r13: 0x000000010e3c2798  r14: 0x0000000000000000  r15: 0x000000010f548140
-  rip: 0x00007fff86ae0bf9  rfl: 0x0000000000010202  cr2: 0x0000000000000000
-Logical CPU: 0
-
-Binary Images:
-       0x10b5e6000 -        0x10e08cff7 +git-annex (0) <2C4C13B3-4830-322A-A144-9E51B386EB1E> /Applications/git-annex.app/Contents/MacOS/bundle/git-annex
-       0x10e85a000 -        0x10e957ff7 +E (22.3) <47B09CB2-C636-3024-8B55-6040F7829B4C> /Applications/git-annex.app/Contents/MacOS/bundle/E
-       0x10e990000 -        0x10e9a4fff +F (0) <FA90B1B1-A866-3A6C-BB97-06955F4C8C0B> /Applications/git-annex.app/Contents/MacOS/bundle/F
-       0x10e9ab000 -        0x10e9d8ff7 +G (0) <D80652C0-9A55-351C-8EAF-2364359BA0A2> /Applications/git-annex.app/Contents/MacOS/bundle/G
-       0x10e9de000 -        0x10eaabfdf +H (0) <29C3AFF5-8EFB-3A16-81F6-0DA6CF2675A6> /Applications/git-annex.app/Contents/MacOS/bundle/H
-       0x10eadd000 -        0x10eaefff7 +B (43) <2A1551E8-A272-3DE5-B692-955974FE1416> /Applications/git-annex.app/Contents/MacOS/bundle/B
-       0x10eaf7000 -        0x10ebecfff +D (34) <FEE8B996-EB44-37FA-B96E-D379664DEFE1> /Applications/git-annex.app/Contents/MacOS/bundle/D
-       0x10ec01000 -        0x10ed1992f +I (532.2) <90D31928-F48D-3E37-874F-220A51FD9E37> /Applications/git-annex.app/Contents/MacOS/bundle/I
-       0x10ed3d000 -        0x10ef3dfff +S (491.11.3) <5783D305-04E8-3D17-94F7-1CEAFA975240> /Applications/git-annex.app/Contents/MacOS/bundle/S
-       0x10f048000 -        0x10f06dff7 +Z (26) <D86169F3-9F31-377A-9AF3-DB17142052E4> /Applications/git-annex.app/Contents/MacOS/bundle/Z
-       0x10f0a1000 -        0x10f109ff7 +0A (65.1) <20E31B90-19B9-3C2A-A9EB-474E08F9FE05> /Applications/git-annex.app/Contents/MacOS/bundle/0A
-       0x10f163000 -        0x10f1ccfff +0B (56) <EAA2B53E-EADE-39CF-A0EF-FB9D4940672A> /Applications/git-annex.app/Contents/MacOS/bundle/0B
-       0x10f235000 -        0x10f248fff +T (0) <C8970714-4C86-3BE6-94D6-4835DCC8A003> /Applications/git-annex.app/Contents/MacOS/bundle/T
-       0x10f257000 -        0x10f264ff7 +U (0) <DCFF385A-090B-3407-868C-91544A2EFEE1> /Applications/git-annex.app/Contents/MacOS/bundle/U
-       0x10f26f000 -        0x10f291ff7 +V (0) <51B317C7-94CC-3C58-B515-924BB3AF0BCC> /Applications/git-annex.app/Contents/MacOS/bundle/V
-       0x10f29b000 -        0x10f2a8ff7 +W (0) <91CF16BE-027F-3FE6-B1EE-6B8BFD51FC1B> /Applications/git-annex.app/Contents/MacOS/bundle/W
-       0x10f2b4000 -        0x10f310fd7 +X (0) <84D934AF-A321-36C0-BBCF-CD3FDAEB0B95> /Applications/git-annex.app/Contents/MacOS/bundle/X
-    0x7fff6b1e6000 -     0x7fff6b21a93f  dyld (210.2.3) <36CAA36E-72BC-3E48-96D9-B96A2DF77730> /usr/lib/dyld
-    0x7fff8652a000 -     0x7fff865d0ff7  com.apple.CoreServices.OSServices (557.6 - 557.6) <FFDDD2D8-690D-388F-A48F-4750A792D2CD> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices
-    0x7fff865d1000 -     0x7fff865e8fff  libGL.dylib (8.9.2) <B8E5948D-BCF2-3727-B74E-D74B8EDC82D6> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-    0x7fff865e9000 -     0x7fff86610fff  com.apple.framework.familycontrols (4.1 - 410) <50F5A52C-8FB6-300A-977D-5CFDE4D5796B> /System/Library/PrivateFrameworks/FamilyControls.framework/Versions/A/FamilyControls
-    0x7fff86611000 -     0x7fff8663cfff  libxslt.1.dylib (11.3) <441776B8-9130-3893-956F-39C85FFA644F> /usr/lib/libxslt.1.dylib
-    0x7fff86649000 -     0x7fff86698ff7  libcorecrypto.dylib (106.2) <CE0C29A3-C420-339B-ADAA-52F4683233CC> /usr/lib/system/libcorecrypto.dylib
-    0x7fff8669d000 -     0x7fff866a3fff  com.apple.DiskArbitration (2.5.2 - 2.5.2) <C713A35A-360E-36CE-AC0A-25C86A3F50CA> /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration
-    0x7fff866a4000 -     0x7fff86ac1fff  FaceCoreLight (2.4.1) <DDAFFD7A-D312-3407-A010-5AEF3E17831B> /System/Library/PrivateFrameworks/FaceCoreLight.framework/Versions/A/FaceCoreLight
-    0x7fff86ac7000 -     0x7fff86b93ff7  libsystem_c.dylib (825.26) <4C9EB006-FE1F-3F8F-8074-DFD94CF2CE7B> /usr/lib/system/libsystem_c.dylib
-    0x7fff86d50000 -     0x7fff86da1ff7  com.apple.SystemConfiguration (1.12.2 - 1.12.2) <581BF463-C15A-363B-999A-E830222FA925> /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration
-    0x7fff86dee000 -     0x7fff86deefff  com.apple.Accelerate.vecLib (3.8 - vecLib 3.8) <B5A18EE8-DF81-38DD-ACAF-7076B2A26225> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib
-    0x7fff86def000 -     0x7fff86df4fff  com.apple.OpenDirectory (10.8 - 151.10) <CF44120B-9B01-32DD-852E-C9C0E1243FC0> /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory
-    0x7fff86df5000 -     0x7fff86df6fff  libDiagnosticMessagesClient.dylib (8) <8548E0DC-0D2F-30B6-B045-FE8A038E76D8> /usr/lib/libDiagnosticMessagesClient.dylib
-    0x7fff86e0a000 -     0x7fff87201fff  libLAPACK.dylib (1073.4) <D632EC8B-2BA0-3853-800A-20DA00A1091C> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
-    0x7fff87622000 -     0x7fff87650ff7  libsystem_m.dylib (3022.6) <B434BE5C-25AB-3EBD-BAA7-5304B34E3441> /usr/lib/system/libsystem_m.dylib
-    0x7fff8766c000 -     0x7fff8769dff7  com.apple.DictionaryServices (1.2 - 184.4) <FB0540FF-5034-3591-A28D-6887FBC220F7> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices
-    0x7fff8769e000 -     0x7fff8769efff  libkeymgr.dylib (25) <CC9E3394-BE16-397F-926B-E579B60EE429> /usr/lib/system/libkeymgr.dylib
-    0x7fff87732000 -     0x7fff87754ff7  libxpc.dylib (140.43) <70BC645B-6952-3264-930C-C835010CCEF9> /usr/lib/system/libxpc.dylib
-    0x7fff87755000 -     0x7fff877d7ff7  com.apple.Heimdal (3.0 - 2.0) <C94B0C6C-1320-35A1-8143-FE252E7B2A08> /System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal
-    0x7fff877d8000 -     0x7fff87859fff  com.apple.Metadata (10.7.0 - 707.11) <2DD25313-420D-351A-90F1-300E95C970CA> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata
-    0x7fff87cbf000 -     0x7fff87d19fff  com.apple.print.framework.PrintCore (8.3 - 387.2) <5BA0CBED-4D80-386A-9646-F835C9805B71> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore
-    0x7fff87e27000 -     0x7fff87e34ff7  com.apple.NetAuth (4.0 - 4.0) <F5BC7D7D-AF28-3C83-A674-DADA48FF7810> /System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth
-    0x7fff87f54000 -     0x7fff87f68fff  com.apple.speech.synthesis.framework (4.1.12 - 4.1.12) <94EDF2AB-809C-3D15-BED5-7AD45B2A7C16> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis
-    0x7fff87f77000 -     0x7fff87f7dff7  libunwind.dylib (35.1) <21703D36-2DAB-3D8B-8442-EAAB23C060D3> /usr/lib/system/libunwind.dylib
-    0x7fff87fab000 -     0x7fff87fabfff  com.apple.Accelerate (1.8 - Accelerate 1.8) <6AD48543-0864-3D40-80CE-01F184F24B45> /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate
-    0x7fff88161000 -     0x7fff88162ff7  libSystem.B.dylib (169.3) <9089D72D-E714-31E1-80C8-698A8E8B05AD> /usr/lib/libSystem.B.dylib
-    0x7fff88167000 -     0x7fff88205ff7  com.apple.ink.framework (10.8.2 - 150) <3D8D16A2-7E01-3EA1-B637-83A36D353308> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink
-    0x7fff88222000 -     0x7fff88223ff7  libsystem_sandbox.dylib (220.3) <B739DA63-B675-387A-AD84-412A651143C0> /usr/lib/system/libsystem_sandbox.dylib
-    0x7fff88224000 -     0x7fff88228ff7  com.apple.TCC (1.0 - 1) <F2F3B753-FC73-3543-8BBE-859FDBB4D6A6> /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC
-    0x7fff88229000 -     0x7fff88230fff  libcopyfile.dylib (89) <876573D0-E907-3566-A108-577EAD1B6182> /usr/lib/system/libcopyfile.dylib
-    0x7fff88a6e000 -     0x7fff88a8dff7  libresolv.9.dylib (51) <0882DC2D-A892-31FF-AD8C-0BB518C48B23> /usr/lib/libresolv.9.dylib
-    0x7fff88a8e000 -     0x7fff88aa1ff7  libbsm.0.dylib (32) <F497D3CE-40D9-3551-84B4-3D5E39600737> /usr/lib/libbsm.0.dylib
-    0x7fff88bbd000 -     0x7fff88bbdfff  com.apple.ApplicationServices (45 - 45) <A3ABF20B-ED3A-32B5-830E-B37831A45A80> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices
-    0x7fff88bce000 -     0x7fff88bf6fff  libJPEG.dylib (850) <DC750E1E-BD07-339B-A4A6-D86BFE969F68> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib
-    0x7fff88bf7000 -     0x7fff88bf9fff  libquarantine.dylib (52.1) <143B726E-DF47-37A8-90AA-F059CFD1A2E4> /usr/lib/system/libquarantine.dylib
-    0x7fff88fe0000 -     0x7fff8933ffff  com.apple.Foundation (6.8 - 945.18) <1D7E58E6-FA3A-3CE8-AC85-B9D06B8C0AA0> /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation
-    0x7fff89340000 -     0x7fff89575ff7  com.apple.CoreData (106.1 - 407.7) <A676E1A4-2144-376B-92B8-B450DD1D78E5> /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData
-    0x7fff89576000 -     0x7fff8957dfff  libGFXShared.dylib (8.9.2) <398F8D57-EC82-3E13-AC8E-470BE19237D7> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib
-    0x7fff895d4000 -     0x7fff8a201fff  com.apple.AppKit (6.8 - 1187.39) <199962F0-B06B-3666-8FD5-5C90374BA16A> /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit
-    0x7fff8a202000 -     0x7fff8a519ff7  com.apple.CoreServices.CarbonCore (1037.6 - 1037.6) <1E567A52-677F-3168-979F-5FBB0818D52B> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore
-    0x7fff8a5e0000 -     0x7fff8a5e7fff  com.apple.NetFS (5.0 - 4.0) <82E24B9A-7742-3DA3-9E99-ED267D98C05E> /System/Library/Frameworks/NetFS.framework/Versions/A/NetFS
-    0x7fff8a5e8000 -     0x7fff8a63fff7  com.apple.ScalableUserInterface (1.0 - 1) <F1D43DFB-1796-361B-AD4B-39F1EED3BE19> /System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/ScalableUserInterface.framework/Versions/A/ScalableUserInterface
-    0x7fff8a71b000 -     0x7fff8a767ff7  libauto.dylib (185.4) <AD5A4CE7-CB53-313C-9FAE-673303CC2D35> /usr/lib/libauto.dylib
-    0x7fff8a768000 -     0x7fff8a768fff  libOpenScriptingUtil.dylib (148.3) <F8681222-0969-3B10-8BCE-C55A4B9C520C> /usr/lib/libOpenScriptingUtil.dylib
-    0x7fff8a7e7000 -     0x7fff8a808ff7  libCRFSuite.dylib (33) <736ABE58-8DED-3289-A042-C25AF7AE5B23> /usr/lib/libCRFSuite.dylib
-    0x7fff8a809000 -     0x7fff8a815fff  com.apple.CrashReporterSupport (10.8.3 - 418) <DE6AFE16-D97E-399D-82ED-3522C773C36E> /System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport
-    0x7fff8a816000 -     0x7fff8b1a64af  com.apple.CoreGraphics (1.600.0 - 332) <5AB32E51-9154-3733-B83B-A9A748652847> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics
-    0x7fff8b1a7000 -     0x7fff8b1befff  com.apple.CFOpenDirectory (10.8 - 151.10) <10F41DA4-AD54-3F52-B898-588D9A117171> /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory
-    0x7fff8b242000 -     0x7fff8b285ff7  com.apple.bom (12.0 - 192) <0BF1F2D2-3648-36B7-BE4B-551A0173209B> /System/Library/PrivateFrameworks/Bom.framework/Versions/A/Bom
-    0x7fff8b286000 -     0x7fff8b2c3fef  libGLImage.dylib (8.9.2) <C38649ED-E1C9-315E-9953-F33E8C6A3C89> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib
-    0x7fff8b2c4000 -     0x7fff8b303ff7  com.apple.QD (3.42.1 - 285.1) <77A20C25-EBB5-341C-A05C-5D458B97AD5C> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD
-    0x7fff8b304000 -     0x7fff8b39efff  libvMisc.dylib (380.6) <714336EA-1C0E-3735-B31C-19DFDAAF6221> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib
-    0x7fff8b3b8000 -     0x7fff8b566fff  com.apple.QuartzCore (1.8 - 304.3) <F450F2DE-2F24-3557-98B6-310E05DAC17F> /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore
-    0x7fff8ba39000 -     0x7fff8ba4cff7  com.apple.LangAnalysis (1.7.0 - 1.7.0) <2F2694E9-A7BC-33C7-B4CF-8EC907DF0FEB> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis
-    0x7fff8bd12000 -     0x7fff8bd1cfff  com.apple.speech.recognition.framework (4.1.5 - 4.1.5) <D803919C-3102-3515-A178-61E9C86C46A1> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition
-    0x7fff8c0d6000 -     0x7fff8c0d7ff7  libdnsinfo.dylib (453.19) <14202FFB-C3CA-3FCC-94B0-14611BF8692D> /usr/lib/system/libdnsinfo.dylib
-    0x7fff8c179000 -     0x7fff8c17efff  libcompiler_rt.dylib (30) <08F8731D-5961-39F1-AD00-4590321D24A9> /usr/lib/system/libcompiler_rt.dylib
-    0x7fff8c1b2000 -     0x7fff8c39cff7  com.apple.CoreFoundation (6.8 - 744.19) <0F7403CA-2CB8-3D0A-992B-679701DF27CA> /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
-    0x7fff8c39d000 -     0x7fff8c3c4ff7  com.apple.PerformanceAnalysis (1.16 - 16) <E4888388-F41B-313E-9CBB-5807D077BDA9> /System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis
-    0x7fff8c3e2000 -     0x7fff8c3e5ff7  libdyld.dylib (210.2.3) <F59367C9-C110-382B-A695-9035A6DD387E> /usr/lib/system/libdyld.dylib
-    0x7fff8c3e6000 -     0x7fff8c3e8fff  libCVMSPluginSupport.dylib (8.9.2) <EF1192AC-3357-3A0B-BFAF-6594D7737892> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib
-    0x7fff8c3e9000 -     0x7fff8c484fff  com.apple.CoreSymbolication (3.0 - 117) <50716F74-41C2-3BB9-AC16-12C4D4C2DD1E> /System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication
-    0x7fff8c75b000 -     0x7fff8c75bfff  com.apple.CoreServices (57 - 57) <9DD44CB0-C644-35C3-8F57-0B41B3EC147D> /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices
-    0x7fff8cf1f000 -     0x7fff8d094ff7  com.apple.CFNetwork (596.4.3 - 596.4.3) <A57B3308-2F08-3EC3-B4AC-39A3D9F0B9F7> /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork
-    0x7fff8d0ae000 -     0x7fff8d0e4fff  libsystem_info.dylib (406.17) <4FFCA242-7F04-365F-87A6-D4EFB89503C1> /usr/lib/system/libsystem_info.dylib
-    0x7fff8d0e5000 -     0x7fff8d148ff7  com.apple.audio.CoreAudio (4.1.1 - 4.1.1) <9ACD3AED-6C04-3BBB-AB2A-FC253B16D093> /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio
-    0x7fff8d156000 -     0x7fff8d16cfff  com.apple.MultitouchSupport.framework (235.29 - 235.29) <617EC8F1-BCE7-3553-86DD-F857866E1257> /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport
-    0x7fff8d16d000 -     0x7fff8d171fff  libGIF.dylib (850) <D4525F87-759C-338C-B283-BB8DE815D3D5> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib
-    0x7fff8d264000 -     0x7fff8d2aeff7  libGLU.dylib (8.9.2) <1B5511FF-1064-3004-A245-972CE5687D37> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib
-    0x7fff8d2b2000 -     0x7fff8d2dcff7  com.apple.CoreVideo (1.8 - 99.4) <E5082966-6D81-3973-A05A-38AA5B85F886> /System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo
-    0x7fff8d58d000 -     0x7fff8d591fff  com.apple.IOSurface (86.0.4 - 86.0.4) <26F01CD4-B76B-37A3-989D-66E8140542B3> /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface
-    0x7fff8d6de000 -     0x7fff8d78ffff  com.apple.LaunchServices (539.9 - 539.9) <07FC6766-778E-3479-8F28-D2C9917E1DD1> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices
-    0x7fff8d7bf000 -     0x7fff8d80eff7  libFontRegistry.dylib (100) <2E03D7DA-9B8F-31BB-8FB5-3D3B6272127F> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib
-    0x7fff8d80f000 -     0x7fff8d88fff7  com.apple.ApplicationServices.ATS (332 - 341.1) <39B53565-FA31-3F61-B090-C787C983142E> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS
-    0x7fff8d94e000 -     0x7fff8d95bfff  com.apple.AppleFSCompression (49 - 1.0) <5508344A-2A7E-3122-9562-6F363910A80E> /System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression
-    0x7fff8d95c000 -     0x7fff8d99fff7  com.apple.RemoteViewServices (2.0 - 80.6) <5CFA361D-4853-3ACC-9EFC-A2AC1F43BA4B> /System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices
-    0x7fff8dac2000 -     0x7fff8dac8fff  libmacho.dylib (829) <BF332AD9-E89F-387E-92A4-6E1AB74BD4D9> /usr/lib/system/libmacho.dylib
-    0x7fff8dac9000 -     0x7fff8db03ff7  com.apple.GSS (3.0 - 2.0) <970CAE00-1437-3F4E-B677-0FDB3714C08C> /System/Library/Frameworks/GSS.framework/Versions/A/GSS
-    0x7fff8db09000 -     0x7fff8db12ff7  com.apple.CommerceCore (1.0 - 26.1) <40A129A8-4E5D-3C7A-B299-8CB203C4C65D> /System/Library/PrivateFrameworks/CommerceKit.framework/Versions/A/Frameworks/CommerceCore.framework/Versions/A/CommerceCore
-    0x7fff8db13000 -     0x7fff8db15fff  com.apple.TrustEvaluationAgent (2.0 - 23) <A97D348B-32BF-3E52-8DF2-59BFAD21E1A3> /System/Library/PrivateFrameworks/TrustEvaluationAgent.framework/Versions/A/TrustEvaluationAgent
-    0x7fff8de6c000 -     0x7fff8de6eff7  libunc.dylib (25) <92805328-CD36-34FF-9436-571AB0485072> /usr/lib/system/libunc.dylib
-    0x7fff8de6f000 -     0x7fff8de8eff7  com.apple.ChunkingLibrary (2.0 - 133.3) <8BEC9AFB-DCAA-37E8-A5AB-24422B234ECF> /System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary
-    0x7fff8de8f000 -     0x7fff8deeefff  com.apple.AE (645.6 - 645.6) <44F403C1-660A-3543-AB9C-3902E02F936F> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE
-    0x7fff8deef000 -     0x7fff8dfecfff  libsqlite3.dylib (138.1) <ADE9CB98-D77D-300C-A32A-556B7440769F> /usr/lib/libsqlite3.dylib
-    0x7fff8e06b000 -     0x7fff8e076ff7  com.apple.bsd.ServiceManagement (2.0 - 2.0) <C12962D5-85FB-349E-AA56-64F4F487F219> /System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement
-    0x7fff8e077000 -     0x7fff8e086fff  com.apple.opengl (1.8.9 - 1.8.9) <6FD163A7-16CC-3D1F-B4B5-B0FDC4ADBF79> /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL
-    0x7fff8e087000 -     0x7fff8e092fff  com.apple.CommonAuth (3.0 - 2.0) <7A953C1F-8B18-3E46-9BEA-26D9B5B7745D> /System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth
-    0x7fff8e093000 -     0x7fff8e093fff  com.apple.Cocoa (6.7 - 19) <1F77945C-F37A-3171-B22E-F7AB0FCBB4D4> /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
-    0x7fff8e1f3000 -     0x7fff8e1f4fff  libsystem_blocks.dylib (59) <D92DCBC3-541C-37BD-AADE-ACC75A0C59C8> /usr/lib/system/libsystem_blocks.dylib
-    0x7fff8e23c000 -     0x7fff8e23cffd  com.apple.audio.units.AudioUnit (1.9 - 1.9) <EC55FB59-2443-3F08-9142-7BCC93C76E4E> /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit
-    0x7fff8e23d000 -     0x7fff8e30fff7  com.apple.CoreText (260.0 - 275.16) <5BFC1D67-6A6F-38BC-9D90-9C712684EDAC> /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText
-    0x7fff8e310000 -     0x7fff8e31eff7  libkxld.dylib (2050.24.15) <A619A9AC-09AF-3FF3-95BF-F07CC530EC31> /usr/lib/system/libkxld.dylib
-    0x7fff8e31f000 -     0x7fff8e38dff7  com.apple.framework.IOKit (2.0.1 - 755.24.1) <04BFB138-8AF4-310A-8E8C-045D8A239654> /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
-    0x7fff8e39f000 -     0x7fff8e525fff  libBLAS.dylib (1073.4) <C102C0F6-8CB6-3B49-BA6B-2EB61F0B2784> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib
-    0x7fff8e553000 -     0x7fff8e597fff  libcups.2.dylib (327.6) <9C01D012-6F4C-3B69-B614-1B408B0ED4E3> /usr/lib/libcups.2.dylib
-    0x7fff8e598000 -     0x7fff8e5a6fff  libcommonCrypto.dylib (60027) <BAAFE0C9-BB86-3CA7-88C0-E3CBA98DA06F> /usr/lib/system/libcommonCrypto.dylib
-    0x7fff8e6fa000 -     0x7fff8e70fff7  libdispatch.dylib (228.23) <D26996BF-FC57-39EB-8829-F63585561E09> /usr/lib/system/libdispatch.dylib
-    0x7fff8e710000 -     0x7fff8e71eff7  libsystem_network.dylib (77.10) <0D99F24E-56FE-380F-B81B-4A4C630EE587> /usr/lib/system/libsystem_network.dylib
-    0x7fff8e71f000 -     0x7fff8e741ff7  com.apple.Kerberos (2.0 - 1) <C49B8820-34ED-39D7-A407-A3E854153556> /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos
-    0x7fff8e788000 -     0x7fff8e797ff7  libxar.1.dylib (105) <370ED355-E516-311E-BAFD-D80633A84BE1> /usr/lib/libxar.1.dylib
-    0x7fff8f144000 -     0x7fff8f1d1ff7  com.apple.SearchKit (1.4.0 - 1.4.0) <C7F43889-F8BF-3CB9-AD66-11AEFCBCEDE7> /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit
-    0x7fff8f24c000 -     0x7fff8f24ffff  libRadiance.dylib (850) <62E3F7FB-03E3-3937-A857-AF57A75EAF09> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib
-    0x7fff8f533000 -     0x7fff8f7d7ff7  com.apple.CoreImage (8.4.0 - 1.0.1) <CC6DD22B-FFC6-310B-BE13-2397A02C79EF> /System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage
-    0x7fff8f7d8000 -     0x7fff8f840fff  libvDSP.dylib (380.6) <CD4C5EEB-9E63-30C4-8103-7A5EAEA0BE60> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib
-    0x7fff8f8ab000 -     0x7fff8f8affff  libpam.2.dylib (20) <C8F45864-5B58-3237-87E1-2C258A1D73B8> /usr/lib/libpam.2.dylib
-    0x7fff8fabb000 -     0x7fff8fb28ff7  com.apple.datadetectorscore (4.1 - 269.3) <5775F0DB-87D6-310D-8B03-E2AD729EFB28> /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore
-    0x7fff8fc60000 -     0x7fff8fcbcff7  com.apple.Symbolication (1.3 - 93) <97F3B1D2-D81D-3F37-87B3-B9A686124CF5> /System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication
-    0x7fff8fd91000 -     0x7fff8fe6bfff  com.apple.backup.framework (1.4.3 - 1.4.3) <6B65C44C-7777-3331-AD9D-438D10AAC777> /System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup
-    0x7fff8fe6c000 -     0x7fff8fe79fff  libbz2.1.0.dylib (29) <CE9785E8-B535-3504-B392-82F0064D9AF2> /usr/lib/libbz2.1.0.dylib
-    0x7fff8fe89000 -     0x7fff8ffdbfff  com.apple.audio.toolbox.AudioToolbox (1.9 - 1.9) <62770C0F-5600-3EF9-A893-8A234663FFF5> /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox
-    0x7fff90071000 -     0x7fff90173fff  libJP2.dylib (850) <2E43216C-3A5A-3693-820C-38B360698FA0> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib
-    0x7fff90ab4000 -     0x7fff90b79ff7  com.apple.coreui (2.0 - 181.1) <83D2C92D-6842-3C9D-9289-39D5B4554C3A> /System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI
-    0x7fff90e1a000 -     0x7fff90e1bfff  liblangid.dylib (116) <864C409D-D56B-383E-9B44-A435A47F2346> /usr/lib/liblangid.dylib
-    0x7fff90f20000 -     0x7fff90fddff7  com.apple.ColorSync (4.8.0 - 4.8.0) <6CE333AE-EDDB-3768-9598-9DB38041DC55> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync
-    0x7fff90fde000 -     0x7fff9105dff7  com.apple.securityfoundation (6.0 - 55115.4) <8676E0DF-295F-3690-BDAA-6C9C1D210B88> /System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation
-    0x7fff9105e000 -     0x7fff910b4fff  com.apple.HIServices (1.20 - 417) <BCD36950-013F-35C2-918E-05A93A47BE8C> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices
-    0x7fff910b5000 -     0x7fff910d6fff  com.apple.Ubiquity (1.2 - 243.15) <C9A7EE77-B637-3676-B667-C0843BBB0409> /System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity
-    0x7fff910de000 -     0x7fff91133ff7  libTIFF.dylib (850) <EDAF0D99-70AF-3B3F-9EFA-9463C91D0E3C> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib
-    0x7fff9125c000 -     0x7fff9127cfff  libPng.dylib (850) <203C43BF-FAD3-3CCB-81D5-F2770E36338B> /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib
-    0x7fff9127f000 -     0x7fff91398fff  com.apple.ImageIO.framework (3.2.1 - 850) <C3FFCEEB-AA0C-314B-9E94-7005EE48A403> /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-    0x7fff9139f000 -     0x7fff913b6fff  com.apple.GenerationalStorage (1.1 - 132.3) <FD4A84B3-13A8-3C60-A59E-25A361447A17> /System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage
-    0x7fff91582000 -     0x7fff91586fff  libCoreVMClient.dylib (32.3) <AD8391D9-56DD-3A78-A294-6A30E6ECE1A2> /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib
-    0x7fff91587000 -     0x7fff915bdfff  com.apple.DebugSymbols (98 - 98) <14E788B1-4EB2-3FD7-934B-849534DFC198> /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols
-    0x7fff915cd000 -     0x7fff915d5fff  liblaunch.dylib (442.26.2) <2F71CAF8-6524-329E-AC56-C506658B4C0C> /usr/lib/system/liblaunch.dylib
-    0x7fff915d6000 -     0x7fff915e1fff  libsystem_notify.dylib (98.5) <C49275CC-835A-3207-AFBA-8C01374927B6> /usr/lib/system/libsystem_notify.dylib
-    0x7fff91650000 -     0x7fff917ebfef  com.apple.vImage (6.0 - 6.0) <FAE13169-295A-33A5-8E6B-7C2CC1407FA7> /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage
-    0x7fff917ec000 -     0x7fff917f4ff7  libsystem_dnssd.dylib (379.38.1) <BDCB8566-0189-34C0-9634-35ABD3EFE25B> /usr/lib/system/libsystem_dnssd.dylib
-    0x7fff9182d000 -     0x7fff91938fff  libFontParser.dylib (84.6) <96C42E49-79A6-3475-B5E4-6A782599A6DA> /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib
-    0x7fff919d8000 -     0x7fff919ddfff  libcache.dylib (57) <65187C6E-3FBF-3EB8-A1AA-389445E2984D> /usr/lib/system/libcache.dylib
-    0x7fff919de000 -     0x7fff919defff  com.apple.vecLib (3.8 - vecLib 3.8) <794317C7-4E38-338A-A874-5E18001C8503> /System/Library/Frameworks/vecLib.framework/Versions/A/vecLib
-    0x7fff919df000 -     0x7fff91cb0ff7  com.apple.security (7.0 - 55179.13) <F428E306-C407-3B55-BA82-E58755E8A76F> /System/Library/Frameworks/Security.framework/Versions/A/Security
-    0x7fff91d3f000 -     0x7fff9206ffff  com.apple.HIToolbox (2.0 - 626.1) <656D08C2-9068-3532-ABDD-32EC5057CCB2> /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox
-    0x7fff92084000 -     0x7fff920deff7  com.apple.opencl (2.2.19 - 2.2.19) <3C7DFB2C-B3F9-3447-A1FC-EAAA42181A6E> /System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL
-    0x7fff9216c000 -     0x7fff9216dff7  libremovefile.dylib (23.2) <6763BC8E-18B8-3AD9-8FFA-B43713A7264F> /usr/lib/system/libremovefile.dylib
-    0x7fff9312e000 -     0x7fff93149ff7  libsystem_kernel.dylib (2050.24.15) <A9F97289-7985-31D6-AF89-151830684461> /usr/lib/system/libsystem_kernel.dylib
-    0x7fff9314d000 -     0x7fff9326dfff  com.apple.desktopservices (1.7.4 - 1.7.4) <ED3DA8C0-160F-3CDC-B537-BF2E766AB7C1> /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv
-
-External Modification Summary:
-  Calls made by other processes targeting this process:
-    task_for_pid: 1
-    thread_create: 0
-    thread_set_state: 0
-  Calls made by this process:
-    task_for_pid: 0
-    thread_create: 0
-    thread_set_state: 0
-  Calls made by all processes on this machine:
-    task_for_pid: 168404
-    thread_create: 1
-    thread_set_state: 0
-
-VM Region Summary:
-ReadOnly portion of Libraries: Total=109.3M resident=31.8M(29%) swapped_out_or_unallocated=77.5M(71%)
-Writable regions: Total=90.9M written=16.1M(18%) resident=17.5M(19%) swapped_out=0K(0%) unallocated=73.4M(81%)
- 
-REGION TYPE                      VIRTUAL
-===========                      =======
-MALLOC                             62.5M
-MALLOC guard page                    48K
-STACK GUARD                        56.0M
-Stack                              12.6M
-VM_ALLOCATE                        12.0M
-__DATA                             13.8M
-__IMAGE                             528K
-__LINKEDIT                         58.6M
-__TEXT                            134.3M
-__UNICODE                           544K
-shared memory                       308K
-===========                      =======
-TOTAL                             351.2M
-
-Model: MacBookPro10,1, BootROM MBP101.00EE.B03, 4 processors, Intel Core i7, 2.8 GHz, 16 GB, SMC 2.3f35
-Graphics: Intel HD Graphics 4000, Intel HD Graphics 4000, Built-In, 512 MB
-Graphics: NVIDIA GeForce GT 650M, NVIDIA GeForce GT 650M, PCIe, 1024 MB
-Memory Module: BANK 0/DIMM0, 8 GB, DDR3, 1600 MHz, 0x80AD, 0x484D5434314753364D465238432D50422020
-Memory Module: BANK 1/DIMM0, 8 GB, DDR3, 1600 MHz, 0x80AD, 0x484D5434314753364D465238432D50422020
-AirPort: spairport_wireless_card_type_airport_extreme (0x14E4, 0xEF), Broadcom BCM43xx 1.0 (5.106.98.100.17)
-Bluetooth: Version 4.1.4f2 12041, 2 service, 18 devices, 1 incoming serial ports
-Network Service: Wi-Fi, AirPort, en0
-Serial ATA Device: APPLE SSD SM768E, 751.28 GB
-USB Device: hub_device, 0x8087  (Intel Corporation), 0x0024, 0x1a100000 / 2
-USB Device: FaceTime HD Camera (Built-in), apple_vendor_id, 0x8510, 0x1a110000 / 3
-USB Device: USB Receiver, 0x046d  (Logitech Inc.), 0xc52b, 0x14200000 / 1
-USB Device: hub_device, 0x8087  (Intel Corporation), 0x0024, 0x1d100000 / 2
-USB Device: hub_device, 0x0424  (SMSC), 0x2512, 0x1d180000 / 3
-USB Device: Apple Internal Keyboard / Trackpad, apple_vendor_id, 0x0262, 0x1d182000 / 5
-USB Device: BRCM20702 Hub, 0x0a5c  (Broadcom Corp.), 0x4500, 0x1d181000 / 4
-USB Device: Bluetooth USB Host Controller, apple_vendor_id, 0x8286, 0x1d181300 / 6
-
-# End of transcript or log.
-"""]]
-
-> This got fixed in haskell gnutls 0.1.5. I have updated the Mtn Lion
-> autobuilder and it will be in tonight's build. [[done]]
-> --[[Joey]] 
diff --git a/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup.mdwn b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup.mdwn
--- a/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup.mdwn
+++ b/doc/bugs/git-annex_sucking_up_all_available_RAM_after_startup.mdwn
@@ -45,3 +45,5 @@
 
 # End of transcript or log.
 """]]
+
+[[!tag moreinfo]]
diff --git a/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn b/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-What steps will reproduce the problem?
-
-    git-annex sync
-
-What is the expected output? What do you see instead?
-
-The following error is mixed in with the output, took me a while to notice it:
-
-    Running: git ["--git-dir=/spare/annex/.git","--work-tree=/spare/annex","merge","--no-edit","refs/remotes/pip/synced/master"] 
-    error: unknown option `no-edit'
-
-What version of git-annex are you using? On what operating system?
-
-3.20120629~bpo60+1 on debian squeeze
-
-Please provide any additional information below.
-
-Installing git from backports as well cleared up the problem.
-
-> Uploading a fix for this now. [[done]] Thanks for reporting. --[[Joey]] 
diff --git a/doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not.mdwn b/doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not.mdwn
deleted file mode 100644
--- a/doc/bugs/git-annex_thinks_files_are_in_repositories_they_are_not.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-###What steps will reproduce the problem?
-
-1. Start git annex webapp, and make new repository on two computers.
-1. Pair them as "Local computer"s, and they synchronize fine, a file created on one shows up on the other.
-1. Disconnect one of the computers from the network, and create a new file
-1. Check where the file is.
-
-###What is the expected output? What do you see instead?
-
-    git annex whereis new file
-
-shows the file being in both repositories, when in fact it has had no chance to get added to the one on the other computer, and is not in it.
-
-
-###What version of git-annex are you using? On what operating system?
-
-Both 4.20130405 on Ubuntu 12.10
-
-###Please provide any additional information below.
-
-I noticed this first when using a USB drive to communicate between work and home. Making changes at home, it thought that the new files were now present at work, when the computer there is off, and a long way away.
---Walter
-
-> A little while ago, I made this change:
-
-  * direct mode: Direct mode commands now work on files staged in the index,
-    they do not need to be committed to git.
-
-> I think that fixes the confusing behavior described here. [[done]] --[[Joey]] 
diff --git a/doc/bugs/git-repair_real_world_failure_example.mdwn b/doc/bugs/git-repair_real_world_failure_example.mdwn
deleted file mode 100644
--- a/doc/bugs/git-repair_real_world_failure_example.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-I was given these 2 repos, git-repair fails on the first, and the
-second is a backup copy from before the problem:
-
-* <http://www.clacke.se/annex/podcasts.git.tar.xz>
-* <http://www.clacke.se/annex/podcasts-bak.git.tar.xz>
-
---[[Joey]]
-
-> Tested with current version, and it successfully repairs. 
-> Bug reporter was using an older version (based on some old messages).
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_add_..._adds_too_much.mdwn b/doc/bugs/git_annex_add_..._adds_too_much.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_add_..._adds_too_much.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-When a hidden file (starting with a dot) is git-annex add'ed, other non-tracked files are also added 
-
-What steps will reproduce the problem?
-
-$ touch a .b
-
-$ git annex add .b
-
-add a (checksum...) ok
-
-add .b (checksum...) ok
-
-(Recording state in git...)
-
-
-What is the expected output? What do you see instead?
-
-Only file .b should be added.
-
-What version of git-annex are you using? On what operating system?
-
-3.20120406
-(same problem with version 3.20120123) on Debian.
-
-> Thanks for reporting this bug, I've fixed it in git. [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long.mdwn b/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_add_eats_files_when_filename_is_too_long.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-Recently I ran into the following situation under Ubuntu with an encrypted home directory (which shortens the length that filenames can be):
-
-    $ git annex add 687474703a2f2f6d656469612e74756d626c722e636f6d2f74756d626c725f6c656673756557324c703171663879656b2e676966.gif
-    add 687474703a2f2f6d656469612e74756d626c722e636f6d2f74756d626c725f6c656673756557324c703171663879656b2e676966.gif failed
-    git-annex: /home/lhuhn/annex/.git/annex/tmp/155_518_WORM-s426663-m1310064100--687474703a2f2f6d656469612e74756d626c722e636f6d2f74756d626c725f6c656673756557324c703171663879656b2e676966.gif.log: openBinaryFile: invalid argument (File name too long)
-    git-annex: 1 failed
-
-The file seems to be completely gone.  It no longer exists in the current directory, or under .git/annex.
-
-I don't mind horribly that git-annex failed due to the name length limit, but it shouldn't have deleted my file in the process (fortunately the file wasn't very important, or hard to recover).
-
-> [[done]], as noted it did not delete content and now it makes the symlink
-> before trying to write to the location log, avoiding that gotcha.
-> --[[Joey]] 
diff --git a/doc/bugs/git_annex_add_error_with_Andrew_File_System.mdwn b/doc/bugs/git_annex_add_error_with_Andrew_File_System.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_add_error_with_Andrew_File_System.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-### Please describe the problem.
-I have a git annex clone on Andrew File System. I obtain an error when I try
-to add a file to the annex:
-
-git-annex: test: createLink: unsupported operation (Invalid cross-device link)
-
-### What steps will reproduce the problem?
-Create a test file with touch and add it with git annex add.
-
-### What version of git-annex are you using? On what operating system?
-git-annex 4.20130723 on Debian sid.
-
-### Please provide any additional information below.
-
-[[!format sh """
-gio@crack:~/nobackup/archive$ touch test
-gio@crack:~/nobackup/archive$ git annex add test
-add test 
-git-annex: test: createLink: unsupported operation (Invalid cross-device link)
-failed
-git-annex: add: 1 failed
-gio@crack:~/nobackup/archive$ logout
-"""]]
-
-It seems to me that AFS doesn't support hard links between different
-directories.
-
-> [[done]] per comments --[[Joey]] 
diff --git a/doc/bugs/git_annex_add_memory_leak.mdwn b/doc/bugs/git_annex_add_memory_leak.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_add_memory_leak.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-For the record, `git annex add` has had a series of memory leaks.
-Mostly these are minor -- until you need to check in a few
-million files in a single operation. 
-
-If this happens to you, git-annex will run out of memory and stop.
-(Generally well before your system runs out of memory, since it has some
-built-in ulimits.) You can recover by just re-running the `git annex add`
--- it will automatically pick up where it left off.
-
-A history of the leaks:
-
-* Originally, `git annex add` remembered all the files
-  it had added, and fed them to git at the end. Of course
-  that made its memory use grow, so it was fixed to periodically
-  flush its buffer. Fixed in version 0.20110417.
-
-* Something called a "lazy state monad" caused "thunks" to build
-  up and memory to leak. Also affected other git annex commands
-  than `add`. Adding files using a SHA* backend hit the worst.
-  Fixed in versions afer 3.20120123.
-
-* Committing journal files turned out to have another memory leak.
-  After adding a lot of files ran out of memory, this left the journal
-  behind and could affect other git-annex commands. Fixed in versions afer
-  3.20120123.
-
-* The count of the number of failed commands was updated lazily, which
-  caused a slow leak when running on a lot of files. Fixed in versions afer
-  3.20120123.
-
-* (Note that `git ls-files --others`, which is used to find files to add,
-  also uses surpsisingly large amounts
-  of memory when you have a lot of files. It buffers
-  the entire list, so it can compare it with the files in the index,
-  before outputting anything.
-  This is Not Our Problem, but I'm sure the git developers
-  would appreciate a patch that fixes it.)
-
-[[done]]
diff --git a/doc/bugs/git_annex_add_removes_file_with_no_data_left.mdwn b/doc/bugs/git_annex_add_removes_file_with_no_data_left.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_add_removes_file_with_no_data_left.mdwn
+++ /dev/null
@@ -1,103 +0,0 @@
-### Please describe the problem.
-Using git-annex from Debian (4.20130709), I attempted to add a 410M file named `Expressionlessm.tar`. It acted like it succeeded, but the link it created was broken. Other files would add correctly.
-
-### What steps will reproduce the problem?
-I can reliably cause the file to be removed and replaced with a dangling symlink by doing `git annex add Expressionlessm.tar`. The "addition" completes much faster than normal. Using the old version of git-annex that Ubuntu provides (3.20131112ubuntu4), the file adds correctly in at least one place it was having issues.
-
-### What version of git-annex are you using? On what operating system?
-I'm using the version of git-annex from Debian Sid on Ubuntu 13.04 (perhaps that's my issue?)
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-andrew@andrew-desktop:/media/MainStore/Projects$ git status
-# On branch master
-# Untracked files:
-#   (use "git add <file>..." to include in what will be committed)
-#
-==========Snip!=================
-nothing added to commit but untracked files present (use "git add" to track)
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ ls
-==========Snip!=================
-Expressionlessm.tar
-Expressionlessm.tar.bkup
-==========Snip!=================
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ tar tf Expressionlessm.tar 
-Expressionlessm/
-==========Snip!=================
-# Tar file is valid at this point
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ git annex add Expressionlessm.tar
-add Expressionlessm.tar ok
-(Recording state in git...)
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ ls
-==========Snip!=================
-Expressionlessm.tar
-Expressionlessm.tar.bkup
-==========Snip!=================
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ ls -l
-==========Snip!=================
-lrwxrwxrwx 1 andrew andrew       109 Jul 12 02:29 Expressionlessm.tar -> ../.git/annex/objects/vk/mF/SHA256-s3131909--a2808d850ba2e880ac58bf622cd68edd7e72ea2775b984d52b5d5266c43b03f0
--rw-rw-r-- 1 andrew andrew 428759040 Jul 10 20:30 Expressionlessm.tar.bkup
-==========Snip!=================
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ tar tf Expressionlessm.tar 
-tar: Expressionlessm.tar: Cannot open: No such file or directory
-tar: Error is not recoverable: exiting now
-
-
-=================================================================
-W O R K I N G   V E R S I O N
-This is what it looks like when the add works.
-=================================================================
-andrew@andrew-desktop:/media/MainStore/Projects$ cp Expressionlessm.tar.bkup Expressionlessm.tar
-andrew@andrew-desktop:/media/MainStore/Projects$ git annex add Expressionlessm.tar
-add Expressionlessm.tar (checksum...) ok
-(Recording state in git...)
-andrew@andrew-desktop:/media/MainStore/Projects$ git status
-# On branch master
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-#
-#	new file:   Expressionlessm.tar
-#
-# Untracked files:
-==========Snip!=================
-
-
-
-andrew@andrew-desktop:/media/MainStore/Projects$ ls -l
-==========Snip!=================
-lrwxrwxrwx 1 andrew andrew       195 Jul 12 02:20 Expressionlessm.tar -> ../.git/annex/objects/3v/Z7/SHA256-s428759040--133040f7b9d34ebce235aa24a0a16ab72af8f70e7a0722810d873815a2338eb2/SHA256-s428759040--133040f7b9d34ebce235aa24a0a16ab72af8f70e7a0722810d873815a2338eb2
--rw-rw-r-- 1 andrew andrew 428759040 Jul 10 20:30 Expressionlessm.tar.bkup
-==========Snip!=================
-# Notice the link target is different this time.
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; this bug is now prevented on several levels.
-> 
-> BTW, the earlier behavior where it didn't even make a valid .git/annex/objects/
-> symlink is also explained by this bug I've fixed. It pulled a truncated
-> link out of the tarball, and used that.
-> --[[Joey]] 
diff --git a/doc/bugs/git_annex_assistant_--autostart_failed.mdwn b/doc/bugs/git_annex_assistant_--autostart_failed.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_assistant_--autostart_failed.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-**What steps will reproduce the problem?**
-
-Run *git annex assistant --autostart*
-
-    git-annex autostart in /home/tobru/annex/repo1
-    failed
-    git-annex autostart in /home/tobru/annex/repo2
-    failed
-    git-annex autostart in /home/tobru/annex/repo3
-    failed
-    git-annex autostart in /home/tobru/annex/repo4
-    failed
-    git-annex autostart in /home/tobru/annex/repo5
-    failed
-
-Running *git annex assistant* in each directory starts the assistant without errors.
-
-What could cause autostart to fail? Is there any log? Or a --debug parameter?
-
-
-**What is the expected output? What do you see instead?**
-
-The assistant should start on all known repositories
-
-**What version of git-annex are you using? On what operating system?**
-
-4.20130417-g4bb97d5 on Ubuntu
-
-**Please provide any additional information below.**
-
-The ~/.config/git-annex/autostart file looks like this:
-
-    /home/tobru/annex/repo1
-    /home/tobru/annex/repo2
-    /home/tobru/annex/repo3
-    /home/tobru/annex/repo4
-    /home/tobru/annex/repo5
-
-> Closing, seems local misconfiguration. --[[Joey]] [[done]]
diff --git a/doc/bugs/git_annex_content_fails_with_a_parse_error.mdwn b/doc/bugs/git_annex_content_fails_with_a_parse_error.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_content_fails_with_a_parse_error.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-I tried to use git annex content, but that failed with a parse error.
-
-
-### What steps will reproduce the problem?
-
-Type this anywhere: 
-
-git annex --debug content . "exclude(foo.ml)"
-content . git-annex: Parse error: Parse failure: near "foo.ml"
-
-It fails with the example of the man page:
-   git annex content . "include(*.mp3) or include(*.ogg)"
-
-However, it works when trying: git annex content . "include()".
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130709.1, ubuntu quantal
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Fixed the example, thanks. --[[Joey]] [[done]]
diff --git a/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn b/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-I was testing out the fix/workaround for [[git-annex directory hashing problems on osx]] and I tried using the short forms of some of the commands i.e.
-
-    git annex copy -f externalusb .
-
-which gives me
-
-    git-annex: user error (option `-f' is ambiguous; could be one of:
-      -f         --force        allow actions that may lose annexed data
-      -f REMOTE  --from=REMOTE  specify from where to transfer content
-
-
-I would have expected that since *--to* is the same as *-t* and *--from* is the same as *-f* as the in program documentation suggests. But *-f* clashes with the force command, I would suggest that the short form of *--force* be changed to *-F* and possibly rename the *Fast* commands to *Quick* and use *-Q* as the short form of the *Quick* operations. I didn't try the *-f* option with the move command, but it probably suffers from the same issue. It's probably better to avoid clashing short forms of command options.
-
-I guess this issue is just a documentation issue and a minor interface change if needed and not a bug of git-annex, but a quirk.
-
-> Yeah, -f needs to be from; -F was already --fast. I have made --force not
-> have any short option abbreviation, I think it's entirely reasonable to
-> avoid fat-fingering an option that can lose data. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_copy_trying_to_connect_to_remotes_uninvolved.mdwn b/doc/bugs/git_annex_copy_trying_to_connect_to_remotes_uninvolved.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_copy_trying_to_connect_to_remotes_uninvolved.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-git-annex is trying to ssh (twice by the look of it) to a remote that is not involved in the copy. In this case, git-annex gives a usage error, but not before calling ssh twice:
-
-    $ git annex copy --from=hugex --to=h2 01-pilot.avi
-    ssh: connect to host 192.168.1.5 port 22: No route to host
-    ssh: connect to host 192.168.1.5 port 22: No route to host
-    fatal: Could not read from remote repository.
-    
-    Please make sure you have the correct access rights
-    and the repository exists.
-    git-annex: only one of --from or --to can be specified
-
-git-annex shouldn't be running ssh before checking commandline arguments! Or, in this case at all, since both remotes mentioned on the commandline are local:
-
-    $ git config remote.hugex.url
-    /media/hugex/jason/home.git
-    $ git config remote.h2.url
-    /media/h2/backup/git/home.git
-
-
-I'm running git-annex 4.20130627 as shipped with debian unstable.
-
--- 
-Jason
-
-P.S. 192.168.1.5 is set as the HostName for one of my other remotes in my ~/.ssh/config, so this isn't _totally_ out of the blue. 
-
-> [[done]]; see comment's explanation. --[[Joey]]
diff --git a/doc/bugs/git_annex_costs_not_working_as_expected_in_the_assistant.mdwn b/doc/bugs/git_annex_costs_not_working_as_expected_in_the_assistant.mdwn
--- a/doc/bugs/git_annex_costs_not_working_as_expected_in_the_assistant.mdwn
+++ b/doc/bugs/git_annex_costs_not_working_as_expected_in_the_assistant.mdwn
@@ -134,3 +134,7 @@
 
 # End of transcript or log.
 """]]
+
+[[!meta title="transferkeys protocol needs to include remote name to deal with multiple remotes with same UUID"]]
+
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_daemon_crashes_when_authenticating_with_jabber.de.mdwn b/doc/bugs/git_annex_daemon_crashes_when_authenticating_with_jabber.de.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/git_annex_daemon_crashes_when_authenticating_with_jabber.de.mdwn
@@ -0,0 +1,22 @@
+### Please describe the problem.
+In the webapp, I enter my credentials for my jabber.de account.  When I hit "use this account" the daemon and webapp crash.
+
+### What steps will reproduce the problem?
+Presumably, authenticate with a jabber.de account.
+
+### What version of git-annex are you using? On what operating system?
+git-annex version: 5.20140517-g0aed6d9
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+
+### Please provide any additional information below.
+
+[[!format sh """
+[2014-05-25 18:11:02 EDT] 127.0.0.1 POST /config/xmpp Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.114 Safari/537.36
+git-annex: <socket: 44>: hGetBuf: resource vanished (Connection reset by peer)
+git-annex: interrupted
+"""]]
diff --git a/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn b/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_describe_can_break_uuid.log.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-### Please describe the problem.
-
-`uuid.log` can end up in a state where `git annex describe` (and probably other things) stops working.
-
-### What steps will reproduce the problem?
-
-Run `git annex describe` against a remote that is not a an initialized git-annex repo.
-
-### What version of git-annex are you using? On what operating system?
-
-debian-packaged git-annex 4.20131106 on Linux Mint 13/Maya (Ubuntu Precise/12.04)
-
-### Please provide any additional information below.
-
-I will follow comments, but can also be found at [[https://microca.st/clacke]].
-
-Full transcript to reproduce:
-
-[[!format sh """
-$ git init a
-Initialized empty Git repository in /tmp/annex/a/.git/
-$ git init b
-Initialized empty Git repository in /tmp/annex/b/.git/
-$ cd a/
-$ git annex init
-init  ok
-(Recording state in git...)
-$ git remote add -f b ../b
-Updating b
-$ git annex describe b b # this should not be ok
-describe b ok
-(Recording state in git...)
-$ git annex describe b b
-describe b git-annex: Prelude.last: empty list
-$ git cat-file blob git-annex:uuid.log
- b timestamp=1383987654.900868s
-...
-
-# End of transcript.
-"""]]
-
-> Fixed the bug and made git breakage not crash git-annex. [[done]]
-> --[[Joey]] 
-
-> > Update: Also made it automatically clean up the cruft this put in the
-> > log. --[[Joey]] 
diff --git a/doc/bugs/git_annex_does_nothing_useful.mdwn b/doc/bugs/git_annex_does_nothing_useful.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_does_nothing_useful.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-As you can see, I'm running a pretty recent build of git-annex (ac799c3f363e0008b23e9c174e6fedc35e6fa92a),
-
-    $ git annex version
-    git-annex version: 3.20120630
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-
-We have a file here which isn't currently available yet isn't
-currently available (the link is shown in red),
-
-    $ ls -l plot.py
-    lrwxrwxrwx 1 ben ben 77 Jul  6 14:01 plot.py -> ../.git/annex/objects/WORM:1301941019:720:plot.py/WORM:1301941019:720:plot.py
-    $ 
-
-Yet git-annex should be able to tell us where it is,
-
-    $ git-annex whereis plot.py
-    $ 
-
-Hmm, well that's strange. What's happening here,
-
-    $ git-annex whereis plot.py -d
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","show-ref","git-annex"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","show-ref","--hash","refs/heads/git-annex"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","log","refs/heads/git-annex..d5582e05f41011b571a17003934fe9e40859e4be","--oneline","-n1"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","cat-file","--batch"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","ls-files","--cached","-z","--","plot.py"]
-    $ 
-
-Alright, well maybe `git-annex get` will work,
-
-    $ git annex get plot.py -d
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","ls-files","--cached","-z","--","plot.py"]
-    $ ls -l plot.py
-    lrwxrwxrwx 1 ben ben 77 Jul  6 14:01 plot.py -> ../.git/annex/objects/WORM:1301941019:720:plot.py/WORM:1301941019:720:plot.py
-
-Nope, the link is still shown in red.
-
-Alright, what about `git-annex copy`?
-
-    $ git annex copy plot.py --from=goldnerlab --to=here -d 
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","show-ref","git-annex"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","show-ref","--hash","refs/heads/git-annex"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","log","refs/heads/git-annex..d5582e05f41011b571a17003934fe9e40859e4be","--oneline","-n1"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","cat-file","--batch"]
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","ls-files","--cached","-z","--","plot.py"]
-    $ ls -l plot.py
-    lrwxrwxrwx 1 ben ben 77 Jul  6 14:01 plot.py -> ../.git/annex/objects/WORM:1301941019:720:plot.py/WORM:1301941019:720:plot.py
-
-Still red.
-
-Alright, what if I just try to get a non-existent file?
-
-    $ git annex get adsflkah -d
-    git ["--git-dir=/home/ben/lori/analysis/data/.git","--work-tree=/home/ben/lori/analysis/data","ls-files","--cached","-z","--","adsflkah"]
-    $
-
-Alright, it didn't fail with an error, that's very strange. What is going on here?
-
-[[!meta title="v1 file is ignored"]]
-
-> I don't think I want to make git-annex deal with v1 files, and
-> I doubt there are many repos left using them. This seems to be a case
-> of an upgrade not being done, for whatever reason. Closing [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/git_annex_fork_bombs_on_gpg_file.mdwn b/doc/bugs/git_annex_fork_bombs_on_gpg_file.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_fork_bombs_on_gpg_file.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-### Please describe the problem.
-git-annex goes into a loop of I think Haskell's createProcess function and causes the entire operating system to starve of process creation.
-
-### What steps will reproduce the problem?
-The last file git-annex was processing was tinco.gpg, my gpg key exported with
-  
-   gpg --export mail@tinco.nl --output tinco.gpg 
-
-### What version of git-annex are you using? On what operating system?
-4.20130516-g8a26544 on OSX
-
-I had a remote setup using bup.
-
-### Please provide any additional information below.
-Unfortunately to fix the problem I have deleted the entire git repository and made a new init in the same directory, this time without the gpg file. Everything seems to be working now.
-
-What I remember about the log file is that the last thing it said was something along the lines of 
-
-add tinco.gpg
-
-.. (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) (gpg) ..etc
-
-recv (resource unavailable or something) ..
-
-> [[done]]; fixed 3 bugs! --[[Joey]]
diff --git a/doc/bugs/git_annex_fsck_in_direct_mode_does_not_checksum_files.mdwn b/doc/bugs/git_annex_fsck_in_direct_mode_does_not_checksum_files.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_fsck_in_direct_mode_does_not_checksum_files.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-What steps will reproduce the problem?
-
-Put some large files into a direct mode repository (so fsck time is noticeable).  git annex add them, commit, run git annex fsck.
-
-What is the expected output? What do you see instead?
-
-Expected: files are checksummed, which should take considerable amount of time for each file.  For reference, in indirect mode, fsck takes a while for files of ~1GB size.
-Actually: in direct mode, git annex fsck goes through all of the files in an instant and prints OK for each. I believe the file content is not verified.
-Multiple runs of git annex fsck do the same thing.
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130405, Linux
-
-Please provide any additional information below.
-
-> I've fixed it, fsck is indeed checksumming direct mode files now, as long
-> as they're not known to be modified. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_fsck_is_a_no-op_in_bare_repos.mdwn b/doc/bugs/git_annex_fsck_is_a_no-op_in_bare_repos.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_fsck_is_a_no-op_in_bare_repos.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-What is says on the tin:
-
-git annex fsck is a no-op in bare repos
-
-See http://lists.madduck.net/pipermail/vcs-home/2011-June/000433.html
-
-> Thinking about this some more, it would be difficult to do anything
-> when bad content is found, since it also cannot update the location log.
-> 
-> So this may be another thing blocked by [[todo/branching]], assuming
-> that is fixed in a way that makes `.git-annex` available to bare repos.
-> --[[Joey]] 
-
->> Even if there is nothing it can _do_, knowing that the data is intact,
->> or not, is valuable in and as of itself. -- RichiH
-
->>> While storing the data is no longer an issue in bare repos, fsck would
->>> need a special mode that examines all the location logs, since it
->>> cannot run thru the checked out files. --[[Joey]] 
-
->>>> [[done]]! --[[Joey]] 
diff --git a/doc/bugs/git_annex_get_choke_when_remote_is_an_ssh_url_with_a_port.mdwn b/doc/bugs/git_annex_get_choke_when_remote_is_an_ssh_url_with_a_port.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_get_choke_when_remote_is_an_ssh_url_with_a_port.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-when i want to
-
-    git annex get file
-
-on repo ssh://host-without-port/annex, it works, but if i want to get a file from ssh://host:5122/annex, it tries to run command
-ssh ["host:5122", "git-annex-shell 'configlist' '/annex/file'"] and fails. ssh needs the -p option to set the default port, it doesn't support host:port notation.
-this is confusing because git can handle this url correctly, and will happily clone/push/pull to/from these url.
-
-temporary workaround is to use ssh://host/annex as url and define remote.name.annex-ssh-options to "-p 5122", but we need to use this workaround when doing annex get and undo the workaround when pushing/cloning.
-
-if i had more time, i would have learned haskell and provided a patch ;)
-
-> Fixed in git! --[[Joey]] [[done]]
diff --git a/doc/bugs/git_annex_gets_confused_about_remotes_with_dots_in_their_names.mdwn b/doc/bugs/git_annex_gets_confused_about_remotes_with_dots_in_their_names.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_gets_confused_about_remotes_with_dots_in_their_names.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-For test.com//test, I get this:
-
-    % git annex copy . --to test.com//test
-    (getting UUID for test...) git-annex: there is no git remote named "test.com//test"
-
-And my .git/config changes from
-
-    [remote "test.com//test"]
-    	url = richih@test.com:/test
-    	fetch = +refs/heads/*:refs/remotes/test.com//test/*
-
-to
-
-    [remote "test.com//test"]
-    	url = richih@test.com:/test
-    	fetch = +refs/heads/*:refs/remotes/test.com//test/*
-    	annex-uuid = xyz
-    [remote "test"]
-    	annex-uuid = xyz
-
-
-Unless I am misunderstanding something, git annex gets confused about what the name of the remote it supposed to be, truncates at the dot for some operations and uses the full name for others.
-
-> I've fixed this bug. [[done]]
-> 
-> However, using "/" in a remote name seems likely to me to confuse 
-> git's own remote branch handling. Although I've never tried it.
-> --[[Joey]] 
-
->> From what I can see, git handles / just fine, but would get upset about : which is why it's not allowed in a remote's name.
->> My naming scheme is host//path/to/annex. It sorts nicely and gives all important information left to right with the most specific parts at the beginning and end.
->> If you have any other ideas or scheme, I am all ears :)
->> Either way, thanks for fixing this so quickly.
->> -- RichiH
diff --git a/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn b/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn
+++ /dev/null
@@ -1,130 +0,0 @@
-### Please describe the problem.
-
-`git annex import` not only [[does not work with git annex repositories|bugs/`git annex import` does not work on other git annex repositories]], it even destroys the meta-data in that repository, because it moves the `.git/*` metadata out of the remote repository.
-
-### What steps will reproduce the problem?
-
-[[!format txt """
-git init foo
-cd foo
-git annex init
-dd if=/dev/urandom of=foo bs=1M count=1
-git annex add foo
-git commit -m'files'
-cd ../
-git init bar
-cd bar
-git annex init
-mkdir foo
-cd foo
-git annex import ../../foo
-cd ../../foo
-git status
-"""]]
-
-
-### What version of git-annex are you using? On what operating system?
-
-[[!format txt """
-anarcat@angela:foo$ git annex version
-git-annex version: 4.20130921-g434dc22
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi
-"""]]
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-anarcat@angela:~$ cd /tmp
-anarcat@angela:/tmp$ mkdir test
-anarcat@angela:/tmp$ cd test
-anarcat@angela:test$ ls
-anarcat@angela:test$ git init foo
-Initialized empty Git repository in /tmp/test/foo/.git/
-anarcat@angela:test$ cd foo
-anarcat@angela:foo$ git annex init
-init  ok
-(Recording state in git...)
-anarcat@angela:foo$ dd if=/dev/urandom of=foo bs=1M count=1
-1+0 enregistrements lus
-1+0 enregistrements écrits
-1048576 octets (1,0 MB) copiés, 0,410384 s, 2,6 MB/s
-anarcat@angela:foo$ git annex add foo
-add foo (checksum...) ok
-(Recording state in git...)
-anarcat@angela:foo$ git commit -m'files'
-[master (root-commit) 83daa0b] files
- 1 file changed, 1 insertion(+)
- create mode 120000 foo
-anarcat@angela:foo$ cd ../
-anarcat@angela:test$ git init bar
-Initialized empty Git repository in /tmp/test/bar/.git/
-anarcat@angela:test$ cd bar
-anarcat@angela:bar$ git annex init
-init  ok
-(Recording state in git...)
-anarcat@angela:bar$ mkdir foo
-anarcat@angela:bar$ cd foo
-anarcat@angela:foo$ git annex import ../../foo
-import .git/COMMIT_EDITMSG (checksum...) ok
-import .git/description (checksum...) ok
-import .git/config (checksum...) ok
-import .git/index (checksum...) ok
-import .git/HEAD (checksum...) ok
-import .git/annex/journal.lck (checksum...) ok
-import .git/annex/index.lck (checksum...) ok
-import .git/annex/sentinal (checksum...) ok
-import .git/annex/sentinal.cache (checksum...) ok
-import .git/annex/index (checksum...) ok
-import .git/annex/objects/w2/Kz/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b
-git-annex: ../../foo/.git/annex/objects/w2/Kz/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b: rename: permission denied (Permission denied)
-failed
-import .git/objects/0e/6881452189b7fc34809f101f075da7cca9d9d8 (checksum...) ok
-import .git/objects/03/c0163611cd061af17b2dd58a93c95ffbb05040 (checksum...) ok
-import .git/objects/39/10912eab082d015bface04ed3a8ed658b94893 (checksum...) ok
-import .git/objects/21/05f6aaf523510f25516b04a0c07d5900df2b0b (checksum...) ok
-import .git/objects/83/daa0b1d8290191f53d1d3b5e39e03653a89ce2 (checksum...) ok
-import .git/objects/83/8fa78626a6cdc4399186172df9109d321ca0bf (checksum...) ok
-import .git/objects/dc/1e1b7b811079e1c5826d44958b736fc3a3a458 (checksum...) ok
-import .git/objects/7b/4d3d6a3ee2286b2da15c1aca39353d63c16fa2 (checksum...) ok
-import .git/objects/86/2b2a09ebc7a1eb298dccc57be75bad897a7c10 (checksum...) ok
-import .git/objects/e1/61ad2ad1843e39937caaf6add6f690fd361126 (checksum...) ok
-import .git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 (checksum...) ok
-import .git/objects/9b/47feee99b5f24e0dc96cf4a20fcb88c0ec007d (checksum...) ok
-import .git/objects/b0/8c838cfb09bafae40a05312092c37360c880b0 (checksum...) ok
-import .git/refs/heads/master (checksum...) ok
-import .git/refs/heads/git-annex (checksum...) ok
-import .git/logs/HEAD (checksum...) ok
-import .git/logs/refs/heads/master (checksum...) ok
-import .git/logs/refs/heads/git-annex (checksum...) ok
-import .git/info/exclude (checksum...) ok
-import .git/hooks/pre-applypatch.sample (checksum...) ok
-import .git/hooks/applypatch-msg.sample (checksum...) ok
-import .git/hooks/pre-rebase.sample (checksum...) ok
-import .git/hooks/update.sample (checksum...) ok
-import .git/hooks/commit-msg.sample (checksum...) ok
-import .git/hooks/pre-commit (checksum...) ok
-import .git/hooks/prepare-commit-msg.sample (checksum...) ok
-import .git/hooks/post-update.sample (checksum...) ok
-import .git/hooks/pre-commit.sample (checksum...) ok
-(Recording state in git...)
-error: Invalid path 'foo/.git/COMMIT_EDITMSG'
-error: unable to add foo/.git/COMMIT_EDITMSG to index
-fatal: adding files failed
-
-git-annex: user error (xargs ["-0","git","--git-dir=/tmp/test/bar/.git","--work-tree=/tmp/test/bar","add","--"] exited 123)
-failed
-git-annex: import: 2 failed
-anarcat@angela:foo$ cd ../../foo
-anarcat@angela:foo$ git status
-fatal: Not a git repository (or any of the parent directories): .git
-anarcat@angela:foo$
-# End of transcript or log.
-"""]]
-
-Thanks! --[[anarcat]]
-
-> Would have thought this was obviously something you shouldn't do
-> (sorta like running git-annex import on your home directory),
-> but ok, it can skip .git directories. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_importfeed_fails.mdwn b/doc/bugs/git_annex_importfeed_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_importfeed_fails.mdwn
+++ /dev/null
@@ -1,64 +0,0 @@
-### Please describe the problem.
-
-git annex importfeed fails
-
-### What steps will reproduce the  problem?
-
-git annex importfeed http://www.tatw.co.uk/podcast.xml
-
-### On what operating system?
-
-Ubuntu 12.04, the prebuilt linux tarball
-
-[[!format sh """
-$ git annex version
-git-annex version: 4.20130922-g7dc188a
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-"""]]
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-$ git annex importfeed http://www.tatw.co.uk/podcast.xml
-(checking known urls...)
-(Recording state in git...)
-importfeed http://www.tatw.co.uk/podcast.xml
---2013-09-27 12:16:09--  http://www.tatw.co.uk/podcast.xml
-Résolution de www.tatw.co.uk (www.tatw.co.uk)... 88.190.26.130
-Connexion vers www.tatw.co.uk (www.tatw.co.uk)|88.190.26.130|:80... connecté.
-requête HTTP transmise, en attente de la réponse... 200 OK
-Longueur: 41267 (40K) [application/xml]
-Sauvegarde en : «/tmp/user/2166/feed10670»
-
-100%[==========================================================================>] 41 267      81,6K/s   ds 0,5s
-
-2013-09-27 12:16:10 (81,6 KB/s) - «/tmp/user/2166/feed10670» sauvegardé [41267/41267]
-
-addurl Above___Beyond__Group_Therapy/_001_Group_Therapy_Radio_with_Above___Beyond (downloading  ...)
-failed
-addurl Above___Beyond__Group_Therapy/_002_Group_Therapy_Radio_with_Above___Beyond (downloading  ...)
-failed
-addurl Above___Beyond__Group_Therapy/_003_Group_Therapy_Radio_with_Above___Beyond (downloading  ...)
-failed
-addurl Above___Beyond__Group_Therapy/_004_Group_Therapy_Radio_with_Above___Beyond (downloading  ...)
-failed
-
-etc
-
-
-# End of transcript or log.
-"""]]
-
-> This is a bug in the feed library: <https://github.com/sof/feed/issues/7>  
-> And already fixed upstream this morning, so if you need the fix 
-> immediately, build with cabal. Otherwise fix will percolate out to
-> builds eventually.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_annex_indirect_can_fail_catastrophically.mdwn b/doc/bugs/git_annex_indirect_can_fail_catastrophically.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_indirect_can_fail_catastrophically.mdwn
+++ /dev/null
@@ -1,78 +0,0 @@
-### Please describe the problem.
-
-I have a repo that I initialized in direct mode because i felt unconfortable with the "symlink forest" approach.
-
-Now that I prefer that, i want to switch back to indirect mode. The problem is, when I did that, I realized that some files in the repo were not writable by my user, and git annex indirect crashed, and didn't "indirect" all the files. Now the repo is in a "half-direct" state, and I seem to be unable to recover.
-
-### What steps will reproduce the problem?
-
-[[!format txt """
-git init
-git annex init
-git annex direct
-git annex add . # make sure some files are not writable by your user
-git annex indirect
-"""]]
-
-The `indirect` step will stop at the file that is not writable and will fail to move some files to `.git/annex`. And then the repo is in `indirect` mode yet some files are still not symlinks.
-
-Doing a `git annex direct` will try to commit all those nasty files into git, as it does a `git commit -a`.
-
-### What version of git-annex are you using? On what operating system?
-
-    git-annex version: 4.20130912-ga1faca3
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi
-
-Debian wheezy.
-
-### Please provide any additional information below.
-
-Ideally, there would be a way to just tell git annex it's really still in direct mode and migrate the remaining files.
-
-The workaround is, obviously, to make sure you own all those files before messing around:
-
-    chown -R you *
-    chmod -R u+w *
-
-A [[patch]], maybe, that allows you to flip cleanly between the two modes:
-
-[[!format diff """
-From a21dfc97da96883b2a088bb5f3f466296f08d858 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
-Date: Mon, 16 Sep 2013 13:58:29 -0400
-Subject: [PATCH] do not commit -a when going back to direct mode
-
-without this, if we switched to indirect mode but failed doing so
-(because of a permission problem, for example), going back to
-direct mode will commit all files to git, which we really want 
-to avoid.
-
----
- Command/Direct.hs |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Command/Direct.hs b/Command/Direct.hs
-index 7835988..ed8ea6c 100644
---- a/Command/Direct.hs
-+++ b/Command/Direct.hs
-@@ -33,7 +33,6 @@ perform = do
-        showOutput
-        _ <- inRepo $ Git.Command.runBool
-                [ Param "commit"
--               , Param "-a"
-                , Param "-m"
-                , Param "commit before switching to direct mode"
-                ]
---
-1.7.10.4
-
-"""]]
-
-Any update on this? Why is `-a` used here? -- [[anarcat]]
-
-> -a is not really the problem. You certainly do usually want
-> to commit your changes before converting to direct mode.
-> 
-> [[done]]; now when this happens it catches the exception and 
-> leaves the file in direct mode, which is the same as it being
-> unlocked. --[[Joey]]
diff --git a/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn b/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_info_listings_can_be_confusing.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-### Please describe the problem.
-
-The output of git-annex info can be confusing as the format rules change based on positioning
-
-    repository mode: indirect
-    trusted repositories: 0
-    semitrusted repositories: 5
-        00000000-0000-0000-0000-000000000001 -- web
-        105776ba-bd78-4884-9126-aeb7c1e6da21 -- UoM Laptop
-        79ff3c20-fab3-44dd-88f7-cc1a41eb73d6 -- here (UoM Desktop Client)
-        949a8fc3-6334-5f5e-887d-b1e5725ea443 -- isilon (UoM Isilon Encrypted Git Backup)
-        c3cec307-367b-4373-8cb9-a3da67cee745 -- home (Mac Mini Home Client)
-
-Here we see the description surrounded in brackets and also not in brackets.  The second annex listed does not have a name (as there is no git remote configured).  Always including the brackets or an additional setting I think would make things much clearer esp. when setting things up.
-
-    
-### What steps will reproduce the problem?
-
-
-### What version of git-annex are you using? On what operating system?
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-[[done]] --[[Joey]] 
diff --git a/doc/bugs/git_annex_initremote_needs_some___34__error_checking__34__.mdwn b/doc/bugs/git_annex_initremote_needs_some___34__error_checking__34__.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_initremote_needs_some___34__error_checking__34__.mdwn
+++ /dev/null
@@ -1,65 +0,0 @@
-_git annex initremote_ without a complete command set still adds an entry to the uuid.log etc... and thus clutters up the state of the annex. I would not have expected this behaviour as a user.
-
-_initremote_ should fail and not do anything if the commands that it has been given are incomplete or incorrect. I was initialising a few rsync repos and noticed that i ended up having mutiple rsync remotes with the same name but different uuid's. I know its hard if not impossible to remove these uuid's so I have just marked them as "dead" in my live annexes.
-
-Here's a transcript of the problem
-
-<pre>
-x00:sandbox jtang$ mkdir atest
-x00:sandbox jtang$ cd atest/
-x00:atest jtang$ git init
-Initialized empty Git repository in /Users/jtang/sandbox/atest/.git/
-x00:atest jtang$ git annex init 
-init  ok
-(Recording state in git...)
-x00:atest jtang$ git annex status
-supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-supported remote types: git S3 bup directory rsync web hook
-trusted repositories: 0
-semitrusted repositories: 2
-	00000000-0000-0000-0000-000000000001 -- web
- 	cbb58e1c-d737-11e1-b682-83239d5ff2e0 -- here
-untrusted repositories: 0
-dead repositories: 0
-transfers in progress: none
-available local disk space: 185 gigabytes (+1 megabyte reserved)
-local annex keys: 0
-local annex size: 0 bytes
-known annex keys: 0
-known annex size: 0 bytes
-bloom filter size: 16 mebibytes (0% full)
-backend usage: 
-x00:atest jtang$ git annex initremote foo
-git-annex: Specify the type of remote with type=
-x00:atest jtang$ git annex initremote foo type=rsync
-(Recording state in git...)
-initremote foo git-annex: Specify encryption=key or encryption=none or encryption=shared
-x00:atest jtang$ git annex initremote foo type=rsync
-(Recording state in git...)
-initremote foo git-annex: Specify encryption=key or encryption=none or encryption=shared
-x00:atest jtang$ git annex status
-supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-supported remote types: git S3 bup directory rsync web hook
-trusted repositories: (Recording state in git...)
-0
-semitrusted repositories: 5
-	00000000-0000-0000-0000-000000000001 -- web
- 	cbb58e1c-d737-11e1-b682-83239d5ff2e0 -- here
- 	d3adfcd0-d737-11e1-b15b-b7032388f8aa -- foo
- 	d6d8e1e0-d737-11e1-956a-0b3d3451226a -- foo
- 	d78d795c-d737-11e1-ac98-4fe3d6fdfd54 -- foo
-untrusted repositories: 0
-dead repositories: 0
-transfers in progress: none
-available local disk space: 185 gigabytes (+1 megabyte reserved)
-local annex keys: 0
-local annex size: 0 bytes
-known annex keys: 0
-known annex size: 0 bytes
-bloom filter size: 16 mebibytes (0% full)
-backend usage: 
-x00:atest jtang$ 
-</pre>
-
-> Indeed, I broke that in June by making it record the name in a much too
-> early stage. Now fixed. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_initremote_walks_.git-annex.mdwn b/doc/bugs/git_annex_initremote_walks_.git-annex.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_initremote_walks_.git-annex.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-a <!-- (a suggestion for introducing severity tags on bugs,
-feel free to discard) --> issue: `git annex initremote` (in particular, adding
-a key as described in [[encryption]] -- `git annex initremote my_remote
-encryption=my_key`) seems to iterate over the `.git-annex/???/???/*.log` files
-with lstat (tested using strace).
-
-in a 50k key git-annex on a slow disk, this takes quite a while, while not
-seeming necessary (it's just re-encrypting the shared secret, is it?).
-
-could you verify the observed behavior?
-
-> This is due to `git commit` being called. `git commit` exposes git's 
-> rather innefficient handling of the index; in order to make a commit
-> it has to write a new index file, and it does this by scanning every
-> file in the repository. I think that git generally needs its index
-> file handleing overhauled, particularly to deal with repositories with
-> large numbers of files. git-annex is seems to already be running
-> `git commit` in its most efficient mode, by specifying exactly what file
-> to commit. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_list__47__whereis_and_uncommited_local_changes.mdwn b/doc/bugs/git_annex_list__47__whereis_and_uncommited_local_changes.mdwn
--- a/doc/bugs/git_annex_list__47__whereis_and_uncommited_local_changes.mdwn
+++ b/doc/bugs/git_annex_list__47__whereis_and_uncommited_local_changes.mdwn
@@ -26,3 +26,5 @@
 ### What version of git-annex are you using? On what operating system?
 git-annex 5.20140421
 Linux 3.14.3
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git_annex_lock_dangerous.mdwn b/doc/bugs/git_annex_lock_dangerous.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_lock_dangerous.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-### Please describe the problem.
-
-Git annex lock discards data without --force; this is misleading from the name.
-
-### What steps will reproduce the problem?
-
-    git annex unlock something.txt
-    kwrite something.txt # edit
-    git annex lock something.txt # lock is the opposite of unlock, right?
-
-Oops, just lost my changes!
-
-If you want my opinion, `git annex lock` should either require `-f` to throw away data or should be renamed (e.g. to `revert` or `checkout`).
-
-### What version of git-annex are you using? On what operating system?
-
-git version 1.8.1.2, git-annex version: 4.20130815, Kubuntu 13.04
-
-> Agreed; [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_migrate_leaves_old_backend_versions_around.mdwn b/doc/bugs/git_annex_migrate_leaves_old_backend_versions_around.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_migrate_leaves_old_backend_versions_around.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-`git annex migrate` leaves old, unlinked backend versions lying around. It
-would be great if these were purged automatically somehow. 
-
-> Yes, this is an issue mentioned in the
-> [[tips/migrating_data_to_a_new_backend]].
-> 
-> Since multiple files can point to the same content, it could be that
-> only one file has been migrated, and the content is still used. So
-> the content either has to be retained, or an operation as expensive
-> as `git annex unused` used to find if something else still uses it. 
-> 
-> Rather than adding such an
-> expensive operation to each call to migrate, I focused on hard-linking
-> the values for the old and new keys, so that the old keys don't actually
-> use any additional resources (beyond an extra inode).
-> 
-> This way a lot of migrations can be done, and only when you're done you
-> can do the more expensive cleanup pass if you want to. --[[Joey]]
-> [[done]]
diff --git a/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn b/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-I have this line in the .gitignore file of one of my repos:
-*log
-
-So the command 'git annex init name' fails to add the file ".git-annex/uuid.log", and the same problem happens when git-annex-add'ing files.
-
-> This is avoided on the v3 branch, which does not store these files in the
-> same branch as your repository.
-
-Also, when a file is git-ignored, it should be possible to 'git annex add' it with a -f/--force option, the same way git does it.
-
-> Reasonable, [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_annex_sync_--content_not_syncing_all_objects.mdwn b/doc/bugs/git_annex_sync_--content_not_syncing_all_objects.mdwn
--- a/doc/bugs/git_annex_sync_--content_not_syncing_all_objects.mdwn
+++ b/doc/bugs/git_annex_sync_--content_not_syncing_all_objects.mdwn
@@ -29,3 +29,5 @@
 
 # End of transcript or log.
 """]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git_annex_sync___40__sync_content_without_--content_flag__41__.mdwn b/doc/bugs/git_annex_sync___40__sync_content_without_--content_flag__41__.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_sync___40__sync_content_without_--content_flag__41__.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-Not sure if it's a bug, but pls explain why it sync files and how to stop it by cfg.
-
-Repos. created with Assistant - git annex sync i an indirect mode not only fetch metadata but also a files. What is the correct way to disable file sync (so only broken links are created in working tree)
-
-Desired:
-to boostrap annex infrastructure with assistant, but then some repos switch to indirect mode (while still synced by assistant/webapp) but only metadata (not files). Files to be fetched on request (like git annex get xyz/*) when needed.
-
-### What steps will reproduce the problem?
-
-1. with git annex webapp create two repos on two nodes (Alice and Bob).
-2. pair them using discovery on local lan
-3. on Bob stop assistant and fire "git annex indirect"
-4. add files to Alice repo
-5. run git annex sync on Bob repo from CLI
-
-Bob's repo not only sync metadata but also retrive files.
-The documentation says "sync" only sync metadata.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 5.20140420-ga25b8bb
-
-> `git annex sync`, when used without --content, does not sync the content
-> of files. However, in your example, Alice is still runing the assistant.
-> The assistant will notice when Bob's git annex sync sends it a change,
-> and see there are new files, and go get them. If you don't want that to
-> happen, you'll need to disable the assistant on Alice too, or configure
-> it to not sync with bob, etc.
-> 
-> Not a bug, so [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_sync_in_direct_mode_does_not_honor_skip-worktree.mdwn b/doc/bugs/git_annex_sync_in_direct_mode_does_not_honor_skip-worktree.mdwn
--- a/doc/bugs/git_annex_sync_in_direct_mode_does_not_honor_skip-worktree.mdwn
+++ b/doc/bugs/git_annex_sync_in_direct_mode_does_not_honor_skip-worktree.mdwn
@@ -33,3 +33,5 @@
 I did a little digging in the code, and it looks like the source of this is the stageDirect step done specifically by `git annex sync` in direct repos (which makes sense, since indirect repos work). It does `git ls-files --others --exclude-standard --stage`. This list includes files marked skip-worktree, which means skip-worktree files would be treated like normal, and deleted because it's no longer there. There is an additional `-t` argument that could be added to ls-files that would provide the tag field to indicate if a file was marked skip-worktree, and they could be filtered out of processing.
 
 I wonder if this would have side effects, or if there are other places in the code where skip-worktree files would need to be handled, though. I'm particularly motivated to solve this, so let me know if it doesn't look like it would get looked at right away, and I'll have an excuse to get a Haskell dev environment setup again and shake the rust off.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/git_annex_test_under_windows_8.1.mdwn b/doc/bugs/git_annex_test_under_windows_8.1.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_test_under_windows_8.1.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-### Please describe the problem.
-I installed git and git annex under Windows (8.1) and ran git annex test. All except one tests passed with "ok"
-
-### What steps will reproduce the problem?
-git annex test 
-under Windows 8.1
-
-### What version of git-annex are you using? On what operating system?
-$ git --version
-git version 1.9.0.msysgit.0
-
-$ git annex version
-git-annex version: 5.20140320-g63535e3
-build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL 
-remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external local repository version: 5 supported repository version: 5 upgrade supported from repository versions: 2 3 4
-
-Windows 8.1
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-    prop_view_roundtrips:                           FAIL
-      *** Failed! Falsifiable (after 814 tests and 5 shrinks):
-      "a"
-      IMneitta DTaetsat s(
-fr o miLniistt:  [(MetaField "1\194",fromList [MetaValue (CurrentlySet True) "\r
-+\231Gb\157\227\ETB\bG",MetaValue (CurrentlySet True) "\DEL\239~\243_p\DC2."]),(
-MetaField "EG",fromList [MetaValue (CurrentlySet True) "",MetaValue (CurrentlySe
-t True) "\v\205] .T(",MetaValue (CurrentlySet False) "\NAK\128lo\169w",MetaValue
- (CurrentlySet True) "\SYN\STX\ENQ\n#u\ETXv\CANP<F)",MetaValue (CurrentlySet Fal
-se) "\US\213~",MetaValue (CurrentlySet False) "K\r3\v\165\&0\RSqk#\141",MetaValu
-e (CurrentlySet False) "Kx\b\231\156\220?+\216\v\146",MetaValue (CurrentlySet Tr
-ue) "j.\189\150\FS3{\233S\STX\SItg",MetaValue (CurrentlySet True) "\242\248\134\
-206\bal\174\135A\SI"]),(MetaField "k",fromList [MetaValue (CurrentlySet True) "\
-FS\150\129\b\fhjV\DC3\203",MetaValue (CurrentlySet False) "V.&sZ\245\f\a_\227\14
-0",MetaValue (CurrentlySet True) "\136r\ENQK{/\SI'\SYNN\235Q?",MetaValue (Curren
-tlySet True) "\179\255\233\227v\SUB]\n8",MetaValue (CurrentlySet True) "\238S\DC
-1"]),(MetaField "\179",fromList [MetaValue (CurrentlySet True) "\SOH+\ENQ",MetaV
-alue (CurrentlySet True) "\ACK{\140\248I\DLEw^\\\ENQF4",MetaValue (CurrentlySet
-False) "\FSc\239\r)HL\STX#V\DC1",MetaValue (CurrentlySet True) "Hc\219\146\230\1
-79\207",MetaValue (CurrentlySet False) "I]",MetaValue (CurrentlySet False) "P\19
-6\&0o\214\&8iH\251",MetaValue (CurrentlySet True) "`X",MetaValue (CurrentlySet F
-alse) "u\DEL\DC3Q\200",MetaValue (CurrentlySet True) "\128?",MetaValue (Currentl
-ySet True) "\225\135\f>\128\US~p",MetaValue (CurrentlySet False) "\250C\b\DC1\17
-6\154KT\191\SOf?\SI"]),(MetaField "\225a",fromList [MetaValue (CurrentlySet True
-) "",MetaValue (CurrentlySet True) "\b\ETB\b",MetaValue (CurrentlySet True) "\f\
-161\FS\176h-\ta\169\t",MetaValue (CurrentlySet False) "4",MetaValue (CurrentlySe
-t True) "A\FS\244V:\249kl5\ETX\SOH\SI)",MetaValue (CurrentlySet False) "Z",MetaV
-alue (CurrentlySet True) "\\Lt~\235v\"\211\DLE\NAK\210",MetaValue (CurrentlySet
-False) "a\SYNN",MetaValue (CurrentlySet True) "g:init test repo U5j\167G\ap-\ETX
-",MetaValue (CurrentlySet False) "l\NULoW\238rD",MetaValue (CurrentlySet True) "
-}\202\141\183Nxr",MetaValue (CurrentlySet False) "\170=\216S\ETB\187\SUB+!\DC3",
-MetaValue (CurrentlySet True) "\240H\GS\NAK\ETB\SYNRq\153\&4\204\EOT"])])
-      True
-      Use --quickcheck-replay '13 347062936 40785707' to reproduce.
-    prop_viewedFile_rountrips:                      OK
-      +++ OK, passed 1000 t
-e s tDse.t
-
-# End of transcript or log.
-"""]]
-
-> A sort of windows-specific bug in the test suite. I've fixed it. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/git_annex_uninit_loses_content_when_interrupted.mdwn b/doc/bugs/git_annex_uninit_loses_content_when_interrupted.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_uninit_loses_content_when_interrupted.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-### Please describe the problem.
-
-When git annex uninit is interrupted, git status shows
-
-# On branch master
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-
-deleted:    file1
-
-file1 is the file that was being processed at the time of the interrupt.
-
-### What steps will reproduce the problem?
-
-git annex uninit
-
-Ctrl-C
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130709
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; see my comment --[[Joey]]
diff --git a/doc/bugs/git_annex_uninit_removes_files_not_previously_added_to_annex.mdwn b/doc/bugs/git_annex_uninit_removes_files_not_previously_added_to_annex.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_uninit_removes_files_not_previously_added_to_annex.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-Suppose there are files not added/committed to git annex.
-Once git annex uninit is complete, these files are deleted.
-
-### What steps will reproduce the problem?
-
-cp big-file annex-dir;
-cd annex-dir;
-git annex uninit
-
-...
-big-file is gone
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130709
-Linux Ubuntu 13.04
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-[[!tag moreinfo]]
-
-> [[done]]; unreproducible by anyone. --[[Joey]]
diff --git a/doc/bugs/git_annex_unused_aborts_due_to_filename_encoding_problems.mdwn b/doc/bugs/git_annex_unused_aborts_due_to_filename_encoding_problems.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_unused_aborts_due_to_filename_encoding_problems.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-What steps will reproduce the problem?
-I don't know exactly when it started
-
-What is the expected output? What do you see instead?
-When I run git annex unused I get
-
-    unused . (checking for unused data...) (checking master...) git-annex: Cannot decode byte '\xb4': Data.Text.Encoding.decodeUtf8: Invalid UTF-8 stream
-
-Most likely I have added some file with a strange encoding that git-annex can't decode. The problem is that the unused process aborts because of this.
-
-What version of git-annex are you using? On what operating system?
- 3.20120522, Debian testing
-
-> I've just fixed this bug in git, will be in the next release. --[[Joey]]
-> [[done]]
diff --git a/doc/bugs/git_annex_unused_seems_to_check_for_current_path.mdwn b/doc/bugs/git_annex_unused_seems_to_check_for_current_path.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_unused_seems_to_check_for_current_path.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-When I run `git annex unused` from my repository's root it shows everything ok:
-
-    ~/annex$ git annex unused
-    unused  (checking for unused data...) ok
-
-But... When I run it from a subdirectory, it shows a lot:
-
-    ~/annex/Software$ git annex unused
-    unused  (checking for unused data...) 
-      Some annexed data is no longer pointed to by any files in the repository:
-        NUMBER  KEY
-        1       SHA1:########################################
-    ...
-        921     SHA1:########################################
-      (To see where data was previously used, try: git log --stat -S'KEY')
-      (To remove unwanted data: git-annex dropunused NUMBER)
-      ok
-
-Is this a bug or by design? By removing these "unused" files with `dropunused` I've just lost the only copy of 160 files.
-
-I am using git-annex version 836e71297b8e3b5bd6f89f7eb1198f59af985b0b
-
-> I'm very sorry you lost data.
-> 
-> But, git annex unused absolutely does not let the current directory
-> influence what it does. It always scans the entire repo from the top.
-> And I've tested it just now to make sure that in a subdirectory
-> it does the same thing as at the top. 
-> 
-> There are only two ways this could happen that I can think of:
-> 
-> 1. If "Software" were a separate git repository than "~/annex".
-> 2. If gitignores or something made `git ls-files`
->    not list the files when ran in the subdir. This seems *possible*,
->    but I don't know how to construct such an ignore.
-> 
-> --[[Joey]] 
-
->> Closing as there is no followup. [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn b/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-Upgrading from v1 to v3:
-
-    upgrade . (v1 to v2...) (moving content...) (updating symlinks...) (moving location logs...) (v2 to v3...) ..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
-      git-annex branch created
-      Be sure to push this branch when pushing to remotes.
-    ok
-
-A whirly would be preferable, imo.
-
-> Erm, I'm pretty sure you were the one who asked for there to be some
-> progress dots, Richard.
-> 
-> I'm not particularly interested in implementing a whirley that would only
-> be used in this one place, in code that very few users are going to run
-> again. I could remove the dots.. [[done]] --[[Joey]]
diff --git a/doc/bugs/git_annex_version_should_without_being_in_a_repo_.mdwn b/doc/bugs/git_annex_version_should_without_being_in_a_repo_.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_version_should_without_being_in_a_repo_.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-was checking the version of git-annex on a machine before cloning a repo...
-
-    $ git annex version
-    git-annex: Not in a git repository.
-
-> made difficult by the Annex monad, but I made it work! --[[Joey]]
-> [[done]]
diff --git a/doc/bugs/git_annex_webapp_runs_on_wine.mdwn b/doc/bugs/git_annex_webapp_runs_on_wine.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_webapp_runs_on_wine.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-### Please describe the problem.
-I just installed git-annex-20130601 on Gentoo and when running git annex webapp it started to run things on wine.
-
-### What steps will reproduce the problem?
-On Gentoo ~amd64:
-[[!format sh """
- ~$ layman -a haskell
- ~$ USE=webapp emerge -1 git-annex
- ~$ git annex webapp
-"""]]
-### What version of git-annex are you using? On what operating system?
-dev-vcs/git-annex-4.20130601 from https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-vcs/git-annex
-
-On Gentoo ~amd64
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-~$ git annex webapp
-Launching web browser on file:///tmp/webapp14071.html
-libpng warning: Application built with libpng-1.6.2 but running with 1.5.13
-err:menubuilder:convert_to_native_icon error 0x80004005 initializing encoder
-libpng warning: Application built with libpng-1.6.2 but running with 1.5.13
-err:menubuilder:convert_to_native_icon error 0x80004005 initializing encoder
-libpng warning: Application built with libpng-1.6.2 but running with 1.5.13
-err:menubuilder:convert_to_native_icon error 0x80004005 initializing encoder
-...
-fixme:exec:SHELL_execute flags ignored: 0x00000100
-fixme:exec:SHELL_execute flags ignored: 0x00000100
-fixme:exec:SHELL_execute flags ignored: 0x00000100
-...
-
-22185 me     20   0 2580M 10196  8156 S  0.0  0.1  0:00.09 ├─ start /ProgIDOpen htmlfile /home/reinis/.wine/dosdevices/z:/tmp/webapp2554.html
- 2597 me     21   1 2596M 10984  8764 S  0.0  0.1  0:01.23 ├─ c:\windows\system32\explorer.exe /desktop
- 2589 me     20   0 2581M  2344  1932 S  0.0  0.0  0:00.00 ├─ c:\windows\system32\plugplay.exe
- 2581 me     20   0 2593M  8900  7500 S  0.0  0.1  0:00.09 ├─ c:\windows\system32\winedevice.exe MountMgr
- 2577 me     20   0 2583M  2776  2272 S  0.0  0.0  0:00.00 ├─ c:\windows\system32\services.exe
- 2571 me     20   0 24960  7532   772 S 46.1  0.1  2:29.06 ├─ /usr/bin/wineserver
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; this is a misconfigured system, not a git-annex bug, 
-> and git-annex honors git config web.browser to allow working around
-> this. --[[Joey]]
diff --git a/doc/bugs/git_annex_won__39__t_copy_files_to_my_usb_drive.mdwn b/doc/bugs/git_annex_won__39__t_copy_files_to_my_usb_drive.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annex_won__39__t_copy_files_to_my_usb_drive.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-One of my remotes, on a USB drive, is behaving exceedingly strangely.  Files sometimes refuse to copy to it - whether I copy to it from my home annex, or whether I "cd" to that USB drive and try to "get" files to it.
-
-Note that the external HD is a FAT32 filesystem.  This has never caused problems in the past, but I am wondering if some of the recent work on "crippled" filesystems might have caused breakage on existing repositories which had been working well on FAT32 filesystems?
-
-What steps will reproduce the problem?
-
-On my annex, something like this:
-
-<pre>
-Talislanta Books$ git annex whereis talislanta_fantasy_roleplaying.pdf
-whereis talislanta_fantasy_roleplaying.pdf (2 copies) 
-  	d16d0d1a-3cdd-11e2-9161-67c83599f720 -- homeworld
-   	fa2bd02e-3ce2-11e2-a675-47389975a32e -- here (macbook)
-ok
-Talislanta Books$ git annex copy --to=toshiba talislanta_fantasy_roleplaying.pdf
-copy talislanta_fantasy_roleplaying.pdf ok
-Talislanta Books$ git annex whereis talislanta_fantasy_roleplaying.pdf
-whereis talislanta_fantasy_roleplaying.pdf (2 copies) 
-  	d16d0d1a-3cdd-11e2-9161-67c83599f720 -- homeworld
-   	fa2bd02e-3ce2-11e2-a675-47389975a32e -- here (macbook)
-ok
-Talislanta Books$ cd /Volumes/TOSHIBAEXT/annex/Books/archive/Talislanta\ Books/
-Talislanta Books$ git annex whereis talislanta_fantasy_roleplaying.pdf
-whereis talislanta_fantasy_roleplaying.pdf (2 copies) 
-  	d16d0d1a-3cdd-11e2-9161-67c83599f720 -- homeworld
-   	fa2bd02e-3ce2-11e2-a675-47389975a32e -- macbook
-ok
-Talislanta Books$ git annex get talislanta_fantasy_roleplaying.pdf
-Talislanta Books$ git annex whereis talislanta_fantasy_roleplaying.pdf
-whereis talislanta_fantasy_roleplaying.pdf (2 copies) 
-  	d16d0d1a-3cdd-11e2-9161-67c83599f720 -- homeworld
-   	fa2bd02e-3ce2-11e2-a675-47389975a32e -- macbook
-ok
-Talislanta Books$
-</pre>
-
-
-What is the expected output? What do you see instead?
-
-I should be able to copy files to my external hard drive, /Volumes/TOSHIBAEXT/annex
-
-
-What version of git-annex are you using? On what operating system?
-
-<pre>
-Talislanta Books$ git annex version
-git-annex version: 3.20130216
-local repository version: 3
-default repository version: 3
-supported repository versions: 3
-upgrade supported from repository versions: 0 1 2
-</pre>
-
-OS X 10.6 (lion)
-
-Please provide any additional information below.
-
-Most files are affected by this, a few are not.  I don't see any pattern to which is which.
-
-> Both bugs reported here are now [[done]]. --[[Joey]]
diff --git a/doc/bugs/git_annix_breaks_git_commit_after_uninstall.mdwn b/doc/bugs/git_annix_breaks_git_commit_after_uninstall.mdwn
deleted file mode 100644
--- a/doc/bugs/git_annix_breaks_git_commit_after_uninstall.mdwn
+++ /dev/null
@@ -1,42 +0,0 @@
-Sorry to be reporting another vague bug, this one interferes with my work unfortunately.
-
-### Please describe the problem.
-After uninstalling git-annix, running git commit returns the following error:
-
-git: 'annex' is not a git command. See 'git --help'.
-
-### What steps will reproduce the problem?
-
-Install git-annex using the ubuntu ppa of fmarcier like so:
-
-    sudo apt-get install git-annex
-
-Then remove it:
-
-    sudo apt-get remove git-annex
-
-Then go to work in a git project, that is not in annex and has no relation to it. Add your changes and run commit:
-
-    git add my-new-file
-    git commit -m "added new file"
-
-I expect it to confirm the file is committed, instead I get the error message:
-  
-    git: 'annex' is not a git command. See 'git --help'.
-
-### What version of git-annex are you using? On what operating system?
-
-Ubuntu 13.04, using the PPA by marcier linked on the branchable website.
-
-> I don't think this is something I want to change.. `git-annex init`
-> installs a pre-commit hook that runs `git annex fix`. If git-annex
-> is removed that hook is left behind to fail. However, if you were really
-> using git-annex in the repo, that's the least of your troubles. If you were
-> using git-annex in the repo and stopped, then you should run `git annex uninit` to remove the hook.
->
-> The only change I could make is to have the hook check if git-annex
-> is in PATH before trying to run it. But this adds time and complexity
-> to the usual case for a edge case. And keeps cruft around in the edge case
-> rather than informing you of the problem. 
-> 
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_defunct_processes___40__child_of_git-annex_assistant__41__.mdwn b/doc/bugs/git_defunct_processes___40__child_of_git-annex_assistant__41__.mdwn
deleted file mode 100644
--- a/doc/bugs/git_defunct_processes___40__child_of_git-annex_assistant__41__.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-What steps will reproduce the problem?
-
-run git annex assistant, add a file, which is picked up and pushed by the assistant.  
-
-What is the expected output? What do you see instead?
-
-a ps -ef shows a large number of defunct git processes.. for example:
-<pre>
-nelg      9622     1  0 02:01 ?        00:00:01 git-annex assistant
-nelg      9637  9622  0 02:01 ?        00:00:00 git --git-dir=/home/nelg/Downloads/test2/.git --work-tree=/home/nelg/Downloads/test2 cat-file --batch
-nelg     12080  9622  0 02:19 ?        00:00:00 [git] &lt;defunct&gt;
-nelg     12082  9622  0 02:19 ?        00:00:00 [git] &lt;defunct&gt;
-nelg     12083  9622  0 02:19 ?        00:00:00 [git] &lt;defunct&gt;
-nelg     12084  9622  0 02:19 ?        00:00:00 [git] &lt;defunct&gt;
------
-</pre>
-
-What version of git-annex are you using? On what operating system?
-
-Compiled git annex from git (cbcd208d158f8e42dda03a5eeaf1bac21045a140), on Mandriva 2010.2, 32 bit, using ghc-7.4.1.
- git version 1.7.1
-
-
-Please provide any additional information below.
-
-I also found that the version of git I have does not support the option: --allow-empty-message
-So, suggest that if the version of git installed is an older version, that the params in  Assistant/Threads/Committer.hs
-are changed to  [ Param "-m", Param "git assistant".... or something like that.
-
-I have done this on my copy for testing it.
-
-For testing, I am also using two repositories on the same computer.  I set this up from the command line, as the web app does not seem to support syncing to two different git folders on the same computer.
-
-> [[done]]; all zombies are squelched now in the assistant. --[[Joey]]
diff --git a/doc/bugs/git_rename_detection_on_file_move.mdwn b/doc/bugs/git_rename_detection_on_file_move.mdwn
--- a/doc/bugs/git_rename_detection_on_file_move.mdwn
+++ b/doc/bugs/git_rename_detection_on_file_move.mdwn
@@ -11,3 +11,4 @@
 changes for another commit, which is perhaps startling behavior.
 
 The other way to fix it is to stop using symlinks, see [[todo/smudge]].
+[[!tag confirmed]]
diff --git a/doc/bugs/git_repo_fails_to_checkout.mdwn b/doc/bugs/git_repo_fails_to_checkout.mdwn
deleted file mode 100644
--- a/doc/bugs/git_repo_fails_to_checkout.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-### Please describe the problem.
-
-Attempting to clone the git repository produces
-
-    (master) cayley:git-annex% git checkout -f HEAD
-    error: unable to create file doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__.mdwn (File name too long)
-    fatal: cannot create directory at 'doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__': File name too long
-
-### What steps will reproduce the problem?
-
-I get the above with either
-
-    git clone https://github.com/joeyh/git-annex
-
-or (after this fails) retrying with
-
-    cd git-annex
-    git checkout -f HEAD
-
-### What version of git-annex are you using? On what operating system?
-
-I am running git 1.9.0 from git (5f95c9f850b19b368c43ae399cc831b17a26a5ac in the git git repo) on Ubuntu 13.04.
-
-> More encfs brain-damange.
-
-	One such limitation is filename length.  If your underlying
-	filesystem limits you to N characters in a filename, then
-	EncFS will limit you to approximately 3*(N-2)/4.
- 
-> It's really astounding that Ubuntu inflicts that POS on users.
-> However, I can't see that as justification for limiting the
-> git-annex repository to filenames shorter than `PATH_MAX` -- just
-> as DOS's problems with both filename length and also `:` in filenames
-> is not a good reason to mangle the repository.
-> 
-> In either case, it's up to the user to find a way to make it work. 
-> In the DOS case, that involves using Cygwin's git. In the encfs case,
-> it presumably means checking it out into a real filesystem.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn b/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn
deleted file mode 100644
--- a/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-### Please describe the problem.
-I created a .gitignore file and added it to git annex. In the assistant webapp log, the error "The installed version of git is too old for .gitignores to be honored by git-annex." shows up. According to [[bugs/assistant_ignore_.gitignore/]] this bug should be fixed in a later git version.
-
-### What steps will reproduce the problem?
-Download the current prebuilt linux tarball from [[/install]], extract it, run "./runshell", then "git --version" returns "git version 1.7.10.4"
-
-### What version of git-annex are you using? On what operating system?
-git-annex-standalone-amd64.tar.gz	2013-09-22 09:56 (Linux Ubuntu Precise)
-
-> Updated to wheezy backport 1.8.4. [[done]] for now, obviously it will go
-> out of date again eventually.. --[[Joey]]
diff --git a/doc/bugs/gix-annex_help_is_homicidal.mdwn b/doc/bugs/gix-annex_help_is_homicidal.mdwn
deleted file mode 100644
--- a/doc/bugs/gix-annex_help_is_homicidal.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-> What steps will reproduce the problem?
-
-Run 'git-annex help'
-
-> What is the expected output?
-
-Something similar to 'git-annex --help', or a pointer to --help.
-
-> What do you see instead?
-
-    git-annex: Unknown command 'help'
-    Did you mean one of these?
-    	drop
-    	dead
-
-> What version of git-annex are you using? On what operating system?
-
-git-annex version 3.20120825 on Arch Linux x86_64, installed from AUR package git-annex and using the [haskell] repository for dependencies.
-
->> Lol, that's great! Also worth noting that with help.autocorrect=1, it'd
->> actually run drop. Only with --force can you lose data however.
->>
->> I've added a help command. [[done]] --[[Joey]]
diff --git a/doc/bugs/glacier_from_multiple_repos.mdwn b/doc/bugs/glacier_from_multiple_repos.mdwn
--- a/doc/bugs/glacier_from_multiple_repos.mdwn
+++ b/doc/bugs/glacier_from_multiple_repos.mdwn
@@ -12,3 +12,5 @@
 in its branch to be able to bootstrap glacier-cli to know about a file.
 This seems doable and he had a design; waiting on movement 
 on the glacier-cli side.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/gpg-agent.mdwn b/doc/bugs/gpg-agent.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/gpg-agent.mdwn
@@ -0,0 +1,5047 @@
+### Please describe the problem.
+I'm running git-annex on OSX 10.9.3. The problem is that during sync with an git-annex remote the system gets flooded with gpg-agent processes which are never stopped, eventually running out of user processes.
+
+### What steps will reproduce the problem?
+Any synchronization of a lot of files with a git-annex remote.
+
+### What version of git-annex are you using? On what operating system?
+5.20140517-g0aed6d9.
+
+The problem did not appear on any older version.
+
+### Please provide any additional information below.
+
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+[2014-05-25 18:15:53 CEST] main: starting assistant version 5.20140517-g0aed6d9
+[2014-05-25 18:16:02 CEST] main: Syncing with diskstation 
+Everything up-to-date
+[2014-05-25 18:16:16 CEST] UpgradeWatcher: Finished upgrading git-annex to version 5.20140517-g0aed6d9 
+[2014-05-25 18:16:16 CEST] TransferScanner: Syncing with diskstation 
+Already up-to-date.
+Already up-to-date.
+Everything up-to-date
+[2014-05-25 18:16:36 CEST] main: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   95ae98a..16f51d5  git-annex -> synced/git-annex
+
+WORM-s196517551-m1400608062--An Introduction to d3.js - From Scattered to Scatterplot%01_introduction.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3670016   1%    3.40MB/s    0:00:55
+     6750208   3%    3.17MB/s    0:00:58
+     9830400   5%    3.09MB/s    0:00:59
+    12976128   6%    3.03MB/s    0:00:59
+    15990784   8%    2.90MB/s    0:01:00
+    18644992   9%    2.79MB/s    0:01:02
+    21528576  10%    2.75MB/s    0:01:02
+    24543232  12%    2.73MB/s    0:01:01
+    27557888  14%    2.72MB/s    0:01:00
+    30834688  15%    2.85MB/s    0:00:56
+    33980416  17%    2.89MB/s    0:00:55
+    36995072  18%    2.88MB/s    0:00:54
+    40108032  20%    2.91MB/s    0:00:52
+    42991616  21%    2.83MB/s    0:00:52
+    45875200  23%    2.79MB/s    0:00:52
+    48857088  24%    2.78MB/s    0:00:51
+    51740672  26%    2.72MB/s    0:00:51
+    54755328  27%    2.75MB/s    0:00:50
+    57638912  29%    2.74MB/s    0:00:49
+    59998208  30%    2.60MB/s    0:00:51
+    62947328  32%    2.61MB/s    0:00:49
+    65961984  33%    2.60MB/s    0:00:49
+    68845568  35%    2.60MB/s    0:00:48
+    71729152  36%    2.73MB/s    0:00:44
+    74743808  38%    2.74MB/s    0:00:43
+    77627392  39%    2.72MB/s    0:00:42
+    80642048  41%    2.76MB/s    0:00:41
+    83656704  42%    2.78MB/s    0:00:39
+    86540288  44%    2.76MB/s    0:00:38
+    89292800  45%    2.72MB/s    0:00:38
+    91389952  46%    2.51MB/s    0:00:40
+    94404608  48%    2.50MB/s    0:00:39
+    97288192  49%    2.49MB/s    0:00:38
+   100040704  50%    2.49MB/s    0:00:37
+   102924288  52%    2.66MB/s    0:00:34
+   105807872  53%    2.65MB/s    0:00:33
+   108691456  55%    2.67MB/s    0:00:32
+   111443968  56%    2.65MB/s    0:00:31
+   114196480  58%    2.63MB/s    0:00:30
+   117342208  59%    2.66MB/s    0:00:29
+   120225792  61%    2.66MB/s    0:00:27
+   123109376  62%    2.70MB/s    0:00:26
+   125992960  64%    2.73MB/s    0:00:25
+   128745472  65%    2.67MB/s    0:00:24
+   131760128  67%    2.70MB/s    0:00:23
+   134643712  68%    2.70MB/s    0:00:22
+   137396224  69%    2.65MB/s    0:00:21
+   140410880  71%    2.72MB/s    0:00:20
+   143294464  72%    2.70MB/s    0:00:19
+   145915904  74%    2.60MB/s    0:00:19
+   148275200  75%    2.50MB/s    0:00:18
+   150896640  76%    2.41MB/s    0:00:18
+   153780224  78%    2.41MB/s    0:00:17
+   157057024  79%    2.60MB/s    0:00:14
+   160202752  81%    2.79MB/s    0:00:12
+   163217408  83%    2.87MB/s    0:00:11
+   166100992  84%    2.86MB/s    0:00:10
+   168984576  85%    2.75MB/s    0:00:09
+   171737088  87%    2.68MB/s    0:00:09
+   174817280  88%    2.68MB/s    0:00:07
+   177831936  90%    2.71MB/s    0:00:06
+   180846592  92%    2.75MB/s    0:00:05
+   183730176  93%    2.77MB/s    0:00:04
+   186875904  95%    2.80MB/s    0:00:03
+   190021632  96%    2.84MB/s    0:00:02
+   192970752  98%    2.85MB/s    0:00:01
+   195854336  99%    2.87MB/s    0:00:00
+   196517551 100%    2.72MB/s    0:01:08 (xfer#1, to-check=0/1)
+
+sent 196541725 bytes  received 42 bytes  2787826.48 bytes/sec
+total size is 196517551  speedup is 1.00
+[2014-05-25 18:17:58 CEST] Transferrer: Uploaded 01_introduction.mp4
+[2014-05-25 18:17:58 CEST] Pusher: Syncing with diskstation 
+
+WORM-s57838296-m1400607924--An Introduction to d3.js - From Scattered to Scatterplot%02_setting-up.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4030464   6%    3.75MB/s    0:00:14
+     6782976  11%    3.15MB/s    0:00:15
+     9535488  16%    2.96MB/s    0:00:15
+    12288000  21%    2.88MB/s    0:00:15
+    15040512  26%    2.58MB/s    0:00:16
+    17793024  30%    2.60MB/s    0:00:15
+    20545536  35%    2.61MB/s    0:00:13
+    23560192  40%    2.66MB/s    0:00:12
+    26705920  46%    2.76MB/s    0:00:11
+    29720576  51%    2.80MB/s    0:00:09
+    32604160  56%    2.81MB/s    0:00:08
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   16f51d5..b142966  git-annex -> synced/git-annex
+    35356672  61%    2.76MB/s    0:00:07
+    38371328  66%    2.73MB/s    0:00:06
+[2014-05-25 18:18:14 CEST] RemoteControl: Syncing with diskstation 
+    41648128  72%    2.79MB/s    0:00:05
+    44761088  77%    2.86MB/s    0:00:04
+    47841280  82%    2.92MB/s    0:00:03
+    50855936  87%    2.92MB/s    0:00:02
+    53870592  93%    2.86MB/s    0:00:01
+    56885248  98%    2.81MB/s    0:00:00
+    57838296 100%    2.80MB/s    0:00:19 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   95ae98a..5809ceb  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at b1429660ab35f95d5bc54e4d8b4f39a19fe66998 but expected 16f51d51d23bf026556435a5cea88488ae0ab108
+ ! 16f51d5..b142966  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 57845539 bytes  received 42 bytes  2690492.14 bytes/sec
+total size is 57838296  speedup is 1.00
+[2014-05-25 18:18:22 CEST] Transferrer: Uploaded 02_setting-up.mp4
+[2014-05-25 18:18:23 CEST] Pusher: Syncing with diskstation 
+
+WORM-s149069061-m1401033118--An Introduction to d3.js - From Scattered to Scatterplot%03_selecting-and-creating-elements.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4063232   2%    3.60MB/s    0:00:39
+remote: merge git-annex      6815744   4%    3.12MB/s    0:00:44
+     9568256   6%    2.96MB/s    0:00:46
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 18:18:28 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b142966..7713a32  git-annex -> synced/git-annex
+    12582912   8%    2.93MB/s    0:00:45
+    15466496  10%    2.70MB/s    0:00:48
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5809ceb..19d05e5  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7713a32f85cf1d993948f15859f0d035d63aa6e0 but expected b1429660ab35f95d5bc54e4d8b4f39a19fe66998
+ ! b142966..7713a32  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    18448384  12%    2.75MB/s    0:00:46
+    21594112  14%    2.83MB/s    0:00:44
+    24477696  16%    2.80MB/s    0:00:43
+    27492352  18%    2.84MB/s    0:00:41
+    30375936  20%    2.80MB/s    0:00:41
+    33587200  22%    2.83MB/s    0:00:39
+    36601856  24%    2.85MB/s    0:00:38
+    39616512  26%    2.82MB/s    0:00:37
+    42041344  28%    2.73MB/s    0:00:38
+    45056000  30%    2.67MB/s    0:00:37
+    48037888  32%    2.66MB/s    0:00:37
+    50855936  34%    2.64MB/s    0:00:36
+    52756480  35%    2.52MB/s    0:00:37
+    54853632  36%    2.26MB/s    0:00:40
+    56950784  38%    2.02MB/s    0:00:44
+    58916864  39%    1.81MB/s    0:00:48
+    61669376  41%    2.00MB/s    0:00:42
+    64552960  43%    2.23MB/s    0:00:36
+    67567616  45%    2.48MB/s    0:00:32
+    70713344  47%    2.77MB/s    0:00:27
+    73859072  49%    2.84MB/s    0:00:25
+    76873728  51%    2.85MB/s    0:00:24
+    79888384  53%    2.85MB/s    0:00:23
+    82903040  55%    2.81MB/s    0:00:22
+    85786624  57%    2.77MB/s    0:00:22
+    88571904  59%    2.73MB/s    0:00:21
+    91422720  61%    2.70MB/s    0:00:20
+    94502912  63%    2.73MB/s    0:00:19
+    97288192  65%    2.68MB/s    0:00:18
+   100335616  67%    2.72MB/s    0:00:17
+   103350272  69%    2.77MB/s    0:00:16
+   106364928  71%    2.73MB/s    0:00:15
+   109379584  73%    2.82MB/s    0:00:13
+   112394240  75%    2.79MB/s    0:00:12
+   115376128  77%    2.76MB/s    0:00:11
+   118390784  79%    2.76MB/s    0:00:10
+   121536512  81%    2.80MB/s    0:00:09
+   124682240  83%    2.85MB/s    0:00:08
+   127827968  85%    2.90MB/s    0:00:07
+   130842624  87%    2.91MB/s    0:00:06
+   133988352  89%    2.91MB/s    0:00:05
+   137003008  91%    2.88MB/s    0:00:04
+   140017664  93%    2.86MB/s    0:00:03
+   142901248  95%    2.85MB/s    0:00:02
+   145588224  97%    2.71MB/s    0:00:01
+   148537344  99%    2.71MB/s    0:00:00
+   149069061 100%    2.71MB/s    0:00:52 (xfer#1, to-check=0/1)
+
+sent 149087462 bytes  received 42 bytes  2786682.32 bytes/sec
+total size is 149069061  speedup is 1.00
+[2014-05-25 18:19:18 CEST] Transferrer: Uploaded 03_select..ments.mp4
+[2014-05-25 18:19:18 CEST] Pusher: Syncing with diskstation 
+
+WORM-s36798210-m1400608746--An Introduction to d3.js - From Scattered to Scatterplot%04_exercise-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  11%    3.89MB/s    0:00:08
+     7143424  19%    3.32MB/s    0:00:08
+    10158080  27%    3.15MB/s    0:00:08
+remote: merge git-annex     13172736  35%    3.07MB/s    0:00:07
+[2014-05-25 18:19:24 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7713a32..c892127  git-annex -> synced/git-annex
+    16187392  43%    2.81MB/s    0:00:07
+    19136512  52%    2.83MB/s    0:00:06
+    22282240  60%    2.88MB/s    0:00:04
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   19d05e5..928f25d  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at c8921270e51c1eb7f5f88a288adbd778711d0ff0 but expected 7713a32f85cf1d993948f15859f0d035d63aa6e0
+ ! 7713a32..c892127  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    25296896  68%    2.88MB/s    0:00:03
+    28442624  77%    2.88MB/s    0:00:02
+    31457280  85%    2.88MB/s    0:00:01
+    34603008  94%    2.84MB/s    0:00:00
+    36798210 100%    2.94MB/s    0:00:11 (xfer#1, to-check=0/1)
+
+sent 36802881 bytes  received 42 bytes  2538132.62 bytes/sec
+total size is 36798210  speedup is 1.00
+[2014-05-25 18:19:32 CEST] Transferrer: Uploaded 04_exercise-1.mp4
+[2014-05-25 18:19:32 CEST] Pusher: Syncing with diskstation 
+
+WORM-s272759172-m1400608447--An Introduction to d3.js - From Scattered to Scatterplot%05_svg.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072   1%    3.97MB/s    0:01:06
+     7241728   2%    3.39MB/s    0:01:16
+    10256384   3%    3.17MB/s    0:01:20
+remote: merge git-annex     13402112   4%    3.11MB/s    0:01:21
+    16416768   6%    2.83MB/s    0:01:28
+[2014-05-25 18:19:38 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c892127..ff739c0  git-annex -> synced/git-annex
+    19431424   7%    2.83MB/s    0:01:27
+    22446080   8%    2.85MB/s    0:01:25
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   928f25d..383d246  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at ff739c08bd8881b7d1c3fd6c305b0d80b3213b0d but expected c8921270e51c1eb7f5f88a288adbd778711d0ff0
+ ! c892127..ff739c0  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    25591808   9%    2.83MB/s    0:01:25
+    28606464  10%    2.81MB/s    0:01:24
+    31621120  11%    2.82MB/s    0:01:23
+    34766848  12%    2.83MB/s    0:01:22
+    37781504  13%    2.83MB/s    0:01:21
+    40927232  15%    2.87MB/s    0:01:18
+    44072960  16%    2.89MB/s    0:01:17
+    47087616  17%    2.89MB/s    0:01:16
+    50397184  18%    2.95MB/s    0:01:13
+    53411840  19%    2.93MB/s    0:01:13
+    56295424  20%    2.89MB/s    0:01:13
+    59146240  21%    2.84MB/s    0:01:13
+    62160896  22%    2.78MB/s    0:01:13
+    65306624  23%    2.82MB/s    0:01:11
+    68321280  25%    2.84MB/s    0:01:10
+    71335936  26%    2.86MB/s    0:01:08
+    74350592  27%    2.85MB/s    0:01:07
+    77365248  28%    2.80MB/s    0:01:08
+    80379904  29%    2.80MB/s    0:01:07
+    83394560  30%    2.82MB/s    0:01:05
+    86540288  31%    2.84MB/s    0:01:04
+    89554944  32%    2.85MB/s    0:01:02
+    92569600  33%    2.86MB/s    0:01:01
+    95453184  34%    2.81MB/s    0:01:01
+    98336768  36%    2.76MB/s    0:01:01
+   101220352  37%    2.74MB/s    0:01:01
+   104103936  38%    2.70MB/s    0:01:00
+   107118592  39%    2.75MB/s    0:00:58
+   110002176  40%    2.74MB/s    0:00:58
+   113016832  41%    2.75MB/s    0:00:56
+   115113984  42%    2.57MB/s    0:00:59
+   117342208  43%    2.37MB/s    0:01:04
+   120356864  44%    2.40MB/s    0:01:02
+   123371520  45%    2.41MB/s    0:01:00
+   126386176  46%    2.61MB/s    0:00:54
+   129335296  47%    2.77MB/s    0:00:50
+   132481024  48%    2.80MB/s    0:00:48
+   135626752  49%    2.83MB/s    0:00:47
+   138772480  50%    2.86MB/s    0:00:45
+   141656064  51%    2.88MB/s    0:00:44
+   144572416  53%    2.83MB/s    0:00:44
+   147456000  54%    2.78MB/s    0:00:43
+   150732800  55%    2.84MB/s    0:00:41
+   153845760  56%    2.89MB/s    0:00:40
+   156860416  57%    2.88MB/s    0:00:39
+   159875072  58%    2.89MB/s    0:00:38
+   162889728  59%    2.83MB/s    0:00:37
+   165904384  60%    2.79MB/s    0:00:37
+   168919040  61%    2.80MB/s    0:00:36
+   172064768  63%    2.82MB/s    0:00:34
+   175079424  64%    2.79MB/s    0:00:34
+   178094080  65%    2.79MB/s    0:00:33
+   180977664  66%    2.77MB/s    0:00:32
+   183861248  67%    2.74MB/s    0:00:31
+   186875904  68%    2.76MB/s    0:00:30
+   190152704  69%    2.81MB/s    0:00:28
+   193298432  70%    2.86MB/s    0:00:27
+   196313088  71%    2.87MB/s    0:00:26
+   199458816  73%    2.92MB/s    0:00:24
+   202473472  74%    2.86MB/s    0:00:23
+   205455360  75%    2.82MB/s    0:00:23
+   208207872  76%    2.76MB/s    0:00:22
+   211091456  77%    2.69MB/s    0:00:22
+   214237184  78%    2.74MB/s    0:00:20
+   217251840  79%    2.77MB/s    0:00:19
+   220266496  80%    2.81MB/s    0:00:18
+   223019008  81%    2.77MB/s    0:00:17
+   225247232  82%    2.54MB/s    0:00:18
+   228261888  83%    2.54MB/s    0:00:17
+   231145472  84%    2.52MB/s    0:00:16
+   234160128  85%    2.58MB/s    0:00:14
+   237043712  86%    2.74MB/s    0:00:12
+   240091136  88%    2.76MB/s    0:00:11
+   243073024  89%    2.78MB/s    0:00:10
+   246087680  90%    2.79MB/s    0:00:09
+   248971264  91%    2.81MB/s    0:00:08
+   251723776  92%    2.71MB/s    0:00:07
+   254738432  93%    2.73MB/s    0:00:06
+   257884160  94%    2.75MB/s    0:00:05
+   261029888  95%    2.80MB/s    0:00:04
+   263913472  96%    2.85MB/s    0:00:03
+   266928128  97%    2.87MB/s    0:00:01
+   269942784  98%    2.83MB/s    0:00:00
+   272759172 100%    2.80MB/s    0:01:32 (xfer#1, to-check=0/1)
+
+sent 272792641 bytes  received 42 bytes  2886695.06 bytes/sec
+total size is 272759172  speedup is 1.00
+[2014-05-25 18:21:07 CEST] Transferrer: Uploaded 05_svg.mp4
+[2014-05-25 18:21:07 CEST] Pusher: Syncing with diskstation 
+
+WORM-s29712591-m1400608733--An Introduction to d3.js - From Scattered to Scatterplot%06_exercise-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4259840  14%    4.00MB/s    0:00:06
+     7274496  24%    3.44MB/s    0:00:06
+    10289152  34%    3.24MB/s    0:00:05
+remote: merge git-annex     13434880  45%    3.17MB/s    0:00:05
+    16678912  56%    2.92MB/s    0:00:04
+[2014-05-25 18:21:13 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ff739c0..07153a2  git-annex -> synced/git-annex
+    19693568  66%    2.89MB/s    0:00:03
+    22740992  76%    2.86MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   383d246..1749643  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 07153a2d49264b9792593fc016c00499ce87f70b but expected ff739c08bd8881b7d1c3fd6c305b0d80b3213b0d
+ ! ff739c0..07153a2  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    25624576  86%    2.81MB/s    0:00:01
+    28639232  96%    2.75MB/s    0:00:00
+    29712591 100%    2.94MB/s    0:00:09 (xfer#1, to-check=0/1)
+
+sent 29716398 bytes  received 42 bytes  2584038.26 bytes/sec
+total size is 29712591  speedup is 1.00
+[2014-05-25 18:21:18 CEST] Transferrer: Uploaded 06_exercise-2.mp4
+[2014-05-25 18:21:18 CEST] Pusher: Syncing with diskstation 
+
+WORM-s276749404-m1400608181--An Introduction to d3.js - From Scattered to Scatterplot%07_binding-data-and-creating-elements-from-data.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4030464   1%    3.60MB/s    0:01:13
+     7307264   2%    3.29MB/s    0:01:19
+remote: merge git-annex     10190848   3%    3.11MB/s    0:01:23
+    13336576   4%    3.06MB/s    0:01:24
+[2014-05-25 18:21:24 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   07153a2..0a42aa9  git-annex -> synced/git-annex
+    16482304   5%    2.89MB/s    0:01:27
+    19496960   7%    2.85MB/s    0:01:28
+    22642688   8%    2.89MB/s    0:01:25
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   1749643..e6798ff  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 0a42aa9412e0a0f03e8edaa7a37eb0d6273bc4d9 but expected 07153a2d49264b9792593fc016c00499ce87f70b
+ ! 07153a2..0a42aa9  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    25788416   9%    2.88MB/s    0:01:25
+    28803072  10%    2.84MB/s    0:01:25
+    31817728  11%    2.84MB/s    0:01:24
+    34832384  12%    2.83MB/s    0:01:23
+    37978112  13%    2.84MB/s    0:01:22
+    40828928  14%    2.82MB/s    0:01:21
+    43974656  15%    2.83MB/s    0:01:20
+    46956544  16%    2.84MB/s    0:01:18
+    50233344  18%    2.88MB/s    0:01:16
+    53248000  19%    2.91MB/s    0:01:15
+    56262656  20%    2.88MB/s    0:01:14
+    59146240  21%    2.84MB/s    0:01:14
+    62291968  22%    2.81MB/s    0:01:14
+    65699840  23%    2.89MB/s    0:01:11
+    68812800  24%    2.91MB/s    0:01:09
+    71892992  25%    2.97MB/s    0:01:07
+    75038720  27%    2.95MB/s    0:01:06
+    78020608  28%    2.87MB/s    0:01:07
+    81166336  29%    2.88MB/s    0:01:06
+    84049920  30%    2.83MB/s    0:01:06
+    86769664  31%    2.76MB/s    0:01:07
+    89653248  32%    2.73MB/s    0:01:06
+    92536832  33%    2.66MB/s    0:01:07
+    95420416  34%    2.66MB/s    0:01:06
+    98304000  35%    2.69MB/s    0:01:04
+   101187584  36%    2.69MB/s    0:01:03
+   104202240  37%    2.75MB/s    0:01:01
+   107216896  38%    2.76MB/s    0:00:59
+   110100480  39%    2.77MB/s    0:00:58
+   113016832  40%    2.78MB/s    0:00:57
+   115867648  41%    2.74MB/s    0:00:57
+   118620160  42%    2.71MB/s    0:00:57
+   121503744  43%    2.69MB/s    0:00:56
+   124452864  44%    2.67MB/s    0:00:55
+   127467520  46%    2.70MB/s    0:00:53
+   130220032  47%    2.69MB/s    0:00:53
+   132972544  48%    2.68MB/s    0:00:52
+   135987200  49%    2.70MB/s    0:00:50
+   138870784  50%    2.68MB/s    0:00:50
+   141754368  51%    2.72MB/s    0:00:48
+   144474112  52%    2.71MB/s    0:00:47
+   147357696  53%    2.68MB/s    0:00:47
+   150372352  54%    2.70MB/s    0:00:45
+   153387008  55%    2.71MB/s    0:00:44
+   156401664  56%    2.76MB/s    0:00:42
+   159416320  57%    2.79MB/s    0:00:41
+   162299904  58%    2.78MB/s    0:00:40
+   165445632  59%    2.80MB/s    0:00:38
+   168460288  60%    2.82MB/s    0:00:37
+   171343872  61%    2.79MB/s    0:00:36
+   174227456  62%    2.78MB/s    0:00:36
+   177373184  64%    2.78MB/s    0:00:34
+   180387840  65%    2.79MB/s    0:00:33
+   183533568  66%    2.86MB/s    0:00:31
+   186548224  67%    2.87MB/s    0:00:30
+   189562880  68%    2.81MB/s    0:00:30
+   192446464  69%    2.75MB/s    0:00:29
+   195461120  70%    2.71MB/s    0:00:29
+   198475776  71%    2.73MB/s    0:00:28
+   201359360  72%    2.74MB/s    0:00:26
+   204308480  73%    2.78MB/s    0:00:25
+   207060992  74%    2.72MB/s    0:00:24
+   210206720  75%    2.77MB/s    0:00:23
+   212828160  76%    2.64MB/s    0:00:23
+   215318528  77%    2.54MB/s    0:00:23
+   218333184  78%    2.58MB/s    0:00:22
+   221347840  79%    2.53MB/s    0:00:21
+   224362496  81%    2.67MB/s    0:00:19
+   227377152  82%    2.77MB/s    0:00:17
+   230129664  83%    2.74MB/s    0:00:16
+   233078784  84%    2.74MB/s    0:00:15
+   236093440  85%    2.74MB/s    0:00:14
+   239108096  86%    2.76MB/s    0:00:13
+   242122752  87%    2.83MB/s    0:00:11
+   245006336  88%    2.81MB/s    0:00:11
+   247824384  89%    2.77MB/s    0:00:10
+   250707968  90%    2.70MB/s    0:00:09
+   253460480  91%    2.63MB/s    0:00:08
+   256606208  92%    2.69MB/s    0:00:07
+   259620864  93%    2.73MB/s    0:00:06
+   262504448  94%    2.75MB/s    0:00:05
+   264994816  95%    2.63MB/s    0:00:04
+   266960896  96%    2.37MB/s    0:00:04
+   268795904  97%    2.11MB/s    0:00:03
+   271155200  97%    1.99MB/s    0:00:02
+   274038784  99%    2.14MB/s    0:00:01
+   276749404 100%    2.75MB/s    0:01:36 (xfer#1, to-check=0/1)
+
+sent 276783402 bytes  received 42 bytes  2838804.55 bytes/sec
+total size is 276749404  speedup is 1.00
+[2014-05-25 18:22:56 CEST] Transferrer: Uploaded 07_bindin..-data.mp4
+[2014-05-25 18:22:56 CEST] Pusher: Syncing with diskstation 
+
+WORM-s58893321-m1400608603--An Introduction to d3.js - From Scattered to Scatterplot%08_exercise-3.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072   7%    3.98MB/s    0:00:13
+     7241728  12%    3.38MB/s    0:00:14
+    10125312  17%    3.14MB/s    0:00:15
+    13139968  22%    3.05MB/s    0:00:14
+    16023552  27%    2.74MB/s    0:00:15
+remote: merge git-annex     18907136  32%    2.72MB/s    0:00:14
+[2014-05-25 18:23:04 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   0a42aa9..961714e  git-annex -> synced/git-annex
+    21790720  37%    2.72MB/s    0:00:13
+    24870912  42%    2.72MB/s    0:00:12
+    27754496  47%    2.72MB/s    0:00:11
+    30638080  52%    2.70MB/s    0:00:10
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e6798ff..c074ab0  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 961714e5af3653435346ed0f7ae7e19efb899c6f but expected 0a42aa9412e0a0f03e8edaa7a37eb0d6273bc4d9
+ ! 0a42aa9..961714e  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    33980416  57%    2.81MB/s    0:00:08
+    36864000  62%    2.78MB/s    0:00:07
+    39616512  67%    2.76MB/s    0:00:06
+    42369024  71%    2.75MB/s    0:00:05
+    45252608  76%    2.64MB/s    0:00:05
+    48136192  81%    2.64MB/s    0:00:03
+    51150848  86%    2.67MB/s    0:00:02
+    53903360  91%    2.65MB/s    0:00:01
+    56655872  96%    2.63MB/s    0:00:00
+    58893321 100%    2.76MB/s    0:00:20 (xfer#1, to-check=0/1)
+
+sent 58900692 bytes  received 42 bytes  2617810.40 bytes/sec
+total size is 58893321  speedup is 1.00
+[2014-05-25 18:23:18 CEST] Transferrer: Uploaded 08_exercise-3.mp4
+[2014-05-25 18:23:18 CEST] Pusher: Syncing with diskstation 
+
+WORM-s134947390-m1400608565--An Introduction to d3.js - From Scattered to Scatterplot%09_transitions.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4161536   3%    3.82MB/s    0:00:33
+     7045120   5%    3.24MB/s    0:00:38
+remote: merge git-annex      9928704   7%    3.04MB/s    0:00:40
+    13205504   9%    3.05MB/s    0:00:38
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   961714e..dbdf944  git-annex -> synced/git-annex
+[2014-05-25 18:23:24 CEST] RemoteControl: Syncing with diskstation 
+    16220160  12%    2.79MB/s    0:00:41
+    19103744  14%    2.80MB/s    0:00:40
+    21856256  16%    2.79MB/s    0:00:39
+    24576000  18%    2.66MB/s    0:00:40
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c074ab0..1e5f9f1  git-annex  -> diskstation/git-annex
+    27459584  20%    2.64MB/s    0:00:39
+    30474240  22%    2.68MB/s    0:00:38
+    33357824  24%    2.70MB/s    0:00:36
+    36372480  26%    2.76MB/s    0:00:34
+    39256064  29%    2.76MB/s    0:00:33
+    42139648  31%    2.73MB/s    0:00:33
+    45023232  33%    2.73MB/s    0:00:32
+    47775744  35%    2.66MB/s    0:00:31
+    50659328  37%    2.66MB/s    0:00:30
+    53542912  39%    2.65MB/s    0:00:29
+    56557568  41%    2.66MB/s    0:00:28
+    59310080  43%    2.67MB/s    0:00:27
+    62029824  45%    2.64MB/s    0:00:26
+    64782336  48%    2.62MB/s    0:00:26
+    67665920  50%    2.61MB/s    0:00:25
+    70680576  52%    2.64MB/s    0:00:23
+    73695232  54%    2.70MB/s    0:00:22
+    76709888  56%    2.77MB/s    0:00:20
+    79593472  58%    2.76MB/s    0:00:19
+    82608128  61%    2.79MB/s    0:00:18
+    85622784  63%    2.81MB/s    0:00:17
+    88506368  65%    2.76MB/s    0:00:16
+    91619328  67%    2.81MB/s    0:00:15
+    94502912  70%    2.78MB/s    0:00:14
+    97255424  72%    2.72MB/s    0:00:13
+   100270080  74%    2.76MB/s    0:00:12
+   102760448  76%    2.61MB/s    0:00:12
+   105349120  78%    2.54MB/s    0:00:11
+   108232704  80%    2.57MB/s    0:00:10
+   111247360  82%    2.56MB/s    0:00:09
+   114262016  84%    2.68MB/s    0:00:07
+   117145600  86%    2.76MB/s    0:00:06
+   120029184  88%    2.75MB/s    0:00:05
+   123043840  91%    2.76MB/s    0:00:04
+   125927424  93%    2.74MB/s    0:00:03
+   128942080  95%    2.76MB/s    0:00:02
+   131694592  97%    2.74MB/s    0:00:01
+   134447104  99%    2.64MB/s    0:00:00
+   134947390 100%    2.72MB/s    0:00:47 (xfer#1, to-check=0/1)
+
+sent 134964047 bytes  received 42 bytes  2726547.25 bytes/sec
+total size is 134947390  speedup is 1.00
+[2014-05-25 18:24:08 CEST] Transferrer: Uploaded 09_transitions.mp4
+[2014-05-25 18:24:08 CEST] Pusher: Syncing with diskstation 
+
+WORM-s106802484-m1399168180--An Introduction to d3.js - From Scattered to Scatterplot%10_scales-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4128768   3%    3.75MB/s    0:00:26
+     7143424   6%    3.27MB/s    0:00:29
+    10027008   9%    3.10MB/s    0:00:30
+remote: merge git-annex     13008896  12%    3.01MB/s    0:00:30
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 18:24:13 CEST] RemoteControl: Syncing with diskstation 
+   dbdf944..cef70b3  git-annex -> synced/git-annex
+    16154624  15%    2.81MB/s    0:00:31
+    19169280  17%    2.81MB/s    0:00:30
+    22183936  20%    2.83MB/s    0:00:29
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   1e5f9f1..af18e69  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at cef70b30ddce59c2b22b370b25420da2fa7e2b49 but expected dbdf94438b7e48971a594c7647721f4821c8cff2
+ ! dbdf944..cef70b3  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    24936448  23%    2.78MB/s    0:00:28
+    27688960  25%    2.70MB/s    0:00:28
+    30834688  28%    2.73MB/s    0:00:27
+    32899072  30%    2.50MB/s    0:00:28
+    35749888  33%    2.53MB/s    0:00:27
+    38764544  36%    2.56MB/s    0:00:25
+    41779200  39%    2.53MB/s    0:00:25
+    44072960  41%    2.60MB/s    0:00:23
+    47415296  44%    2.71MB/s    0:00:21
+    50036736  46%    2.65MB/s    0:00:20
+    52789248  49%    2.59MB/s    0:00:20
+    55672832  52%    2.72MB/s    0:00:18
+    58687488  54%    2.64MB/s    0:00:17
+    61571072  57%    2.69MB/s    0:00:16
+    64585728  60%    2.75MB/s    0:00:14
+    67207168  62%    2.65MB/s    0:00:14
+    69304320  64%    2.44MB/s    0:00:14
+    72318976  67%    2.46MB/s    0:00:13
+    75071488  70%    2.42MB/s    0:00:12
+    78020608  73%    2.53MB/s    0:00:11
+    80904192  75%    2.71MB/s    0:00:09
+    83787776  78%    2.68MB/s    0:00:08
+    86540288  81%    2.66MB/s    0:00:07
+    89423872  83%    2.64MB/s    0:00:06
+    92372992  86%    2.67MB/s    0:00:05
+    95256576  89%    2.68MB/s    0:00:04
+    98140160  91%    2.72MB/s    0:00:03
+   101154816  94%    2.74MB/s    0:00:02
+   104169472  97%    2.73MB/s    0:00:00
+   106802484 100%    2.70MB/s    0:00:37 (xfer#1, to-check=0/1)
+
+sent 106815702 bytes  received 42 bytes  2704196.05 bytes/sec
+total size is 106802484  speedup is 1.00
+[2014-05-25 18:24:47 CEST] Transferrer: Uploaded 10_scales-2.mp4
+[2014-05-25 18:24:47 CEST] Pusher: Syncing with diskstation 
+
+WORM-s106802484-m1399168180--An Introduction to d3.js - From Scattered to Scatterplot%10_scales.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3964928   3%    3.74MB/s    0:00:26
+     6848512   6%    3.19MB/s    0:00:30
+     9994240   9%    3.08MB/s    0:00:30
+remote: merge git-annex     12877824  12%    2.97MB/s    0:00:30
+    15892480  14%    2.74MB/s    0:00:32
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 18:24:53 CEST] RemoteControl: Syncing with diskstation 
+   cef70b3..bc92e4a  git-annex -> synced/git-annex
+    18644992  17%    2.71MB/s    0:00:31
+    20873216  19%    2.51MB/s    0:00:33
+    23429120  21%    2.39MB/s    0:00:34
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   af18e69..7b0c500  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at bc92e4a867338760dec749af77a9262591b9c43a but expected cef70b30ddce59c2b22b370b25420da2fa7e2b49
+ ! cef70b3..bc92e4a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    27099136  25%    2.52MB/s    0:00:30
+    29982720  28%    2.56MB/s    0:00:29
+    32866304  30%    2.72MB/s    0:00:26
+    35880960  33%    2.88MB/s    0:00:24
+    38633472  36%    2.69MB/s    0:00:24
+    41517056  38%    2.68MB/s    0:00:23
+    44662784  41%    2.74MB/s    0:00:22
+    47546368  44%    2.72MB/s    0:00:21
+    50298880  47%    2.72MB/s    0:00:20
+    53182464  49%    2.72MB/s    0:00:19
+    56066048  52%    2.66MB/s    0:00:18
+    58949632  55%    2.67MB/s    0:00:17
+    61308928  57%    2.59MB/s    0:00:17
+    63799296  59%    2.51MB/s    0:00:16
+    66781184  62%    2.54MB/s    0:00:15
+    69697536  65%    2.53MB/s    0:00:14
+    72712192  68%    2.67MB/s    0:00:12
+    75595776  70%    2.77MB/s    0:00:10
+    78479360  73%    2.74MB/s    0:00:10
+    81428480  76%    2.75MB/s    0:00:09
+    84312064  78%    2.73MB/s    0:00:08
+    87195648  81%    2.73MB/s    0:00:07
+    90210304  84%    2.77MB/s    0:00:05
+    93192192  87%    2.76MB/s    0:00:04
+    96075776  89%    2.74MB/s    0:00:03
+    98959360  92%    2.71MB/s    0:00:02
+   101974016  95%    2.68MB/s    0:00:01
+   104857600  98%    2.68MB/s    0:00:00
+   106802484 100%    2.71MB/s    0:00:37 (xfer#1, to-check=0/1)
+
+sent 106815700 bytes  received 42 bytes  2704196.00 bytes/sec
+total size is 106802484  speedup is 1.00
+[2014-05-25 18:25:26 CEST] Transferrer: Uploaded 10_scales.mp4
+[2014-05-25 18:25:26 CEST] Pusher: Syncing with diskstation 
+
+WORM-s132805496-m1399168071--An Introduction to d3.js - From Scattered to Scatterplot%11_axes.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4096000   3%    3.82MB/s    0:00:32
+     7110656   5%    3.32MB/s    0:00:37
+     9863168   7%    3.07MB/s    0:00:39
+remote: merge git-annex     12877824   9%    3.01MB/s    0:00:38
+    15826944  11%    2.76MB/s    0:00:41
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 18:25:33 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   bc92e4a..cf6d3d1  git-annex -> synced/git-annex
+    18710528  14%    2.74MB/s    0:00:40
+    21594112  16%    2.78MB/s    0:00:39
+    24477696  18%    2.75MB/s    0:00:38
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7b0c500..8393191  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at cf6d3d1e7ec71ad4d9c4a0e5256f361c58ca5e75 but expected bc92e4a867338760dec749af77a9262591b9c43a
+ ! bc92e4a..cf6d3d1  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    27230208  20%    2.70MB/s    0:00:38
+    29949952  22%    2.63MB/s    0:00:38
+    32964608  24%    2.64MB/s    0:00:36
+    35848192  26%    2.64MB/s    0:00:35
+    38862848  29%    2.69MB/s    0:00:34
+    41877504  31%    2.77MB/s    0:00:32
+    44761088  33%    2.73MB/s    0:00:31
+    47513600  35%    2.71MB/s    0:00:30
+    50135040  37%    2.61MB/s    0:00:30
+    53280768  40%    2.66MB/s    0:00:29
+    56164352  42%    2.67MB/s    0:00:28
+    59179008  44%    2.71MB/s    0:00:26
+    62062592  46%    2.79MB/s    0:00:24
+    64946176  48%    2.73MB/s    0:00:24
+    68091904  51%    2.82MB/s    0:00:22
+    71106560  53%    2.84MB/s    0:00:21
+    74055680  55%    2.83MB/s    0:00:20
+    77070336  58%    2.85MB/s    0:00:19
+    79953920  60%    2.77MB/s    0:00:18
+    82837504  62%    2.74MB/s    0:00:17
+    85590016  64%    2.72MB/s    0:00:16
+    88342528  66%    2.63MB/s    0:00:16
+    91095040  68%    2.60MB/s    0:00:15
+    94044160  70%    2.62MB/s    0:00:14
+    97058816  73%    2.66MB/s    0:00:13
+    99549184  74%    2.60MB/s    0:00:12
+   101515264  76%    2.41MB/s    0:00:12
+   103481344  77%    2.18MB/s    0:00:13
+   105578496  79%    1.93MB/s    0:00:13
+   107806720  81%    1.89MB/s    0:00:12
+   110821376  83%    2.12MB/s    0:00:10
+   113704960  85%    2.34MB/s    0:00:07
+   116719616  87%    2.60MB/s    0:00:06
+   119603200  90%    2.77MB/s    0:00:04
+   122486784  92%    2.73MB/s    0:00:03
+   125435904  94%    2.74MB/s    0:00:02
+   128450560  96%    2.74MB/s    0:00:01
+   131268608  98%    2.70MB/s    0:00:00
+   132805496 100%    2.67MB/s    0:00:47 (xfer#1, to-check=0/1)
+
+sent 132821882 bytes  received 42 bytes  2683271.19 bytes/sec
+total size is 132805496  speedup is 1.00
+[2014-05-25 18:26:16 CEST] Transferrer: Uploaded 11_axes.mp4
+[2014-05-25 18:26:16 CEST] Pusher: Syncing with diskstation 
+
+WORM-s120549770-m1399667258--An Introduction to d3.js - From Scattered to Scatterplot%12_advanced-techniques.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4096000   3%    3.77MB/s    0:00:30
+     7110656   5%    3.31MB/s    0:00:33
+    10125312   8%    3.15MB/s    0:00:34
+remote: merge git-annex     13008896  10%    3.04MB/s    0:00:34
+[2014-05-25 18:26:22 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   cf6d3d1..fef357a  git-annex -> synced/git-annex
+    15892480  13%    2.78MB/s    0:00:36
+    18776064  15%    2.75MB/s    0:00:36
+    21659648  17%    2.72MB/s    0:00:35
+    24608768  20%    2.73MB/s    0:00:34
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8393191..9ef8d81  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at fef357aaed77f1b94344c0aeea71b30a50de247d but expected cf6d3d1e7ec71ad4d9c4a0e5256f361c58ca5e75
+ ! cf6d3d1..fef357a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    27623424  22%    2.75MB/s    0:00:33
+    30507008  25%    2.74MB/s    0:00:32
+    33390592  27%    2.72MB/s    0:00:31
+    36405248  30%    2.74MB/s    0:00:30
+    39419904  32%    2.73MB/s    0:00:29
+    42434560  35%    2.76MB/s    0:00:27
+    45580288  37%    2.83MB/s    0:00:25
+    48594944  40%    2.83MB/s    0:00:24
+    51576832  42%    2.83MB/s    0:00:23
+    54231040  44%    2.76MB/s    0:00:23
+    57245696  47%    2.74MB/s    0:00:22
+    60260352  49%    2.73MB/s    0:00:21
+    63275008  52%    2.73MB/s    0:00:20
+    66289664  54%    2.80MB/s    0:00:18
+    69304320  57%    2.80MB/s    0:00:17
+    72187904  59%    2.77MB/s    0:00:17
+    75071488  62%    2.74MB/s    0:00:16
+    78086144  64%    2.73MB/s    0:00:15
+    80969728  67%    2.70MB/s    0:00:14
+    84115456  69%    2.75MB/s    0:00:12
+    87130112  72%    2.79MB/s    0:00:11
+    90013696  74%    2.77MB/s    0:00:10
+    92766208  76%    2.73MB/s    0:00:09
+    95780864  79%    2.70MB/s    0:00:08
+    98664448  81%    2.68MB/s    0:00:07
+   101679104  84%    2.71MB/s    0:00:06
+   104693760  86%    2.78MB/s    0:00:05
+   107511808  89%    2.74MB/s    0:00:04
+   110526464  91%    2.74MB/s    0:00:03
+   113508352  94%    2.75MB/s    0:00:02
+   116654080  96%    2.77MB/s    0:00:01
+   119668736  99%    2.82MB/s    0:00:00
+   120549770 100%    2.79MB/s    0:00:41 (xfer#1, to-check=0/1)
+
+sent 120564675 bytes  received 42 bytes  2771602.69 bytes/sec
+total size is 120549770  speedup is 1.00
+[2014-05-25 18:26:59 CEST] Transferrer: Uploaded 12_advanc..iques.mp4
+[2014-05-25 18:27:00 CEST] Pusher: Syncing with diskstation 
+
+WORM-s17591948-m1399167639--An Introduction to d3.js - From Scattered to Scatterplot%13_conclusion.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3997696  22%    3.68MB/s    0:00:03
+     6881280  39%    3.16MB/s    0:00:03
+     9764864  55%    2.99MB/s    0:00:02
+remote: merge git-annex     12910592  73%    2.99MB/s    0:00:01
+    15794176  89%    2.74MB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 18:27:07 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+    17591948 100%    2.92MB/s    0:00:05 (xfer#1, to-check=0/1)
+   fef357a..28d7559  git-annex -> synced/git-annex
+
+sent 17594275 bytes  received 42 bytes  2345908.93 bytes/sec
+total size is 17591948  speedup is 1.00
+[2014-05-25 18:27:08 CEST] Transferrer: Uploaded 13_conclusion.mp4
+
+WORM-s1250093-m1389398522--C,43,43 Memory Management%01_introduction.mp4
+       32768   2%    0.00kB/s    0:00:00
+     1250093 100%   25.24MB/s    0:00:00 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9ef8d81..740fecd  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 28d7559836e91e16f98a532c30e5a4cbaef12250 but expected fef357aaed77f1b94344c0aeea71b30a50de247d
+ ! fef357a..28d7559  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 1250398 bytes  received 42 bytes  833626.67 bytes/sec
+total size is 1250093  speedup is 1.00
+[2014-05-25 18:27:10 CEST] Transferrer: Uploaded 01_introduction.mp4
+[2014-05-25 18:27:11 CEST] Pusher: Syncing with diskstation 
+
+WORM-s4072461-m1389398387--C,43,43 Memory Management%02_leaks-and-overruns.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3801088  93%    3.52MB/s    0:00:00
+     4072461 100%    3.35MB/s    0:00:01 (xfer#1, to-check=0/1)
+remote: merge git-annex 
+sent 4073116 bytes  received 42 bytes  1629263.20 bytes/sec
+total size is 4072461  speedup is 1.00
+[2014-05-25 18:27:17 CEST] Transferrer: Uploaded 02_leaks-..rruns.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+
+WORM-s10885066-m1389398446--C,43,43 Memory Management%03_stl-vector-methods-range-checking-and-sentinels.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 18:27:18 CEST] RemoteControl: Syncing with diskstation 
+   28d7559..d7a7f79  git-annex -> synced/git-annex
+     3964928  36%    3.71MB/s    0:00:01
+     6979584  64%    3.28MB/s    0:00:01
+     9797632  90%    3.08MB/s    0:00:00
+    10885066 100%    3.07MB/s    0:00:03 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   740fecd..8700b31  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at d7a7f7988fd67d9cd827311157f7633da55d2e85 but expected 28d7559836e91e16f98a532c30e5a4cbaef12250
+ ! 28d7559..d7a7f79  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 10886583 bytes  received 42 bytes  1979386.36 bytes/sec
+total size is 10885066  speedup is 1.00
+[2014-05-25 18:27:22 CEST] Transferrer: Uploaded 03_stl-ve..inels.mp4
+
+WORM-s6830209-m1389398548--C,43,43 Memory Management%04_memory-leaks-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 18:27:23 CEST] Pusher: Syncing with diskstation 
+     3964928  58%    3.72MB/s    0:00:00
+     6830209 100%    3.23MB/s    0:00:00
+     6830209 100%    3.23MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 6831201 bytes  received 42 bytes  1951783.71 bytes/sec
+total size is 6830209  speedup is 1.00
+[2014-05-25 18:27:25 CEST] Transferrer: Uploaded 04_memory..art-1.mp4
+
+WORM-s4500501-m1389398494--C,43,43 Memory Management%05_memory-leaks-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      3833856  85%    3.57MB/s    0:00:00
+     4500501 100%    3.39MB/s    0:00:01 (xfer#1, to-check=0/1)
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d7a7f79..963ef9d  git-annex -> synced/git-annex
+[2014-05-25 18:27:28 CEST] RemoteControl: Syncing with diskstation 
+
+sent 4501209 bytes  received 42 bytes  1286071.71 bytes/sec
+total size is 4500501  speedup is 1.00
+[2014-05-25 18:27:28 CEST] Transferrer: Uploaded 05_memory..art-2.mp4
+
+WORM-s4479532-m1389398463--C,43,43 Memory Management%06_pointers-pitfalls-and-best-practices.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4292608  95%    4.06MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8700b31..8a3838b  git-annex  -> diskstation/git-annex
+     4479532 100%    4.05MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 4480253 bytes  received 42 bytes  1280084.29 bytes/sec
+total size is 4479532  speedup is 1.00
+[2014-05-25 18:27:31 CEST] Transferrer: Uploaded 06_pointe..tices.mp4
+
+WORM-s9775707-m1389398514--C,43,43 Memory Management%07_initialize-everything-trust-but-verify.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 18:27:32 CEST] Pusher: Syncing with diskstation 
+     4096000  41%    3.77MB/s    0:00:01
+     7241728  74%    3.37MB/s    0:00:00
+     9775707 100%    3.22MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 9777078 bytes  received 42 bytes  2793462.86 bytes/sec
+total size is 9775707  speedup is 1.00
+[2014-05-25 18:27:34 CEST] Transferrer: Uploaded 07_initia..erify.mp4
+remote: merge git-annex 
+WORM-s15498925-m1389398484--C,43,43 Memory Management%08_reading-and-writing-shared-assets.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3964928  25%    3.69MB/s    0:00:03
+[2014-05-25 18:27:36 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   963ef9d..d7cb480  git-annex -> synced/git-annex
+     6848512  44%    3.21MB/s    0:00:02
+     9863168  63%    3.07MB/s    0:00:01
+    13008896  83%    3.05MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8a3838b..9dc2149  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at d7cb4801b1d5172fa94c5ef5b952650404806c5e but expected 963ef9d37e0ca48e88afccc16e3d53a7dbe94a15
+ ! 963ef9d..d7cb480  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    15498925 100%    3.04MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 15500988 bytes  received 42 bytes  2818369.09 bytes/sec
+total size is 15498925  speedup is 1.00
+[2014-05-25 18:27:41 CEST] Transferrer: Uploaded 08_readin..ssets.mp4
+[2014-05-25 18:27:41 CEST] Pusher: Syncing with diskstation 
+
+WORM-s7479394-m1389398424--C,43,43 Memory Management%09_undefined-behaviour-and-other-bad-practices.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4030464  53%    3.77MB/s    0:00:00
+remote: merge git-annex      7045120  94%    3.28MB/s    0:00:00
+     7479394 100%    3.24MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 7480490 bytes  received 42 bytes  2137294.86 bytes/sec
+total size is 7479394  speedup is 1.00
+[2014-05-25 18:27:47 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 18:27:47 CEST] Transferrer: Uploaded 09_undefi..tices.mp4
+
+WORM-s5620037-m1389398373--C,43,43 Memory Management%10_the-heap-and-stl-wrappers.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d7cb480..cebe41e  git-annex -> synced/git-annex
+     4390912  78%    4.02MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9dc2149..2c100e7  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at cebe41ecefec0ba03838b77300b8213abff6e46f but expected d7cb4801b1d5172fa94c5ef5b952650404806c5e
+ ! d7cb480..cebe41e  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 18:27:48 CEST] RemoteControl: Syncing with diskstation 
+     5620037 100%    3.71MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 5620887 bytes  received 42 bytes  2248371.60 bytes/sec
+total size is 5620037  speedup is 1.00
+[2014-05-25 18:27:50 CEST] Transferrer: Uploaded 10_the-he..ppers.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2c100e7..7d585c6  git-annex  -> diskstation/git-annex
+
+WORM-s1014080-m1389398563--C,43,43 Memory Management%11_about-the-author.mp4
+       32768   3%    0.00kB/s    0:00:00
+     1014080 100%   20.80MB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 1014357 bytes  received 42 bytes  676266.00 bytes/sec
+total size is 1014080  speedup is 1.00
+[2014-05-25 18:27:51 CEST] Transferrer: Uploaded 11_about-..uthor.mp4
+[2014-05-25 18:27:52 CEST] Pusher: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 18:27:56 CEST] RemoteControl: Syncing with diskstation 
+   cebe41e..1f16e00  git-annex -> synced/git-annex
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7d585c6..25d816f  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 1f16e00081100c31ba110cc6655ba98ce9c3ccf9 but expected cebe41ecefec0ba03838b77300b8213abff6e46f
+ ! cebe41e..1f16e00  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 19:02:45 CEST] main: Syncing with diskstation 
+remote: merge git-annex ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   1f16e00..25d816f  git-annex -> synced/git-annex
+[2014-05-25 19:16:16 CEST] NetWatcherFallback: Syncing with diskstation 
+Everything up-to-date
+[2014-05-25 19:44:23 CEST] main: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   25d816f..af358a2  git-annex -> synced/git-annex
+
+WORM-s311796310-m1396397568--Lean UX Workshop%01_introduction.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3440640   1%    3.23MB/s    0:01:33
+     6062080   1%    2.75MB/s    0:01:48
+    10518528   3%    3.15MB/s    0:01:33
+    13926400   4%    3.15MB/s    0:01:32
+    16023552   5%    2.73MB/s    0:01:45
+    20611072   6%    3.22MB/s    0:01:28
+    22315008   7%    2.58MB/s    0:01:49
+    26509312   8%    2.76MB/s    0:01:40
+    29655040   9%    3.10MB/s    0:01:28
+    33325056  10%    2.61MB/s    0:01:44
+    36470784  11%    2.96MB/s    0:01:30
+    40402944  12%    2.88MB/s    0:01:32
+    44072960  14%    2.96MB/s    0:01:28
+    47218688  15%    3.17MB/s    0:01:21
+    49840128  15%    3.04MB/s    0:01:24
+    54296576  17%    3.12MB/s    0:01:20
+    58228736  18%    3.20MB/s    0:01:17
+    61636608  19%    3.23MB/s    0:01:15
+    64782336  20%    3.40MB/s    0:01:11
+    66879488  21%    2.92MB/s    0:01:21
+    71335936  22%    3.07MB/s    0:01:16
+    75005952  24%    3.15MB/s    0:01:13
+    78151680  25%    3.14MB/s    0:01:12
+    80510976  25%    3.01MB/s    0:01:15
+    83918848  26%    2.76MB/s    0:01:20
+    86540288  27%    2.48MB/s    0:01:28
+    91291648  29%    2.83MB/s    0:01:15
+    92831744  29%    2.75MB/s    0:01:17
+    95977472  30%    2.66MB/s    0:01:19
+   100433920  32%    3.08MB/s    0:01:06
+   103841792  33%    2.77MB/s    0:01:13
+   107446272  34%    3.30MB/s    0:01:00
+   109608960  35%    3.12MB/s    0:01:03
+   113803264  36%    3.09MB/s    0:01:02
+   115900416  37%    2.68MB/s    0:01:11
+   119308288  38%    2.62MB/s    0:01:11
+   123240448  39%    2.97MB/s    0:01:01
+   126648320  40%    2.61MB/s    0:01:09
+   130580480  41%    3.09MB/s    0:00:57
+   134643712  43%    3.26MB/s    0:00:52
+   135561216  43%    2.65MB/s    0:01:04
+   140017664  44%    3.11MB/s    0:00:53
+   142639104  45%    2.82MB/s    0:00:58
+   146866176  47%    2.87MB/s    0:00:56
+   150241280  48%    3.46MB/s    0:00:45
+   152338432  48%    2.80MB/s    0:00:55
+   157220864  50%    3.31MB/s    0:00:45
+   160464896  51%    2.88MB/s    0:00:51
+   165085184  52%    3.14MB/s    0:00:45
+   167542784  53%    3.35MB/s    0:00:42
+   171638784  55%    3.18MB/s    0:00:43
+   172785664  55%    2.78MB/s    0:00:48
+   176979968  56%    2.67MB/s    0:00:49
+   179601408  57%    2.48MB/s    0:00:52
+   184254464  59%    2.60MB/s    0:00:47
+   187432960  60%    3.16MB/s    0:00:38
+   190742528  61%    2.96MB/s    0:00:39
+   194412544  62%    3.48MB/s    0:00:32
+   197525504  63%    3.12MB/s    0:00:35
+   201064448  64%    3.19MB/s    0:00:33
+   203980800  65%    3.01MB/s    0:00:35
+   208699392  66%    3.25MB/s    0:00:31
+   212369408  68%    3.36MB/s    0:00:28
+   215515136  69%    3.27MB/s    0:00:28
+   217350144  69%    3.04MB/s    0:00:30
+   221806592  71%    2.99MB/s    0:00:29
+   225378304  72%    2.94MB/s    0:00:28
+   228622336  73%    2.98MB/s    0:00:27
+   231243776  74%    3.13MB/s    0:00:25
+   233603072  74%    2.59MB/s    0:00:29
+   237273088  76%    2.35MB/s    0:00:30
+   239894528  76%    2.22MB/s    0:00:31
+   242515968  77%    2.07MB/s    0:00:32
+   244350976  78%    1.97MB/s    0:00:33
+   246448128  79%    1.87MB/s    0:00:34
+   250118144  80%    1.73MB/s    0:00:34
+   253263872  81%    2.00MB/s    0:00:28
+   254312448  81%    1.80MB/s    0:00:31
+   255885312  82%    1.58MB/s    0:00:34
+   257720320  82%    1.33MB/s    0:00:39
+   259817472  83%    1.01MB/s    0:00:50
+   261914624  84%    1.06MB/s    0:00:45
+   264011776  84%    1.08MB/s    0:00:43
+   265584640  85%    1.16MB/s    0:00:39
+   267419648  85%    1.21MB/s    0:00:35
+   272662528  87%    2.00MB/s    0:00:19
+   276856832  88%    2.77MB/s    0:00:12
+   278953984  89%    2.81MB/s    0:00:11
+   283410432  90%    3.51MB/s    0:00:07
+   288358400  92%    3.47MB/s    0:00:06
+   292323328  93%    3.32MB/s    0:00:05
+   296714240  95%    3.93MB/s    0:00:03
+   300908544  96%    3.95MB/s    0:00:02
+   303333376  97%    3.30MB/s    0:00:02
+   307789824  98%    3.53MB/s    0:00:01
+   310673408  99%    2.89MB/s    0:00:00
+   311796310 100%    2.73MB/s    0:01:48 (xfer#1, to-check=0/1)
+
+sent 311834516 bytes  received 42 bytes  2822032.20 bytes/sec
+total size is 311796310  speedup is 1.00
+[2014-05-25 19:46:46 CEST] Transferrer: Uploaded 01_introduction.mp4
+[2014-05-25 19:46:46 CEST] Pusher: Syncing with diskstation 
+
+WORM-s197776451-m1396396404--Lean UX Workshop%02_nordstrom-case-study.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5177344   2%    4.78MB/s    0:00:39
+     8683520   4%    3.74MB/s    0:00:49
+    13139968   6%    3.33MB/s    0:00:54
+remote: merge git-annex     18382848   9%    3.63MB/s    0:00:48
+    22315008  11%    3.16MB/s    0:00:54
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   af358a2..3b93fc5  git-annex -> synced/git-annex
+[2014-05-25 19:46:54 CEST] RemoteControl: Syncing with diskstation 
+    26902528  13%    3.47MB/s    0:00:48
+    29917184  15%    3.51MB/s    0:00:46
+    31653888  16%    2.82MB/s    0:00:57
+    33849344  17%    2.64MB/s    0:01:00
+    36995072  18%    2.30MB/s    0:01:08
+    41189376  20%    2.62MB/s    0:00:58
+    44859392  22%    2.97MB/s    0:00:50
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   25d816f..b7c06ab  git-annex  -> diskstation/git-annex
+    50102272  25%    3.67MB/s    0:00:39
+    52199424  26%    3.41MB/s    0:00:41
+    56655872  28%    3.47MB/s    0:00:39
+    60719104  30%    3.64MB/s    0:00:36
+    64520192  32%    3.31MB/s    0:00:39
+    68714496  34%    3.85MB/s    0:00:32
+    72876032  36%    3.79MB/s    0:00:32
+    76054528  38%    3.60MB/s    0:00:32
+    80216064  40%    3.70MB/s    0:00:31
+    83656704  42%    3.25MB/s    0:00:34
+    88899584  44%    3.48MB/s    0:00:30
+    92995584  47%    3.69MB/s    0:00:27
+    96763904  48%    3.62MB/s    0:00:27
+   100925440  51%    4.08MB/s    0:00:23
+   104628224  52%    3.73MB/s    0:00:24
+   109084672  55%    3.80MB/s    0:00:22
+   111443968  56%    3.40MB/s    0:00:24
+   116752384  59%    3.66MB/s    0:00:21
+   119046144  60%    3.33MB/s    0:00:23
+   124026880  62%    3.44MB/s    0:00:20
+   128483328  64%    3.98MB/s    0:00:16
+   132710400  67%    3.73MB/s    0:00:17
+   136871936  69%    4.17MB/s    0:00:14
+   141131776  71%    4.00MB/s    0:00:13
+   145522688  73%    4.01MB/s    0:00:12
+   149716992  75%    4.02MB/s    0:00:11
+   154173440  77%    4.08MB/s    0:00:10
+   158433280  80%    4.11MB/s    0:00:09
+   162758656  82%    4.08MB/s    0:00:08
+   166952960  84%    4.08MB/s    0:00:07
+   170459136  86%    3.85MB/s    0:00:06
+   174817280  88%    3.87MB/s    0:00:05
+   179011584  90%    3.85MB/s    0:00:04
+   183238656  92%    3.86MB/s    0:00:03
+   187367424  94%    4.01MB/s    0:00:02
+   191561728  96%    3.96MB/s    0:00:01
+   195887104  99%    3.98MB/s    0:00:00
+   197776451 100%    3.62MB/s    0:00:52 (xfer#1, to-check=0/1)
+
+sent 197800745 bytes  received 42 bytes  3697210.97 bytes/sec
+total size is 197776451  speedup is 1.00
+[2014-05-25 19:47:40 CEST] Transferrer: Uploaded 02_nordst..study.mp4
+[2014-05-25 19:47:40 CEST] Pusher: Syncing with diskstation 
+
+WORM-s401429383-m1396397422--Lean UX Workshop%03_assumptions-and-hypotheses.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5472256   1%    5.18MB/s    0:01:14
+remote: merge git-annex      9895936   2%    4.61MB/s    0:01:22
+    14188544   3%    4.41MB/s    0:01:25
+[2014-05-25 19:47:45 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   3b93fc5..02a8a6a  git-annex -> synced/git-annex
+    18808832   4%    4.39MB/s    0:01:25
+    22315008   5%    3.92MB/s    0:01:34
+    26935296   6%    3.98MB/s    0:01:31
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b7c06ab..c1859f2  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 02a8a6a6016fd1f36acc39b27cd9e2f1b24fd394 but expected 3b93fc5ace21818579a161200a925cf8e2120c4d
+ ! 3b93fc5..02a8a6a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    31752192   7%    4.10MB/s    0:01:28
+    36110336   8%    4.04MB/s    0:01:28
+    39616512   9%    4.02MB/s    0:01:27
+    44826624  11%    4.13MB/s    0:01:24
+    47742976  11%    3.71MB/s    0:01:33
+    52854784  13%    3.89MB/s    0:01:27
+    57180160  14%    3.87MB/s    0:01:26
+    62423040  15%    3.92MB/s    0:01:24
+    66617344  16%    4.20MB/s    0:01:17
+    71008256  17%    4.04MB/s    0:01:19
+    75333632  18%    4.30MB/s    0:01:14
+    79659008  19%    4.08MB/s    0:01:17
+    83918848  20%    4.07MB/s    0:01:16
+    88375296  22%    4.07MB/s    0:01:15
+    92700672  23%    4.04MB/s    0:01:14
+    97058816  24%    4.05MB/s    0:01:13
+   101253120  25%    4.06MB/s    0:01:12
+   104759296  26%    3.84MB/s    0:01:15
+   109084672  27%    3.84MB/s    0:01:14
+   112820224  28%    3.70MB/s    0:01:16
+   117473280  29%    3.79MB/s    0:01:13
+   120094720  29%    3.53MB/s    0:01:17
+   125435904  31%    3.79MB/s    0:01:11
+   128483328  32%    3.46MB/s    0:01:17
+   133988352  33%    3.67MB/s    0:01:11
+   137134080  34%    3.68MB/s    0:01:10
+   142639104  35%    3.70MB/s    0:01:08
+   145522688  36%    3.72MB/s    0:01:07
+   150962176  37%    3.69MB/s    0:01:06
+   154435584  38%    3.72MB/s    0:01:04
+   159875072  39%    3.73MB/s    0:01:03
+   163610624  40%    3.76MB/s    0:01:01
+   168755200  42%    3.72MB/s    0:01:01
+   172523520  42%    3.67MB/s    0:01:00
+   177995776  44%    3.66MB/s    0:00:59
+   181960704  45%    3.69MB/s    0:00:58
+   187400192  46%    3.74MB/s    0:00:55
+   191397888  47%    3.79MB/s    0:00:54
+   196739072  49%    3.77MB/s    0:00:53
+   200310784  49%    3.72MB/s    0:00:52
+   205553664  51%    3.69MB/s    0:00:51
+   209780736  52%    4.06MB/s    0:00:46
+   213778432  53%    3.76MB/s    0:00:48
+   217088000  54%    3.72MB/s    0:00:48
+   222560256  55%    3.76MB/s    0:00:46
+   225214464  56%    3.09MB/s    0:00:55
+   227573760  56%    2.76MB/s    0:01:01
+   232816640  57%    3.35MB/s    0:00:49
+   236486656  58%    2.94MB/s    0:00:54
+   241336320  60%    3.77MB/s    0:00:41
+   243826688  60%    3.50MB/s    0:00:44
+   249069568  62%    3.47MB/s    0:00:42
+   253001728  63%    3.18MB/s    0:00:45
+   258146304  64%    3.23MB/s    0:00:43
+   262438912  65%    3.84MB/s    0:00:35
+   263487488  65%    3.00MB/s    0:00:44
+   267943936  66%    3.41MB/s    0:00:38
+   271876096  67%    2.87MB/s    0:00:44
+   277118976  69%    3.07MB/s    0:00:39
+   281542656  70%    3.77MB/s    0:00:31
+   285507584  71%    3.74MB/s    0:00:30
+   290226176  72%    4.25MB/s    0:00:25
+   293371904  73%    3.74MB/s    0:00:28
+   298614784  74%    3.64MB/s    0:00:27
+   304119808  75%    4.00MB/s    0:00:23
+   307527680  76%    3.39MB/s    0:00:27
+   312508416  77%    3.67MB/s    0:00:23
+   317882368  79%    3.97MB/s    0:00:20
+   320372736  79%    3.32MB/s    0:00:23
+   325550080  81%    4.07MB/s    0:00:18
+   329842688  82%    4.06MB/s    0:00:17
+   333217792  83%    3.54MB/s    0:00:18
+   338460672  84%    4.23MB/s    0:00:14
+   342949888  85%    4.06MB/s    0:00:14
+   346062848  86%    3.50MB/s    0:00:15
+   350519296  87%    3.72MB/s    0:00:13
+   355926016  88%    3.75MB/s    0:00:11
+   360185856  89%    3.70MB/s    0:00:10
+   364380160  90%    4.24MB/s    0:00:08
+   368607232  91%    4.26MB/s    0:00:07
+   372015104  92%    3.72MB/s    0:00:07
+   377520128  94%    3.97MB/s    0:00:05
+   381976576  95%    4.03MB/s    0:00:04
+   386236416  96%    4.03MB/s    0:00:03
+   389578752  97%    4.10MB/s    0:00:02
+   394330112  98%    3.97MB/s    0:00:01
+   398589952  99%    3.94MB/s    0:00:00
+   401429383 100%    3.77MB/s    0:01:41 (xfer#1, to-check=0/1)
+
+sent 401478543 bytes  received 42 bytes  3879020.14 bytes/sec
+total size is 401429383  speedup is 1.00
+[2014-05-25 19:49:23 CEST] Transferrer: Uploaded 03_assump..heses.mp4
+[2014-05-25 19:49:23 CEST] Pusher: Syncing with diskstation 
+
+WORM-s341574274-m1396396677--Lean UX Workshop%04_personas.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5013504   1%    3.92MB/s    0:01:23
+    10452992   3%    4.49MB/s    0:01:12
+remote: merge git-annex     14778368   4%    4.38MB/s    0:01:12
+    18382848   5%    4.15MB/s    0:01:16
+[2014-05-25 19:49:29 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   02a8a6a..399d085  git-annex -> synced/git-annex
+    22577152   6%    4.16MB/s    0:01:14
+    26509312   7%    3.60MB/s    0:01:25
+    31293440   9%    3.70MB/s    0:01:21
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c1859f2..5a46cc4  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 399d0856bfb9fef74a18eb9d1d57c0151267323d but expected 02a8a6a6016fd1f36acc39b27cd9e2f1b24fd394
+ ! 02a8a6a..399d085  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    35684352  10%    3.88MB/s    0:01:17
+    40108032  11%    3.92MB/s    0:01:15
+    43352064  12%    3.95MB/s    0:01:13
+    46956544  13%    3.67MB/s    0:01:18
+    51675136  15%    3.55MB/s    0:01:19
+    57180160  16%    3.80MB/s    0:01:13
+    61472768  17%    4.03MB/s    0:01:07
+    65044480  19%    4.00MB/s    0:01:07
+    70057984  20%    4.29MB/s    0:01:01
+    74383360  21%    4.03MB/s    0:01:04
+    78675968  23%    4.03MB/s    0:01:03
+    82739200  24%    4.18MB/s    0:01:00
+    86999040  25%    4.01MB/s    0:01:02
+    90734592  26%    3.76MB/s    0:01:05
+    95977472  28%    3.96MB/s    0:01:00
+   100433920  29%    4.04MB/s    0:00:58
+   104792064  30%    4.04MB/s    0:00:57
+   108986368  31%    4.24MB/s    0:00:53
+   111443968  32%    3.60MB/s    0:01:02
+   116686848  34%    3.74MB/s    0:00:58
+   120487936  35%    3.62MB/s    0:00:59
+   123764736  36%    3.25MB/s    0:01:05
+   128974848  37%    3.88MB/s    0:00:53
+   132415488  38%    3.52MB/s    0:00:58
+   136347648  39%    3.31MB/s    0:01:00
+   141721600  41%    3.92MB/s    0:00:49
+   144998400  42%    3.48MB/s    0:00:55
+   147619840  43%    3.27MB/s    0:00:57
+   152862720  44%    3.81MB/s    0:00:48
+   156008448  45%    3.29MB/s    0:00:55
+   160464896  46%    3.25MB/s    0:00:54
+   165904384  48%    3.88MB/s    0:00:44
+   169246720  49%    3.48MB/s    0:00:48
+   172523520  50%    3.36MB/s    0:00:49
+   178028544  52%    3.92MB/s    0:00:40
+   181600256  53%    3.51MB/s    0:00:44
+   184582144  54%    3.28MB/s    0:00:46
+   188514304  55%    3.60MB/s    0:00:41
+   192970752  56%    3.36MB/s    0:00:43
+   196902912  57%    3.19MB/s    0:00:44
+   202113024  59%    3.81MB/s    0:00:35
+   205684736  60%    3.72MB/s    0:00:35
+   208175104  60%    3.27MB/s    0:00:39
+   213581824  62%    3.87MB/s    0:00:32
+   216825856  63%    3.41MB/s    0:00:35
+   219709440  64%    3.22MB/s    0:00:36
+   225083392  65%    3.91MB/s    0:00:29
+   228622336  66%    3.48MB/s    0:00:31
+   232292352  68%    3.31MB/s    0:00:32
+   237666304  69%    3.89MB/s    0:00:26
+   241139712  70%    3.48MB/s    0:00:28
+   245137408  71%    3.29MB/s    0:00:28
+   250380288  73%    3.49MB/s    0:00:25
+   255361024  74%    3.42MB/s    0:00:24
+   258899968  75%    3.43MB/s    0:00:23
+   262176768  76%    3.38MB/s    0:00:22
+   267452416  78%    3.79MB/s    0:00:19
+   270434304  79%    3.36MB/s    0:00:20
+   274235392  80%    3.24MB/s    0:00:20
+   279478272  81%    3.89MB/s    0:00:15
+   282886144  82%    3.45MB/s    0:00:16
+   286818304  83%    3.38MB/s    0:00:15
+   292061184  85%    3.50MB/s    0:00:13
+   297304064  87%    3.50MB/s    0:00:12
+   300711936  88%    3.49MB/s    0:00:11
+   304152576  89%    3.66MB/s    0:00:09
+   308543488  90%    3.86MB/s    0:00:08
+   312770560  91%    3.60MB/s    0:00:07
+   316178432  92%    3.63MB/s    0:00:06
+   319586304  93%    3.44MB/s    0:00:06
+   325025792  95%    3.66MB/s    0:00:04
+   328466432  96%    3.50MB/s    0:00:03
+   331120640  96%    3.24MB/s    0:00:03
+   336592896  98%    3.87MB/s    0:00:01
+   340000768  99%    3.42MB/s    0:00:00
+   341574274 100%    3.66MB/s    0:01:29 (xfer#1, to-check=0/1)
+
+sent 341616112 bytes  received 42 bytes  3733509.88 bytes/sec
+total size is 341574274  speedup is 1.00
+[2014-05-25 19:50:54 CEST] Transferrer: Uploaded 04_personas.mp4
+[2014-05-25 19:50:54 CEST] Pusher: Syncing with diskstation 
+
+WORM-s112588009-m1396396463--Lean UX Workshop%05_outcomes-and-features.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5537792   4%    5.11MB/s    0:00:20
+     8683520   7%    3.73MB/s    0:00:27
+    14057472  12%    4.16MB/s    0:00:23
+remote: merge git-annex     17334272  15%    3.90MB/s    0:00:23
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 19:51:00 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+    21266432  18%    3.26MB/s    0:00:27
+   399d085..8395b06  git-annex -> synced/git-annex
+    26509312  23%    3.85MB/s    0:00:21
+    29655040  26%    3.34MB/s    0:00:24
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5a46cc4..c29a46c  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 8395b065d53211a1d1da518dafd09a81ba42f11c but expected 399d0856bfb9fef74a18eb9d1d57c0151267323d
+ ! 399d085..8395b06  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    33062912  29%    3.16MB/s    0:00:24
+    38502400  34%    3.76MB/s    0:00:19
+    41910272  37%    3.36MB/s    0:00:20
+    45121536  40%    3.21MB/s    0:00:20
+    50561024  44%    3.88MB/s    0:00:15
+    53772288  47%    3.36MB/s    0:00:17
+    57442304  51%    3.22MB/s    0:00:16
+    62881792  55%    3.88MB/s    0:00:12
+    66093056  58%    3.39MB/s    0:00:13
+    70451200  62%    3.69MB/s    0:00:11
+    72908800  64%    3.15MB/s    0:00:12
+    77627392  68%    2.87MB/s    0:00:11
+    83132416  73%    3.33MB/s    0:00:08
+    84541440  75%    2.75MB/s    0:00:09
+    89423872  79%    3.71MB/s    0:00:06
+    90570752  80%    3.08MB/s    0:00:06
+    95911936  85%    3.02MB/s    0:00:05
+    97550336  86%    3.06MB/s    0:00:04
+   102531072  91%    2.60MB/s    0:00:03
+   107872256  95%    3.43MB/s    0:00:01
+   109871104  97%    2.78MB/s    0:00:00
+   112588009 100%    3.35MB/s    0:00:31 (xfer#1, to-check=0/1)
+
+sent 112601904 bytes  received 42 bytes  3361252.12 bytes/sec
+total size is 112588009  speedup is 1.00
+[2014-05-25 19:51:27 CEST] Transferrer: Uploaded 05_outcom..tures.mp4
+[2014-05-25 19:51:27 CEST] Pusher: Syncing with diskstation 
+
+WORM-s78565449-m1396396837--Lean UX Workshop%06_writing-hypotheses.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5275648   6%    4.94MB/s    0:00:14
+     6848512   8%    3.18MB/s    0:00:22
+remote: merge git-annex     11796480  15%    3.64MB/s    0:00:17
+    13402112  17%    3.12MB/s    0:00:20
+[2014-05-25 19:51:32 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8395b06..bbec44b  git-annex -> synced/git-annex
+    17858560  22%    2.94MB/s    0:00:20
+    19693568  25%    3.01MB/s    0:00:19
+    24412160  31%    2.96MB/s    0:00:17
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c29a46c..d52fe33  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at bbec44b1f18107dc3aaab411ddf2ada1aa273741 but expected 8395b065d53211a1d1da518dafd09a81ba42f11c
+ ! 8395b06..bbec44b  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    27033600  34%    3.00MB/s    0:00:16
+    31490048  40%    2.69MB/s    0:00:17
+    36470784  46%    2.96MB/s    0:00:13
+    41910272  53%    3.09MB/s    0:00:11
+    43286528  55%    2.97MB/s    0:00:11
+    48529408  61%    3.00MB/s    0:00:09
+    53510144  68%    3.06MB/s    0:00:07
+    58753024  74%    2.78MB/s    0:00:06
+    64159744  81%    3.51MB/s    0:00:04
+    67141632  85%    3.23MB/s    0:00:03
+    72548352  92%    3.61MB/s    0:00:01
+    76840960  97%    3.79MB/s    0:00:00
+    78565449 100%    3.17MB/s    0:00:23 (xfer#1, to-check=0/1)
+
+sent 78575188 bytes  received 42 bytes  3081381.57 bytes/sec
+total size is 78565449  speedup is 1.00
+[2014-05-25 19:51:52 CEST] Transferrer: Uploaded 06_writin..heses.mp4
+[2014-05-25 19:51:52 CEST] Pusher: Syncing with diskstation 
+
+WORM-s237023281-m1396397192--Lean UX Workshop%07_design-studio.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3964928   1%    3.16MB/s    0:01:12
+remote: merge git-annex      9207808   3%    3.35MB/s    0:01:06
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 19:51:57 CEST] RemoteControl: Syncing with diskstation 
+    14712832   6%    3.19MB/s    0:01:08
+   bbec44b..423bfb2  git-annex -> synced/git-annex
+    19169280   8%    2.99MB/s    0:01:11
+    23887872  10%    3.20MB/s    0:01:05
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d52fe33..b408181  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 423bfb2586ebc18e8149998862ee1d0060d962ec but expected bbec44b1f18107dc3aaab411ddf2ada1aa273741
+ ! bbec44b..423bfb2  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    26771456  11%    2.98MB/s    0:01:08
+    30965760  13%    2.91MB/s    0:01:09
+    35946496  15%    3.04MB/s    0:01:04
+    40927232  17%    2.76MB/s    0:01:09
+    45187072  19%    3.01MB/s    0:01:02
+    48005120  20%    3.04MB/s    0:01:00
+    50364416  21%    2.73MB/s    0:01:06
+    55607296  23%    2.77MB/s    0:01:03
+    60948480  25%    3.01MB/s    0:00:57
+    62423040  26%    2.75MB/s    0:01:01
+    66355200  27%    2.96MB/s    0:00:56
+    71335936  30%    2.89MB/s    0:00:55
+    76742656  32%    2.90MB/s    0:00:53
+    79200256  33%    3.06MB/s    0:00:50
+    82870272  34%    3.28MB/s    0:00:45
+    86802432  36%    3.60MB/s    0:00:40
+    91521024  38%    3.44MB/s    0:00:41
+    95191040  40%    3.74MB/s    0:00:37
+    97026048  40%    3.23MB/s    0:00:42
+   100171776  42%    2.87MB/s    0:00:46
+   104628224  44%    2.80MB/s    0:00:46
+   109903872  46%    3.14MB/s    0:00:39
+   113541120  47%    3.66MB/s    0:00:32
+   116686848  49%    3.89MB/s    0:00:30
+   121667584  51%    3.68MB/s    0:00:30
+   126386176  53%    3.51MB/s    0:00:30
+   131530752  55%    3.83MB/s    0:00:26
+   135823360  57%    4.07MB/s    0:00:24
+   140214272  59%    4.31MB/s    0:00:21
+   144474112  60%    4.26MB/s    0:00:21
+   148144128  62%    3.82MB/s    0:00:22
+   153124864  64%    3.97MB/s    0:00:20
+   154959872  65%    3.40MB/s    0:00:23
+   160071680  67%    3.59MB/s    0:00:20
+   161513472  68%    3.14MB/s    0:00:23
+   166494208  70%    3.15MB/s    0:00:21
+   169639936  71%    3.11MB/s    0:00:21
+   175046656  73%    3.17MB/s    0:00:19
+   178028544  75%    3.30MB/s    0:00:17
+   183271424  77%    3.33MB/s    0:00:15
+   186941440  78%    3.34MB/s    0:00:14
+   191922176  80%    3.25MB/s    0:00:13
+   195330048  82%    3.22MB/s    0:00:12
+   200835072  84%    3.27MB/s    0:00:10
+   202211328  85%    3.22MB/s    0:00:10
+   207585280  87%    3.31MB/s    0:00:08
+   210534400  88%    3.58MB/s    0:00:07
+   215154688  90%    3.40MB/s    0:00:06
+   215777280  91%    3.21MB/s    0:00:06
+   221020160  93%    3.03MB/s    0:00:05
+   225738752  95%    2.96MB/s    0:00:03
+   230227968  97%    2.94MB/s    0:00:02
+   235175936  99%    3.25MB/s    0:00:00
+   237023281 100%    3.26MB/s    0:01:09 (xfer#1, to-check=0/1)
+
+sent 237052360 bytes  received 42 bytes  3315418.21 bytes/sec
+total size is 237023281  speedup is 1.00
+[2014-05-25 19:53:03 CEST] Transferrer: Uploaded 07_design..tudio.mp4
+[2014-05-25 19:53:04 CEST] Pusher: Syncing with diskstation 
+
+WORM-s113325561-m1396396724--Lean UX Workshop%08_experiments-and-mvp-s.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072   3%    3.88MB/s    0:00:27
+remote: merge git-annex      7897088   6%    3.69MB/s    0:00:27
+[2014-05-25 19:53:08 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   423bfb2..e9861a8  git-annex -> synced/git-annex
+    13139968  11%    4.11MB/s    0:00:23
+    16023552  14%    3.39MB/s    0:00:28
+    21266432  18%    3.62MB/s    0:00:24
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b408181..6b97695  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at e9861a8445e7859f23e90dbc1e6113af547c0515 but expected 423bfb2586ebc18e8149998862ee1d0060d962ec
+ ! 423bfb2..e9861a8  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    23101440  20%    3.22MB/s    0:00:27
+    28082176  24%    3.16MB/s    0:00:26
+    31490048  27%    3.25MB/s    0:00:24
+    35946496  31%    3.09MB/s    0:00:24
+    41189376  36%    3.80MB/s    0:00:18
+    42500096  37%    3.03MB/s    0:00:22
+    47972352  42%    3.88MB/s    0:00:16
+    51675136  45%    3.70MB/s    0:00:16
+    55345152  48%    3.13MB/s    0:00:18
+    60948480  53%    4.11MB/s    0:00:12
+    63209472  55%    3.10MB/s    0:00:15
+    67698688  59%    3.28MB/s    0:00:13
+    72646656  64%    3.26MB/s    0:00:12
+    78315520  69%    3.26MB/s    0:00:10
+    81297408  71%    3.36MB/s    0:00:09
+    86900736  76%    3.55MB/s    0:00:07
+    90472448  79%    3.68MB/s    0:00:06
+    94928896  83%    3.23MB/s    0:00:05
+   100433920  88%    3.87MB/s    0:00:03
+   104628224  92%    3.40MB/s    0:00:02
+   110067712  97%    3.85MB/s    0:00:00
+   113325561 100%    3.52MB/s    0:00:30 (xfer#1, to-check=0/1)
+
+sent 113339548 bytes  received 42 bytes  3487372.00 bytes/sec
+total size is 113325561  speedup is 1.00
+[2014-05-25 19:53:36 CEST] Transferrer: Uploaded 08_experi..mvp-s.mp4
+[2014-05-25 19:53:37 CEST] Pusher: Syncing with diskstation 
+
+WORM-s171315323-m1396397078--Lean UX Workshop%09_research.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      3964928   2%    3.72MB/s    0:00:43
+     9469952   5%    4.48MB/s    0:00:35
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e9861a8..0967b9e  git-annex -> synced/git-annex
+[2014-05-25 19:53:41 CEST] RemoteControl: Syncing with diskstation 
+    12353536   7%    3.86MB/s    0:00:40
+    16252928   9%    3.83MB/s    0:00:39
+    19693568  11%    3.50MB/s    0:00:42
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   6b97695..b05c1b5  git-annex  -> diskstation/git-annex
+    25198592  14%    3.50MB/s    0:00:40
+    29392896  17%    3.78MB/s    0:00:36
+    31227904  18%    3.31MB/s    0:00:41
+    35979264  21%    3.82MB/s    0:00:34
+    38043648  22%    2.87MB/s    0:00:45
+    43548672  25%    3.18MB/s    0:00:39
+    47218688  27%    3.16MB/s    0:00:38
+    52723712  30%    3.26MB/s    0:00:35
+    55607296  32%    3.33MB/s    0:00:33
+    59801600  34%    3.09MB/s    0:00:35
+    65208320  38%    3.87MB/s    0:00:26
+    66879488  39%    3.10MB/s    0:00:32
+    72122368  42%    3.87MB/s    0:00:25
+    75530240  44%    3.32MB/s    0:00:28
+    80510976  46%    3.20MB/s    0:00:27
+    84180992  49%    3.32MB/s    0:00:25
+    89686016  52%    3.39MB/s    0:00:23
+    93880320  54%    3.59MB/s    0:00:21
+    99483648  58%    3.74MB/s    0:00:18
+   103317504  60%    3.83MB/s    0:00:17
+   108822528  63%    3.85MB/s    0:00:15
+   112754688  65%    3.82MB/s    0:00:14
+   118292480  69%    3.81MB/s    0:00:13
+   121405440  70%    3.93MB/s    0:00:12
+   126124032  73%    3.76MB/s    0:00:11
+   128745472  75%    3.68MB/s    0:00:11
+   133988352  78%    3.59MB/s    0:00:10
+   138182656  80%    3.53MB/s    0:00:09
+   143687680  83%    3.66MB/s    0:00:07
+   146833408  85%    3.70MB/s    0:00:06
+   152338432  88%    3.77MB/s    0:00:04
+   155484160  90%    3.70MB/s    0:00:04
+   160989184  93%    3.65MB/s    0:00:02
+   164397056  95%    3.71MB/s    0:00:01
+   169639936  99%    3.67MB/s    0:00:00
+   171315323 100%    3.60MB/s    0:00:45 (xfer#1, to-check=0/1)
+
+sent 171336377 bytes  received 42 bytes  3607082.51 bytes/sec
+total size is 171315323  speedup is 1.00
+[2014-05-25 19:54:24 CEST] Transferrer: Uploaded 09_research.mp4
+[2014-05-25 19:54:24 CEST] Pusher: Syncing with diskstation 
+
+WORM-s254857031-m1396396965--Lean UX Workshop%10_combining-lean-and-agile.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5275648   2%    4.91MB/s    0:00:49
+    10027008   3%    4.72MB/s    0:00:50
+remote: merge git-annex     13139968   5%    3.93MB/s    0:01:00
+    18710528   7%    4.26MB/s    0:00:54
+[2014-05-25 19:54:30 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+    22052864   8%    3.51MB/s    0:01:04
+   0967b9e..8e9de0b  git-annex -> synced/git-annex
+    27033600  10%    3.53MB/s    0:01:02
+    30441472  11%    3.72MB/s    0:00:58
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b05c1b5..9285684  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 8e9de0bb0562a8c9e6a72dcff4ad92f93403ad43 but expected 0967b9e587fc2d85662e7b0c1d047ea77bd1e540
+ ! 0967b9e..8e9de0b  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    35815424  14%    3.66MB/s    0:00:58
+    39092224  15%    3.99MB/s    0:00:52
+    43286528  16%    3.83MB/s    0:00:54
+    45645824  17%    3.39MB/s    0:01:00
+    50888704  19%    3.34MB/s    0:00:59
+    54034432  21%    3.04MB/s    0:01:04
+    57966592  22%    3.00MB/s    0:01:04
+    63373312  24%    3.79MB/s    0:00:49
+    64520192  25%    2.95MB/s    0:01:02
+    67403776  26%    3.06MB/s    0:00:59
+    72908800  28%    3.40MB/s    0:00:52
+    76840960  30%    3.06MB/s    0:00:56
+    79986688  31%    3.51MB/s    0:00:48
+    85196800  33%    4.18MB/s    0:00:39
+    87326720  34%    3.20MB/s    0:00:51
+    92831744  36%    3.55MB/s    0:00:44
+    95977472  37%    3.15MB/s    0:00:49
+   100696064  39%    2.97MB/s    0:00:50
+   105676800  41%    3.27MB/s    0:00:44
+   110395392  43%    3.13MB/s    0:00:45
+   115376128  45%    3.84MB/s    0:00:35
+   116686848  45%    3.27MB/s    0:00:41
+   121667584  47%    3.72MB/s    0:00:34
+   125861888  49%    3.56MB/s    0:00:35
+   129007616  50%    2.92MB/s    0:00:42
+   134250496  52%    3.74MB/s    0:00:31
+   137396224  53%    3.01MB/s    0:00:38
+   142835712  56%    3.30MB/s    0:00:33
+   146571264  57%    3.21MB/s    0:00:32
+   150765568  59%    3.02MB/s    0:00:33
+   156270592  61%    3.80MB/s    0:00:25
+   158072832  62%    3.08MB/s    0:00:30
+   163282944  64%    3.87MB/s    0:00:23
+   165445632  64%    2.81MB/s    0:00:31
+   169279488  66%    2.52MB/s    0:00:33
+   173572096  68%    2.96MB/s    0:00:26
+   177242112  69%    2.28MB/s    0:00:33
+   179601408  70%    2.36MB/s    0:00:31
+   183959552  72%    2.44MB/s    0:00:28
+   187203584  73%    2.27MB/s    0:00:29
+   191135744  74%    2.68MB/s    0:00:23
+   196640768  77%    3.84MB/s    0:00:14
+   197427200  77%    2.79MB/s    0:00:20
+   200310784  78%    2.76MB/s    0:00:19
+   205815808  80%    3.13MB/s    0:00:15
+   207650816  81%    2.33MB/s    0:00:19
+   213123072  83%    3.64MB/s    0:00:11
+   217579520  85%    3.99MB/s    0:00:09
+   219185152  86%    3.08MB/s    0:00:11
+   222068736  87%    3.17MB/s    0:00:10
+   227508224  89%    3.15MB/s    0:00:08
+   230457344  90%    2.83MB/s    0:00:08
+   234389504  91%    3.27MB/s    0:00:06
+   238583808  93%    3.81MB/s    0:00:04
+   243204096  95%    3.63MB/s    0:00:03
+   247496704  97%    3.94MB/s    0:00:01
+   249593856  97%    3.61MB/s    0:00:01
+   254312448  99%    3.71MB/s    0:00:00
+   254857031 100%    3.29MB/s    0:01:13 (xfer#1, to-check=0/1)
+
+sent 254888297 bytes  received 42 bytes  3376004.49 bytes/sec
+total size is 254857031  speedup is 1.00
+[2014-05-25 19:55:40 CEST] Transferrer: Uploaded 10_combin..agile.mp4
+[2014-05-25 19:55:40 CEST] Pusher: Syncing with diskstation 
+
+WORM-s67182998-m1396396768--Lean UX Workshop%11_tools-and-techniques.mp4
+       32768   0%    0.00kB/s    0:00:00
+     2392064   3%    2.20MB/s    0:00:28
+remote: merge git-annex      7897088  11%    3.69MB/s    0:00:15
+    12353536  18%    3.75MB/s    0:00:14
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8e9de0b..10f88fb  git-annex -> synced/git-annex
+[2014-05-25 19:55:45 CEST] RemoteControl: Syncing with diskstation 
+    13664256  20%    3.12MB/s    0:00:16
+    18644992  27%    3.71MB/s    0:00:12
+    20217856  30%    2.79MB/s    0:00:16
+    24510464  36%    2.82MB/s    0:00:14
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9285684..b2bad3b  git-annex  -> diskstation/git-annex
+    27557888  41%    3.04MB/s    0:00:12
+    32931840  49%    3.15MB/s    0:00:10
+    34373632  51%    3.09MB/s    0:00:10
+    38830080  57%    3.12MB/s    0:00:08
+    44072960  65%    3.80MB/s    0:00:05
+    45907968  68%    2.96MB/s    0:00:07
+    50626560  75%    3.81MB/s    0:00:04
+    53248000  79%    3.15MB/s    0:00:04
+    57442304  85%    2.95MB/s    0:00:03
+    62717952  93%    3.72MB/s    0:00:01
+    64520192  96%    3.07MB/s    0:00:00
+    67182998 100%    3.28MB/s    0:00:19 (xfer#1, to-check=0/1)
+
+sent 67191351 bytes  received 42 bytes  3125181.07 bytes/sec
+total size is 67182998  speedup is 1.00
+[2014-05-25 19:56:01 CEST] Transferrer: Uploaded 11_tools-..iques.mp4
+[2014-05-25 19:56:01 CEST] Pusher: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   10f88fb..aa5471b  git-annex -> synced/git-annex
+[2014-05-25 19:56:06 CEST] RemoteControl: Syncing with diskstation 
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b2bad3b..34ef046  git-annex  -> diskstation/git-annex
+[2014-05-25 20:16:23 CEST] NetWatcherFallback: Syncing with diskstation 
+remote: merge git-annex ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   aa5471b..34ef046  git-annex -> synced/git-annex
+[2014-05-25 21:01:01 CEST] main: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   34ef046..2f32e55  git-annex -> synced/git-annex
+
+WORM-s14123840-m1398381779--Learning Corel Painter X3%01_a-quick-tour-of-painter.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5799936  41%    5.46MB/s    0:00:01
+     9994240  70%    4.70MB/s    0:00:00
+    14123840 100%    4.71MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 14125729 bytes  received 42 bytes  4035934.57 bytes/sec
+total size is 14123840  speedup is 1.00
+[2014-05-25 21:01:34 CEST] Transferrer: Uploaded 01_a-quic..inter.mp4
+[2014-05-25 21:01:34 CEST] Pusher: Syncing with diskstation 
+
+WORM-s23356431-m1398381923--Learning Corel Painter X3%02_brushes-and-custom-palettes.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5275648  22%    4.47MB/s    0:00:03
+    10715136  45%    4.81MB/s    0:00:02
+    15237120  65%    4.65MB/s    0:00:01
+    19955712  85%    4.60MB/s    0:00:00
+remote: merge git-annex     23356431 100%    4.51MB/s    0:00:04 (xfer#1, to-check=0/1)
+[2014-05-25 21:01:40 CEST] RemoteControl: Syncing with diskstation 
+
+sent 23359448 bytes  received 42 bytes  4247180.00 bytes/sec
+total size is 23356431  speedup is 1.00
+[2014-05-25 21:01:40 CEST] Transferrer: Uploaded 02_brushe..ettes.mp4
+
+WORM-s16835823-m1398381229--Learning Corel Painter X3%03_managing-layers.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2f32e55..f2e1569  git-annex -> synced/git-annex
+     6094848  36%    5.76MB/s    0:00:01
+    11010048  65%    5.22MB/s    0:00:01
+    15761408  93%    4.99MB/s    0:00:00
+    16835823 100%    4.96MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 16838032 bytes  received 42 bytes  3741794.22 bytes/sec
+total size is 16835823  speedup is 1.00
+[2014-05-25 21:01:45 CEST] Transferrer: Uploaded 03_managi..ayers.mp4
+
+WORM-s26947174-m1398380993--Learning Corel Painter X3%04_project-red-chairs.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:01:46 CEST] Pusher: Syncing with diskstation 
+     5799936  21%    5.47MB/s    0:00:03
+     8421376  31%    3.79MB/s    0:00:04
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   34ef046..28ecf68  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at f2e15690121bf48eba8288426bf72c0661ea444a but expected 2f32e55b5e8bd953707452ada9ad57fbeb20b7b1
+ ! 2f32e55..f2e1569  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:01:48 CEST] RemoteControl: Syncing with diskstation 
+    13139968  48%    3.94MB/s    0:00:03
+    17956864  66%    4.10MB/s    0:00:02
+    22577152  83%    3.83MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   28ecf68..644a4ea  git-annex  -> diskstation/git-annex
+    25460736  94%    3.94MB/s    0:00:00
+    26947174 100%    3.97MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 26950622 bytes  received 42 bytes  3593421.87 bytes/sec
+total size is 26947174  speedup is 1.00
+remote: merge git-annex [2014-05-25 21:01:52 CEST] Transferrer: Uploaded 04_projec..hairs.mp4
+
+WORM-s14550387-m1398382074--Learning Corel Painter X3%05_the-toolbox-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:01:53 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f2e1569..7bf9116  git-annex -> synced/git-annex
+     5668864  38%    5.09MB/s    0:00:01
+    10289152  70%    4.74MB/s    0:00:00
+    14550387 100%    4.56MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 14552323 bytes  received 42 bytes  3233858.89 bytes/sec
+total size is 14550387  speedup is 1.00
+[2014-05-25 21:01:57 CEST] Transferrer: Uploaded 05_the-to..art-1.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   644a4ea..f3817af  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7bf9116bbeb90b398ac29d7b38e78dbe493f081f but expected f2e15690121bf48eba8288426bf72c0661ea444a
+ ! f2e1569..7bf9116  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s5537051-m1398381582--Learning Corel Painter X3%06_the-toolbox-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  76%    4.00MB/s    0:00:00
+[2014-05-25 21:01:58 CEST] Pusher: Syncing with diskstation 
+     5537051 100%    4.47MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 5537882 bytes  received 42 bytes  3691949.33 bytes/sec
+total size is 5537051  speedup is 1.00
+[2014-05-25 21:02:00 CEST] Transferrer: Uploaded 06_the-to..art-2.mp4
+
+WORM-s16270822-m1398381489--Learning Corel Painter X3%07_color-panels.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4882432  30%    4.62MB/s    0:00:02
+remote: merge git-annex      7634944  46%    3.29MB/s    0:00:02
+[2014-05-25 21:02:03 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7bf9116..a826827  git-annex -> synced/git-annex
+     9994240  61%    2.94MB/s    0:00:02
+    13369344  82%    3.01MB/s    0:00:00
+    15761408  96%    2.44MB/s    0:00:00
+    16270822 100%    2.91MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 16272960 bytes  received 42 bytes  2503538.77 bytes/sec
+total size is 16270822  speedup is 1.00
+[2014-05-25 21:02:06 CEST] Transferrer: Uploaded 07_color-panels.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f3817af..bff569c  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at a8268279606cf4fdee4e0fabeef0c9075d840f71 but expected 7bf9116bbeb90b398ac29d7b38e78dbe493f081f
+ ! 7bf9116..a826827  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s21555439-m1398381255--Learning Corel Painter X3%08_paper-and-media-libraries.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5111808  23%    4.81MB/s    0:00:03
+[2014-05-25 21:02:08 CEST] Pusher: Syncing with diskstation 
+     9175040  42%    4.29MB/s    0:00:02
+    13369344  62%    4.18MB/s    0:00:01
+    17563648  81%    4.10MB/s    0:00:00
+    21555439 100%    4.05MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 21558234 bytes  received 42 bytes  3316657.85 bytes/sec
+total size is 21555439  speedup is 1.00
+[2014-05-25 21:02:12 CEST] Transferrer: Uploaded 08_paper-..aries.mp4
+remote: merge git-annex 
+WORM-s24881920-m1398382026--Learning Corel Painter X3%09_menu-commands-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5210112  20%    4.80MB/s    0:00:03
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 21:02:14 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a826827..e65041f  git-annex -> synced/git-annex
+     9142272  36%    4.28MB/s    0:00:03
+    13041664  52%    4.08MB/s    0:00:02
+    17235968  69%    4.03MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   bff569c..b552f10  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at e65041fc45b14af68426581456deb8d3e9efa1d9 but expected a8268279606cf4fdee4e0fabeef0c9075d840f71
+ ! a826827..e65041f  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    21397504  85%    3.81MB/s    0:00:00
+    24881920 100%    4.05MB/s    0:00:05 (xfer#1, to-check=0/1)
+[2014-05-25 21:02:19 CEST] Pusher: Syncing with diskstation 
+
+sent 24885118 bytes  received 42 bytes  3318021.33 bytes/sec
+total size is 24881920  speedup is 1.00
+[2014-05-25 21:02:20 CEST] Transferrer: Uploaded 09_menu-c..art-1.mp4
+
+WORM-s29078392-m1398382059--Learning Corel Painter X3%10_menu-commands-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5210112  17%    4.81MB/s    0:00:04
+     9437184  32%    4.41MB/s    0:00:04
+[2014-05-25 21:02:24 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e65041f..530d23c  git-annex -> synced/git-annex
+    13762560  47%    4.30MB/s    0:00:03
+    17924096  61%    4.20MB/s    0:00:02
+    22970368  78%    4.16MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b552f10..4dc60d5  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 530d23cf75a7f936041cdb408fd4f3516fe1514b but expected e65041fc45b14af68426581456deb8d3e9efa1d9
+ ! e65041f..530d23c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    27688960  95%    4.26MB/s    0:00:00
+    29078392 100%    4.33MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 29082102 bytes  received 42 bytes  3421428.71 bytes/sec
+total size is 29078392  speedup is 1.00
+[2014-05-25 21:02:29 CEST] Transferrer: Uploaded 10_menu-c..art-2.mp4
+
+WORM-s18704564-m1398381759--Learning Corel Painter X3%11_cloner-brushes.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:02:29 CEST] Pusher: Syncing with diskstation 
+     5996544  32%    5.68MB/s    0:00:02
+    10321920  55%    4.86MB/s    0:00:01
+    14581760  77%    4.55MB/s    0:00:00
+    18704564 100%    4.39MB/s    0:00:00
+    18704564 100%    4.39MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 18707000 bytes  received 42 bytes  4157120.44 bytes/sec
+total size is 18704564  speedup is 1.00
+[2014-05-25 21:02:33 CEST] Transferrer: Uploaded 11_cloner..ushes.mp4
+
+WORM-s16483665-m1398381099--Learning Corel Painter X3%12_project-clone-painting-a-pear.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      3964928  24%    3.69MB/s    0:00:03
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 21:02:36 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   530d23c..821b643  git-annex -> synced/git-annex
+     8683520  52%    3.90MB/s    0:00:01
+    12877824  78%    3.90MB/s    0:00:00
+    16483665 100%    4.01MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 16485848 bytes  received 42 bytes  2997434.55 bytes/sec
+total size is 16483665  speedup is 1.00
+[2014-05-25 21:02:38 CEST] Transferrer: Uploaded 12_projec..-pear.mp4
+
+WORM-s13729745-m1398381011--Learning Corel Painter X3%13_dab-stroke-and-method.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   4dc60d5..b35b714  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 821b643cf14025648cceac17c2de27e1a17840e3 but expected 530d23cf75a7f936041cdb408fd4f3516fe1514b
+ ! 530d23c..821b643  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     5013504  36%    4.35MB/s    0:00:01
+[2014-05-25 21:02:41 CEST] Pusher: Syncing with diskstation 
+     9469952  68%    4.23MB/s    0:00:00
+    13402112  97%    4.06MB/s    0:00:00
+    13729745 100%    3.98MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 13731580 bytes  received 42 bytes  3923320.57 bytes/sec
+total size is 13729745  speedup is 1.00
+[2014-05-25 21:02:43 CEST] Transferrer: Uploaded 13_dab-st..ethod.mp4
+
+WORM-s15796088-m1398381069--Learning Corel Painter X3%14_advanced-controls.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5013504  31%    4.63MB/s    0:00:02
+     9207808  58%    4.25MB/s    0:00:01
+    13664256  86%    4.21MB/s    0:00:00
+    15796088 100%    4.21MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 15798175 bytes  received 42 bytes  3510714.89 bytes/sec
+total size is 15796088  speedup is 1.00
+[2014-05-25 21:02:47 CEST] Transferrer: Uploaded 14_advanc..trols.mp4
+
+WORM-s14529732-m1398382119--Learning Corel Painter X3%15_custom-variants.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5996544  41%    5.49MB/s    0:00:01
+remote: merge git-annex     10551296  72%    4.90MB/s    0:00:00
+    14529732 100%    4.82MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 14531661 bytes  received 42 bytes  2235646.62 bytes/sec
+total size is 14529732  speedup is 1.00
+[2014-05-25 21:02:54 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:02:54 CEST] Transferrer: Uploaded 15_custom..iants.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   821b643..d1a88a1  git-annex -> synced/git-annex
+
+WORM-s20256713-m1398381124--Learning Corel Painter X3%16_abstract-painting.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5242880  25%    4.82MB/s    0:00:03
+     9437184  46%    4.38MB/s    0:00:02
+    13729792  67%    4.28MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b35b714..5d9e777  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at d1a88a1d1fb37d139753d3b96cbd570810a61a51 but expected 821b643cf14025648cceac17c2de27e1a17840e3
+ ! 821b643..d1a88a1  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    17924096  88%    4.19MB/s    0:00:00
+    20256713 100%    4.15MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 20259344 bytes  received 42 bytes  3116828.62 bytes/sec
+total size is 20256713  speedup is 1.00
+[2014-05-25 21:03:00 CEST] Transferrer: Uploaded 16_abstra..nting.mp4
+
+WORM-s15821561-m1398381954--Learning Corel Painter X3%17_tonal-controls.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:03:01 CEST] Pusher: Syncing with diskstation 
+     3964928  25%    3.50MB/s    0:00:03
+     6848512  43%    3.13MB/s    0:00:02
+    11829248  74%    3.62MB/s    0:00:01
+    15821561 100%    3.70MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 15823645 bytes  received 42 bytes  2877034.00 bytes/sec
+total size is 15821561  speedup is 1.00
+[2014-05-25 21:03:05 CEST] Transferrer: Uploaded 17_tonal-..trols.mp4
+remote: merge git-annex 
+WORM-s27686314-m1398381815--Learning Corel Painter X3%18_surface-controls.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5210112  18%    4.91MB/s    0:00:04
+[2014-05-25 21:03:08 CEST] RemoteControl: Syncing with diskstation 
+     9142272  33%    4.29MB/s    0:00:04
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d1a88a1..2f6a023  git-annex -> synced/git-annex
+    12943360  46%    4.06MB/s    0:00:03
+    17104896  61%    4.01MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5d9e777..5732a07  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 2f6a0230e37a27a287290d40a66a61284abd958e but expected d1a88a1d1fb37d139753d3b96cbd570810a61a51
+ ! d1a88a1..2f6a023  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    21266432  76%    3.76MB/s    0:00:01
+    25591808  92%    3.85MB/s    0:00:00
+[2014-05-25 21:06:06 CEST] Pusher: Syncing with diskstation 
+    26640384  96%   73.39kB/s    0:00:14
+    27686314 100%  145.74kB/s    0:03:05 (xfer#1, to-check=0/1)
+
+sent 27689848 bytes  received 42 bytes  148471.26 bytes/sec
+total size is 27686314  speedup is 1.00
+[2014-05-25 21:06:11 CEST] Transferrer: Uploaded 18_surfac..trols.mp4
+remote: merge git-annex 
+WORM-s20041059-m1398382199--Learning Corel Painter X3%19_esoterica.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:06:13 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+     5013504  25%    4.74MB/s    0:00:03
+   2f6a023..3de6568  git-annex -> synced/git-annex
+     8421376  42%    3.99MB/s    0:00:02
+    12681216  63%    4.01MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5732a07..22c09fa  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 3de6568fc3634c50a42c935f315c763106a22e3c but expected 2f6a0230e37a27a287290d40a66a61284abd958e
+ ! 2f6a023..3de6568  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    17596416  87%    4.18MB/s    0:00:00
+    20041059 100%    4.24MB/s    0:00:04 (xfer#1, to-check=0/1)
+[2014-05-25 21:06:17 CEST] Pusher: Syncing with diskstation 
+
+sent 20043654 bytes  received 42 bytes  3083645.54 bytes/sec
+total size is 20041059  speedup is 1.00
+[2014-05-25 21:06:18 CEST] Transferrer: Uploaded 19_esoterica.mp4
+
+WORM-s20049901-m1398382237--Learning Corel Painter X3%20_esoterica-mosaic.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  21%    3.93MB/s    0:00:03
+remote: merge git-annex      7372800  36%    3.43MB/s    0:00:03
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 21:06:22 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   3de6568..91bf58d  git-annex -> synced/git-annex
+    11042816  55%    3.45MB/s    0:00:02
+    14712832  73%    3.45MB/s    0:00:01
+    17858560  89%    3.20MB/s    0:00:00
+    20049901 100%    3.44MB/s    0:00:05 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   22c09fa..f2cac44  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 91bf58d7240d46f8eee363bd3b56dde6deefc012 but expected 3de6568fc3634c50a42c935f315c763106a22e3c
+ ! 3de6568..91bf58d  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 20052503 bytes  received 42 bytes  2673672.67 bytes/sec
+total size is 20049901  speedup is 1.00
+[2014-05-25 21:06:25 CEST] Transferrer: Uploaded 20_esoter..osaic.mp4
+
+WORM-s18181651-m1398381889--Learning Corel Painter X3%21_selection-tools-and-commands.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:06:26 CEST] Pusher: Syncing with diskstation 
+     4751360  26%    4.38MB/s    0:00:02
+     8421376  46%    3.89MB/s    0:00:02
+    12091392  66%    3.71MB/s    0:00:01
+    15761408  86%    3.64MB/s    0:00:00
+    18181651 100%    3.65MB/s    0:00:04 (xfer#1, to-check=0/1)
+remote: merge git-annex 
+sent 18184037 bytes  received 42 bytes  2797550.62 bytes/sec
+total size is 18181651  speedup is 1.00
+[2014-05-25 21:06:31 CEST] Transferrer: Uploaded 21_select..mands.mp4
+
+WORM-s16431574-m1398381365--Learning Corel Painter X3%22_text-properties.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5013504  30%    4.71MB/s    0:00:02
+[2014-05-25 21:06:32 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   91bf58d..9341c6c  git-annex -> synced/git-annex
+     8355840  50%    3.82MB/s    0:00:02
+    11763712  71%    3.60MB/s    0:00:01
+    15466496  94%    3.57MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f2cac44..70eb4e9  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 9341c6cf9e5fe11181099779b7248a9debecaa26 but expected 91bf58d7240d46f8eee363bd3b56dde6deefc012
+ ! 91bf58d..9341c6c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    16431574 100%    3.62MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 16433735 bytes  received 42 bytes  2987959.45 bytes/sec
+total size is 16431574  speedup is 1.00
+[2014-05-25 21:06:36 CEST] Transferrer: Uploaded 22_text-p..rties.mp4
+
+WORM-s17364419-m1398381850--Learning Corel Painter X3%23_text-effects.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:06:37 CEST] Pusher: Syncing with diskstation 
+     5046272  29%    4.76MB/s    0:00:02
+     8421376  48%    3.97MB/s    0:00:02
+    12255232  70%    3.87MB/s    0:00:01
+    16023552  92%    3.79MB/s    0:00:00
+remote: merge git-annex     17364419 100%    3.71MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 17366689 bytes  received 42 bytes  3157587.45 bytes/sec
+total size is 17364419  speedup is 1.00
+[2014-05-25 21:06:42 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:06:42 CEST] Transferrer: Uploaded 23_text-effects.mp4
+
+WORM-s19708183-m1398382290--Learning Corel Painter X3%24_postcard-graphic-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9341c6c..08cb8d8  git-annex -> synced/git-annex
+     4489216  22%    3.60MB/s    0:00:04
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   70eb4e9..dce2d61  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 08cb8d8ba4b56c67984027263d5213133dcdaad2 but expected 9341c6cf9e5fe11181099779b7248a9debecaa26
+ ! 9341c6c..08cb8d8  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:06:44 CEST] RemoteControl: Syncing with diskstation 
+     9469952  48%    4.08MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   dce2d61..ac9201d  git-annex  -> diskstation/git-annex
+    13664256  69%    3.97MB/s    0:00:01
+    17301504  87%    3.86MB/s    0:00:00
+[2014-05-25 21:06:47 CEST] Pusher: Syncing with diskstation 
+    19708183 100%    3.96MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 19710752 bytes  received 42 bytes  3032429.85 bytes/sec
+total size is 19708183  speedup is 1.00
+[2014-05-25 21:06:48 CEST] Transferrer: Uploaded 24_postca..art-1.mp4
+
+WORM-s21565207-m1398381554--Learning Corel Painter X3%25_postcard-graphic-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5439488  25%    5.07MB/s    0:00:03
+remote: merge git-annex      9306112  43%    4.32MB/s    0:00:02
+[2014-05-25 21:06:51 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   08cb8d8..1212159  git-annex -> synced/git-annex
+    13107200  60%    4.05MB/s    0:00:02
+    16449536  76%    3.84MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ac9201d..a885109  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 12121595714360b6216de28d0beef79305ec276d but expected 08cb8d8ba4b56c67984027263d5213133dcdaad2
+ ! 08cb8d8..1212159  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    20250624  93%    3.46MB/s    0:00:00
+    21565207 100%    3.75MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 21568004 bytes  received 42 bytes  2875739.47 bytes/sec
+total size is 21565207  speedup is 1.00
+[2014-05-25 21:06:55 CEST] Transferrer: Uploaded 25_postca..art-2.mp4
+
+WORM-s20239101-m1398380964--Learning Corel Painter X3%26_dynamic-layers.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:06:56 CEST] Pusher: Syncing with diskstation 
+     5275648  26%    4.78MB/s    0:00:03
+     9404416  46%    4.35MB/s    0:00:02
+    12943360  63%    4.03MB/s    0:00:01
+    16384000  80%    3.85MB/s    0:00:00
+remote: merge git-annex     20152320  99%    3.52MB/s    0:00:00
+    20239101 100%    3.77MB/s    0:00:05 (xfer#1, to-check=0/1)
+[2014-05-25 21:07:01 CEST] RemoteControl: Syncing with diskstation 
+
+sent 20241725 bytes  received 42 bytes  3114118.00 bytes/sec
+total size is 20239101  speedup is 1.00
+[2014-05-25 21:07:02 CEST] Transferrer: Uploaded 26_dynami..ayers.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   1212159..4c20688  git-annex -> synced/git-annex
+
+WORM-s17613999-m1398382264--Learning Corel Painter X3%27_auto-painting.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5275648  29%    4.78MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a885109..ac9fbda  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 4c206880fc1f99dd380b0fb28ebb780b72171633 but expected 12121595714360b6216de28d0beef79305ec276d
+ ! 1212159..4c20688  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     9175040  52%    4.26MB/s    0:00:01
+    12845056  72%    4.00MB/s    0:00:01
+    16384000  93%    3.82MB/s    0:00:00
+[2014-05-25 21:07:07 CEST] Pusher: Syncing with diskstation 
+    17613999 100%    3.79MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 17616302 bytes  received 42 bytes  3202971.64 bytes/sec
+total size is 17613999  speedup is 1.00
+[2014-05-25 21:07:08 CEST] Transferrer: Uploaded 27_auto-p..nting.mp4
+
+WORM-s15562581-m1398381274--Learning Corel Painter X3%28_smart-stroke-cloning.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5275648  33%    4.77MB/s    0:00:02
+     9469952  60%    4.34MB/s    0:00:01
+[2014-05-25 21:07:11 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   4c20688..f7be7ec  git-annex -> synced/git-annex
+    13139968  84%    4.06MB/s    0:00:00
+    15562581 100%    3.89MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 15564639 bytes  received 42 bytes  3458818.00 bytes/sec
+total size is 15562581  speedup is 1.00
+[2014-05-25 21:07:13 CEST] Transferrer: Uploaded 28_smart-..oning.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ac9fbda..4f23f91  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at f7be7ececec0dd7a424dfc71571fc2a6cfc63bea but expected 4c206880fc1f99dd380b0fb28ebb780b72171633
+ ! 4c20688..f7be7ec  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s28205928-m1398382150--Learning Corel Painter X3%29_mirror-and-kaleidoscope.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5537792  19%    4.94MB/s    0:00:04
+[2014-05-25 21:07:15 CEST] Pusher: Syncing with diskstation 
+     9994240  35%    4.54MB/s    0:00:03
+    14155776  50%    4.34MB/s    0:00:03
+    17956864  63%    4.16MB/s    0:00:02
+    21725184  77%    3.79MB/s    0:00:01
+remote: merge git-annex     25198592  89%    3.58MB/s    0:00:00
+    28205928 100%    3.85MB/s    0:00:06 (xfer#1, to-check=0/1)
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 21:07:21 CEST] RemoteControl: Syncing with diskstation 
+
+sent 28209533 bytes  received 42 bytes  3761276.67 bytes/sec
+total size is 28205928  speedup is 1.00
+   f7be7ec..5c452a1  git-annex -> synced/git-annex
+[2014-05-25 21:07:21 CEST] Transferrer: Uploaded 29_mirror..scope.mp4
+
+WORM-s21976288-m1398382005--Learning Corel Painter X3%30_introduction-to-mixed-media.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5406720  24%    5.07MB/s    0:00:03
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   4f23f91..1ca4624  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 5c452a15506c41b30a4ff7099c02f5dae74db8db but expected f7be7ececec0dd7a424dfc71571fc2a6cfc63bea
+ ! f7be7ec..5c452a1  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:22:27 CEST] Pusher: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5c452a1..de02d45  git-annex -> synced/git-annex
+     8486912  38%    9.03kB/s    0:24:53
+[2014-05-25 21:22:35 CEST] RemoteControl: Syncing with diskstation 
+    12353536  56%   13.15kB/s    0:12:11
+    15761408  71%   16.76kB/s    0:06:10
+    18644992  84%   14.11kB/s    0:03:56
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   1ca4624..0fddca6  git-annex  -> diskstation/git-annex
+    21921792  99%    3.02MB/s    0:00:00
+    21976288 100%   23.34kB/s    0:15:18 (xfer#1, to-check=0/1)
+
+sent 21979137 bytes  received 42 bytes  23903.40 bytes/sec
+total size is 21976288  speedup is 1.00
+[2014-05-25 21:22:40 CEST] Transferrer: Uploaded 30_introd..media.mp4
+[2014-05-25 21:22:40 CEST] Pusher: Syncing with diskstation 
+
+WORM-s20759393-m1398382174--Learning Corel Painter X3%31_portrait-of-stephen.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4194304  20%    3.79MB/s    0:00:04
+     6815744  32%    3.15MB/s    0:00:04
+remote: merge git-annex      9306112  44%    2.89MB/s    0:00:03
+    12320768  59%    2.87MB/s    0:00:02
+[2014-05-25 21:22:45 CEST] RemoteControl: Syncing with diskstation 
+/Applications/git-annex.app/Contents/MacOS/git-annex: fork: Resource temporarily unavailable
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   de02d45..251064b  git-annex -> synced/git-annex
+    15073280  72%    2.55MB/s    0:00:02
+    17563648  84%    2.52MB/s    0:00:01
+    20316160  97%    2.56MB/s    0:00:00
+    20759393 100%    2.71MB/s    0:00:07 (xfer#1, to-check=0/1)
+
+sent 20762086 bytes  received 42 bytes  2185487.16 bytes/sec
+total size is 20759393  speedup is 1.00
+[2014-05-25 21:22:49 CEST] Transferrer: Uploaded 31_portra..ephen.mp4
+
+WORM-s25441460-m1398381650--Learning Corel Painter X3%32_cel-animation.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:22:50 CEST] Pusher: Syncing with diskstation 
+Pusher crashed: git: createProcess: resource exhausted (Resource temporarily unavailable)
+[2014-05-25 21:22:50 CEST] Pusher: warning Pusher crashed: git: createProcess: resource exhausted (Resource temporarily unavailable)
+     4096000  16%    3.83MB/s    0:00:05
+     6979584  27%    3.27MB/s    0:00:05
+     9469952  37%    2.97MB/s    0:00:05
+    12091392  47%    2.78MB/s    0:00:04
+    13664256  53%    2.19MB/s    0:00:05
+    16023552  62%    2.04MB/s    0:00:04
+    18644992  73%    2.07MB/s    0:00:03
+    21266432  83%    2.10MB/s    0:00:01
+    23625728  92%    2.25MB/s    0:00:00
+    25441460 100%    2.36MB/s    0:00:10 (xfer#1, to-check=0/1)
+
+sent 25444719 bytes  received 42 bytes  2212587.91 bytes/sec
+total size is 25441460  speedup is 1.00
+[2014-05-25 21:23:00 CEST] Transferrer: Uploaded 32_cel-an..ation.mp4
+
+WORM-s23123916-m1398381154--Learning Corel Painter X3%33_rotoscope-techniques.mp4
+       32768   0%    0.00kB/s    0:00:00
+     2129920   9%    1.98MB/s    0:00:10
+     5275648  22%    2.45MB/s    0:00:07
+     8945664  38%    2.77MB/s    0:00:04
+    12353536  53%    2.89MB/s    0:00:03
+    15269888  66%    3.06MB/s    0:00:02
+    18022400  77%    2.99MB/s    0:00:01
+    20742144  89%    2.78MB/s    0:00:00
+    23123916 100%    2.74MB/s    0:00:08 (xfer#1, to-check=0/1)
+
+sent 23126898 bytes  received 42 bytes  2434414.74 bytes/sec
+total size is 23123916  speedup is 1.00
+[2014-05-25 21:23:10 CEST] Transferrer: Uploaded 33_rotosc..iques.mp4
+
+WORM-s16168686-m1398381345--Learning Corel Painter X3%34_portrait-of-hines-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4194304  25%    3.85MB/s    0:00:03
+     7340032  45%    3.40MB/s    0:00:02
+    10256384  63%    3.19MB/s    0:00:01
+    13500416  83%    3.16MB/s    0:00:00
+    16168686 100%    3.09MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 16170824 bytes  received 42 bytes  2940157.45 bytes/sec
+total size is 16168686  speedup is 1.00
+[2014-05-25 21:23:16 CEST] Transferrer: Uploaded 34_portra..art-1.mp4
+
+WORM-s16185635-m1398381044--Learning Corel Painter X3%35_portrait-of-hines-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4390912  27%    4.09MB/s    0:00:02
+     7372800  45%    3.37MB/s    0:00:02
+    10518528  64%    3.23MB/s    0:00:01
+    13139968  81%    3.02MB/s    0:00:00
+    16185635 100%    3.13MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 16187773 bytes  received 42 bytes  2490433.08 bytes/sec
+total size is 16185635  speedup is 1.00
+[2014-05-25 21:23:22 CEST] Transferrer: Uploaded 35_portra..art-2.mp4
+
+WORM-s30681625-m1398381209--Learning Corel Painter X3%36_portrait-of-hines-part-3.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4489216  14%    4.25MB/s    0:00:06
+     7798784  25%    3.65MB/s    0:00:06
+    11206656  36%    3.49MB/s    0:00:05
+    14483456  47%    3.40MB/s    0:00:04
+    17858560  58%    3.14MB/s    0:00:03
+    21299200  69%    3.17MB/s    0:00:02
+    24576000  80%    3.12MB/s    0:00:01
+    27951104  91%    3.15MB/s    0:00:00
+    30681625 100%    3.26MB/s    0:00:08 (xfer#1, to-check=0/1)
+
+sent 30685535 bytes  received 42 bytes  3230060.74 bytes/sec
+total size is 30681625  speedup is 1.00
+[2014-05-25 21:23:32 CEST] Transferrer: Uploaded 36_portra..art-3.mp4
+
+WORM-s22528765-m1398382099--Learning Corel Painter X3%37_digital-watercolor.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4390912  19%    4.08MB/s    0:00:04
+     7536640  33%    3.55MB/s    0:00:04
+    10813440  47%    3.39MB/s    0:00:03
+    14090240  62%    3.30MB/s    0:00:02
+    17334272  76%    3.02MB/s    0:00:01
+    21495808  95%    3.25MB/s    0:00:00
+    22528765 100%    3.39MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 22531673 bytes  received 42 bytes  3004228.67 bytes/sec
+total size is 22528765  speedup is 1.00
+[2014-05-25 21:23:39 CEST] Transferrer: Uploaded 37_digita..color.mp4
+
+WORM-s26374030-m1398381726--Learning Corel Painter X3%38_real-watercolor-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5210112  19%    4.87MB/s    0:00:04
+     8945664  33%    4.18MB/s    0:00:04
+    13074432  49%    4.08MB/s    0:00:03
+    16547840  62%    3.89MB/s    0:00:02
+    20676608  78%    3.65MB/s    0:00:01
+    24412160  92%    3.63MB/s    0:00:00
+    26374030 100%    3.82MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 26377410 bytes  received 42 bytes  3103229.65 bytes/sec
+total size is 26374030  speedup is 1.00
+[2014-05-25 21:23:47 CEST] Transferrer: Uploaded 38_real-w..art-1.mp4
+
+WORM-s19723496-m1398381429--Learning Corel Painter X3%39_real-watercolor-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4751360  24%    4.50MB/s    0:00:03
+     8683520  44%    4.11MB/s    0:00:02
+    12517376  63%    3.96MB/s    0:00:01
+    16384000  83%    3.88MB/s    0:00:00
+    19723496 100%    3.86MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 19726064 bytes  received 42 bytes  3586564.73 bytes/sec
+total size is 19723496  speedup is 1.00
+[2014-05-25 21:23:53 CEST] Transferrer: Uploaded 39_real-w..art-2.mp4
+
+WORM-s19493451-m1398381312--Learning Corel Painter X3%40_caricature-part-1.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4980736  25%    4.62MB/s    0:00:03
+     8683520  44%    4.04MB/s    0:00:02
+    12615680  64%    3.91MB/s    0:00:01
+    16547840  84%    3.84MB/s    0:00:00
+    19493451 100%    3.84MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 19495986 bytes  received 42 bytes  2999388.92 bytes/sec
+total size is 19493451  speedup is 1.00
+[2014-05-25 21:23:59 CEST] Transferrer: Uploaded 40_carica..art-1.mp4
+rsync: fork: Resource temporarily unavailable (35)
+rsync error: error in IPC code (code 14) at /SourceCache/rsync/rsync-42/rsync/pipe.c(65) [sender=2.6.9]
+rsync: fork: Resource temporarily unavailable (35)
+rsync error: error in IPC code (code 14) at /SourceCache/rsync/rsync-42/rsync/pipe.c(65) [sender=2.6.9]
+[2014-05-25 21:36:13 CEST] NetWatcherFallback: Syncing with diskstation 
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   0fddca6..08995a9  git-annex  -> diskstation/git-annex
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+[2014-05-25 21:36:38 CEST] RemoteControl: Syncing with diskstation 
+   251064b..9043046  git-annex -> synced/git-annex
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   08995a9..d2359ee  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 90430461e599b7aad5bc8f4891f1e0eac38766b0 but expected 251064bd591813a5e813bd9cefafb8b4e6788f77
+ ! 251064b..9043046  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+
+  rsync failed -- run git annex again to resume file transfer
+
+WORM-s14012455-m1398381979--Learning Corel Painter X3%41_caricature-part-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  30%    3.81MB/s    0:00:02
+     8159232  58%    3.69MB/s    0:00:01
+     9994240  71%    3.04MB/s    0:00:01
+    11829248  84%    2.67MB/s    0:00:00
+    13664256  97%    2.15MB/s    0:00:00
+    14012455 100%    2.50MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 14014322 bytes  received 42 bytes  1868581.87 bytes/sec
+total size is 14012455  speedup is 1.00
+[2014-05-25 21:37:01 CEST] Transferrer: Uploaded 41_carica..art-2.mp4
+
+WORM-s2813795-m1398381163--Learning Corel Painter X3%42_about-the-author.mp4
+       32768   1%    0.00kB/s    0:00:00
+     2813795 100%    6.18MB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 2814292 bytes  received 42 bytes  1125733.60 bytes/sec
+total size is 2813795  speedup is 1.00
+[2014-05-25 21:37:03 CEST] Transferrer: Uploaded 42_about-..uthor.mp4
+
+WORM-s15151010-m1398381679--Learning Corel Painter X3%43_painter-resources-and-the-painter-community.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5111808  33%    4.69MB/s    0:00:02
+     9109504  60%    4.20MB/s    0:00:01
+    12779520  84%    3.97MB/s    0:00:00
+    15151010 100%    3.95MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 15153043 bytes  received 42 bytes  3367352.22 bytes/sec
+total size is 15151010  speedup is 1.00
+[2014-05-25 21:37:07 CEST] Transferrer: Uploaded 43_painte..unity.mp4
+Watcher crashed: ResumeWatcher
+[2014-05-25 21:39:08 CEST] Watcher: warning Watcher crashed: ResumeWatcher
+
+
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(scanning...) [2014-05-25 21:39:16 CEST] Watcher: Performing startup scan
+[2014-05-25 21:39:20 CEST] Pusher: Syncing with diskstation 
+remote: merge git-annex (merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9043046..57f7b8b  git-annex -> synced/git-annex
+[2014-05-25 21:39:28 CEST] RemoteControl: Syncing with diskstation 
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d2359ee..e459e2f  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 57f7b8bb8d2dd5418eda74deef4a0338b00390d9 but expected 90430461e599b7aad5bc8f4891f1e0eac38766b0
+ ! 9043046..57f7b8b  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(started...) [2014-05-25 21:39:46 CEST] Committer: Committing changes to git
+[2014-05-25 21:39:46 CEST] Pusher: Syncing with diskstation 
+Already up-to-date.
+remote: merge git-annex ok        
+remote: merge synced/master Updating 53c007f..6f2044d        
+remote: Fast-forward        
+remote:  .../01_introduction.mp4                                                  | 1 +        
+remote:  .../02_setting-up.mp4                                                    | 1 +        
+remote:  .../03_selecting-and-creating-elements.mp4                               | 1 +        
+remote:  .../04_exercise-1.mp4                                                    | 1 +        
+remote:  An Introduction to d3.js - From Scattered to Scatterplot/05_svg.mp4      | 1 +        
+remote:  .../06_exercise-2.mp4                                                    | 1 +        
+remote:  .../07_binding-data-and-creating-elements-from-data.mp4                  | 1 +        
+remote:  .../08_exercise-3.mp4                                                    | 1 +        
+remote:  .../09_transitions.mp4                                                   | 1 +        
+remote:  An Introduction to d3.js - From Scattered to Scatterplot/10_scales-2.mp4 | 1 +        
+remote:  An Introduction to d3.js - From Scattered to Scatterplot/10_scales.mp4   | 1 +        
+remote:  An Introduction to d3.js - From Scattered to Scatterplot/11_axes.mp4     | 1 +        
+remote:  .../12_advanced-techniques.mp4                                           | 1 +        
+remote:  .../13_conclusion.mp4                                                    | 1 +        
+remote:  C++ Memory Management/01_introduction.mp4                                | 1 +        
+remote:  C++ Memory Management/02_leaks-and-overruns.mp4                          | 1 +        
+remote:  .../03_stl-vector-methods-range-checking-and-sentinels.mp4               | 1 +        
+remote:  C++ Memory Management/04_memory-leaks-part-1.mp4                         | 1 +        
+remote:  C++ Memory Management/05_memory-leaks-part-2.mp4                         | 1 +        
+remote:  C++ Memory Management/06_pointers-pitfalls-and-best-practices.mp4        | 1 +        
+remote:  C++ Memory Management/07_initialize-everything-trust-but-verify.mp4      | 1 +        
+remote:  C++ Memory Management/08_reading-and-writing-shared-assets.mp4           | 1 +        
+remote:  C++ Memory Management/09_undefined-behaviour-and-other-bad-practices.mp4 | 1 +        
+remote:  C++ Memory Management/10_the-heap-and-stl-wrappers.mp4                   | 1 +        
+remote:  C++ Memory Management/11_about-the-author.mp4                            | 1 +        
+remote:  Lean UX Workshop/01_introduction.mp4                                     | 1 +        
+remote:  Lean UX Workshop/02_nordstrom-case-study.mp4                             | 1 +        
+remote:  Lean UX Workshop/03_assumptions-and-hypotheses.mp4                       | 1 +        
+remote:  Lean UX Workshop/04_personas.mp4                                         | 1 +        
+remote:  Lean UX Workshop/05_outcomes-and-features.mp4                            | 1 +        
+remote:  Lean UX Workshop/06_writing-hypotheses.mp4                               | 1 +        
+remote:  Lean UX Workshop/07_design-studio.mp4                                    | 1 +        
+remote:  Lean UX Workshop/08_experiments-and-mvp-s.mp4                            | 1 +        
+remote:  Lean UX Workshop/09_research.mp4                                         | 1 +        
+remote:  Lean UX Workshop/10_combining-lean-and-agile.mp4                         | 1 +        
+remote:  Lean UX Workshop/11_tools-and-techniques.mp4                             | 1 +        
+remote:  Learning Corel Painter X3/01_a-quick-tour-of-painter.mp4                 | 1 +        
+remote:  Learning Corel Painter X3/02_brushes-and-custom-palettes.mp4             | 1 +        
+remote:  Learning Corel Painter X3/03_managing-layers.mp4                         | 1 +        
+remote:  Learning Corel Painter X3/04_project-red-chairs.mp4                      | 1 +        
+remote:  Learning Corel Painter X3/05_the-toolbox-part-1.mp4                      | 1 +        
+remote:  Learning Corel Painter X3/06_the-toolbox-part-2.mp4                      | 1 +        
+remote:  Learning Corel Painter X3/07_color-panels.mp4                            | 1 +        
+remote:  Learning Corel Painter X3/08_paper-and-media-libraries.mp4               | 1 +        
+remote:  Learning Corel Painter X3/09_menu-commands-part-1.mp4                    | 1 +        
+remote:  Learning Corel Painter X3/10_menu-commands-part-2.mp4                    | 1 +        
+remote:  Learning Corel Painter X3/11_cloner-brushes.mp4                          | 1 +        
+remote:  Learning Corel Painter X3/12_project-clone-painting-a-pear.mp4           | 1 +        
+remote:  Learning Corel Painter X3/13_dab-stroke-and-method.mp4                   | 1 +        
+remote:  Learning Corel Painter X3/14_advanced-controls.mp4                       | 1 +        
+remote:  Learning Corel Painter X3/15_custom-variants.mp4                         | 1 +        
+remote:  Learning Corel Painter X3/16_abstract-painting.mp4                       | 1 +        
+remote:  Learning Corel Painter X3/17_tonal-controls.mp4                          | 1 +        
+remote:  Learning Corel Painter X3/18_surface-controls.mp4                        | 1 +        
+remote:  Learning Corel Painter X3/19_esoterica.mp4                               | 1 +        
+remote:  Learning Corel Painter X3/20_esoterica-mosaic.mp4                        | 1 +        
+remote:  Learning Corel Painter X3/21_selection-tools-and-commands.mp4            | 1 +        
+remote:  Learning Corel Painter X3/22_text-properties.mp4                         | 1 +        
+remote:  Learning Corel Painter X3/23_text-effects.mp4                            | 1 +        
+remote:  Learning Corel Painter X3/24_postcard-graphic-part-1.mp4                 | 1 +        
+remote:  Learning Corel Painter X3/25_postcard-graphic-part-2.mp4                 | 1 +        
+remote:  Learning Corel Painter X3/26_dynamic-layers.mp4                          | 1 +        
+remote:  Learning Corel Painter X3/27_auto-painting.mp4                           | 1 +        
+remote:  Learning Corel Painter X3/28_smart-stroke-cloning.mp4                    | 1 +        
+remote:  Learning Corel Painter X3/29_mirror-and-kaleidoscope.mp4                 | 1 +        
+remote:  Learning Corel Painter X3/30_introduction-to-mixed-media.mp4             | 1 +        
+remote:  Learning Corel Painter X3/31_portrait-of-stephen.mp4                     | 1 +        
+remote:  Learning Corel Painter X3/32_cel-animation.mp4                           | 1 +        
+remote:  Learning Corel Painter X3/33_rotoscope-techniques.mp4                    | 1 +        
+remote:  Learning Corel Painter X3/34_portrait-of-hines-part-1.mp4                | 1 +        
+remote:  Learning Corel Painter X3/35_portrait-of-hines-part-2.mp4                | 1 +        
+remote:  Learning Corel Painter X3/36_portrait-of-hines-part-3.mp4                | 1 +        
+remote:  Learning Corel Painter X3/37_digital-watercolor.mp4                      | 1 +        
+remote:  Learning Corel Painter X3/38_real-watercolor-part-1.mp4                  | 1 +        
+remote:  Learning Corel Painter X3/39_real-watercolor-part-2.mp4                  | 1 +        
+remote:  Learning Corel Painter X3/40_caricature-part-1.mp4                       | 1 +        
+remote:  Learning Corel Painter X3/41_caricature-part-2.mp4                       | 1 +        
+remote:  Learning Corel Painter X3/42_about-the-author.mp4                        | 1 +        
+remote:  .../43_painter-resources-and-the-painter-community.mp4                   | 1 +        
+remote:  79 files changed, 79 insertions(+)        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/01_introduction.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/02_setting-up.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/03_selecting-and-creating-elements.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/04_exercise-1.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/05_svg.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/06_exercise-2.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/07_binding-data-and-creating-elements-from-data.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/08_exercise-3.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/09_transitions.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/10_scales-2.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/10_scales.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/11_axes.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/12_advanced-techniques.mp4        
+remote:  create mode 120000 An Introduction to d3.js - From Scattered to Scatterplot/13_conclusion.mp4        
+remote:  create mode 120000 C++ Memory Management/01_introduction.mp4        
+remote:  create mode 120000 C++ Memory Management/02_leaks-and-overruns.mp4        
+remote:  create mode 120000 C++ Memory Management/03_stl-vector-methods-range-checking-and-sentinels.mp4        
+remote:  create mode 120000 C++ Memory Management/04_memory-leaks-part-1.mp4        
+remote:  create mode 120000 C++ Memory Management/05_memory-leaks-part-2.mp4        
+remote:  create mode 120000 C++ Memory Management/06_pointers-pitfalls-and-best-practices.mp4        
+remote:  create mode 120000 C++ Memory Management/07_initialize-everything-trust-but-verify.mp4        
+remote:  create mode 120000 C++ Memory Management/08_reading-and-writing-shared-assets.mp4        
+remote:  create mode 120000 C++ Memory Management/09_undefined-behaviour-and-other-bad-practices.mp4        
+remote:  create mode 120000 C++ Memory Management/10_the-heap-and-stl-wrappers.mp4        
+remote:  create mode 120000 C++ Memory Management/11_about-the-author.mp4        
+remote:  create mode 120000 Lean UX Workshop/01_introduction.mp4        
+remote:  create mode 120000 Lean UX Workshop/02_nordstrom-case-study.mp4        
+remote:  create mode 120000 Lean UX Workshop/03_assumptions-and-hypotheses.mp4        
+remote:  create mode 120000 Lean UX Workshop/04_personas.mp4        
+remote:  create mode 120000 Lean UX Workshop/05_outcomes-and-features.mp4        
+remote:  create mode 120000 Lean UX Workshop/06_writing-hypotheses.mp4        
+remote:  create mode 120000 Lean UX Workshop/07_design-studio.mp4        
+remote:  create mode 120000 Lean UX Workshop/08_experiments-and-mvp-s.mp4        
+remote:  create mode 120000 Lean UX Workshop/09_research.mp4        
+remote:  create mode 120000 Lean UX Workshop/10_combining-lean-and-agile.mp4        
+remote:  create mode 120000 Lean UX Workshop/11_tools-and-techniques.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/01_a-quick-tour-of-painter.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/02_brushes-and-custom-palettes.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/03_managing-layers.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/04_project-red-chairs.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/05_the-toolbox-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/06_the-toolbox-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/07_color-panels.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/08_paper-and-media-libraries.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/09_menu-commands-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/10_menu-commands-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/11_cloner-brushes.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/12_project-clone-painting-a-pear.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/13_dab-stroke-and-method.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/14_advanced-controls.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/15_custom-variants.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/16_abstract-painting.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/17_tonal-controls.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/18_surface-controls.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/19_esoterica.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/20_esoterica-mosaic.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/21_selection-tools-and-commands.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/22_text-properties.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/23_text-effects.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/24_postcard-graphic-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/25_postcard-graphic-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/26_dynamic-layers.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/27_auto-painting.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/28_smart-stroke-cloning.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/29_mirror-and-kaleidoscope.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/30_introduction-to-mixed-media.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/31_portrait-of-stephen.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/32_cel-animation.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/33_rotoscope-techniques.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/34_portrait-of-hines-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/35_portrait-of-hines-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/36_portrait-of-hines-part-3.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/37_digital-watercolor.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/38_real-watercolor-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/39_real-watercolor-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/40_caricature-part-1.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/41_caricature-part-2.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/42_about-the-author.mp4        
+remote:  create mode 120000 Learning Corel Painter X3/43_painter-resources-and-the-painter-community.mp4        
+remote: 
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   57f7b8b..e459e2f  git-annex -> synced/git-annex
+   53c007f..6f2044d  master -> synced/master
+Already up-to-date.
+[2014-05-25 21:41:22 CEST] Committer: Adding 01_introduction.mp4 02_settin..plate.mp4 03_settin..lbars.mp4 04_how-to..files.mp4 05_line-tool.mp4 06_rectan..-tool.mp4 07_circle-tool.mp4 08_polygon-tool.mp4 09_arc-tool.mp4 and 34 other files
+
+(Recording state in git...)
+
+
+add Learning SketchUp 2013/01_introduction.mp4 ok
+add Learning SketchUp 2013/02_setting-up-the-template.mp4 ok
+add Learning SketchUp 2013/03_setting-up-the-toolbars.mp4 ok
+add Learning SketchUp 2013/04_how-to-access-your-working-files.mp4 ok
+add Learning SketchUp 2013/05_line-tool.mp4 ok
+add Learning SketchUp 2013/06_rectangle-tool.mp4 ok
+add Learning SketchUp 2013/07_circle-tool.mp4 ok
+add Learning SketchUp 2013/08_polygon-tool.mp4 ok
+add Learning SketchUp 2013/09_arc-tool.mp4 ok
+add Learning SketchUp 2013/100_adding-lighting.mp4 ok
+add Learning SketchUp 2013/101_add-reflections-to-existing-textures.mp4 ok
+add Learning SketchUp 2013/102_model-presets-create-a-preview-rendering.mp4 ok
+add Learning SketchUp 2013/103_rendering-a-high-quality-image.mp4 ok
+add Learning SketchUp 2013/104_post-processing-in-photoshop.mp4 ok
+add Learning SketchUp 2013/105_what-is-layout.mp4 ok
+add Learning SketchUp 2013/106_adjusting-the-model-settings.mp4 ok
+add Learning SketchUp 2013/108_adding-additional-pages-and-content.mp4 ok
+add Learning SketchUp 2013/109_updating-the-model-references.mp4 ok
+add Learning SketchUp 2013/10_freehand-tool.mp4 ok
+add Learning SketchUp 2013/111_about-dan-brown.mp4 ok
+add Learning SketchUp 2013/11_navigating-in-3d.mp4 ok
+add Learning SketchUp 2013/12_push-pull-and-move-tool.mp4 ok
+add Learning SketchUp 2013/13_using-follow-me-complex-roof-pitches.mp4 ok
+add Learning SketchUp 2013/14_creating-a-mansard-roof.mp4 ok
+add Learning SketchUp 2013/15_creating-a-gambrel-roof.mp4 ok
+add Learning SketchUp 2013/16_measurements.mp4 ok
+add Learning SketchUp 2013/18_extruding-your-walls-push-pull-and-offset.mp4 ok
+add Learning SketchUp 2013/19_creating-doors-and-openings.mp4 ok
+add Learning SketchUp 2013/20_clean-up-using-the-eraser-to-remove-unwanted-edges.mp4 ok
+add Learning SketchUp 2013/21_why-groups.mp4 ok
+add Learning SketchUp 2013/22_creating-the-second-floor.mp4 ok
+add Learning SketchUp 2013/23_creating-additional-openings.mp4 ok
+add Learning SketchUp 2013/24_hide-model-and-other-useful-shortcuts.mp4 ok
+add Learning SketchUp 2013/25_using-the-outliner.mp4 ok
+add Learning SketchUp 2013/26_using-layers-to-control-visibility.mp4 ok
+add Learning SketchUp 2013/27_viewing-layer-states-of-the-model.mp4 ok
+add Learning SketchUp 2013/28_field-of-view.mp4 ok
+add Learning SketchUp 2013/29_dividing-faces-to-create-your-rooms.mp4 ok
+add Learning SketchUp 2013/30_area-tool-for-calculations.mp4 ok
+add Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture-2.mp4 ok
+add Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture.mp4 ok
+add Learning SketchUp 2013/32_importing-and-applying-a-texture.mp4 ok
+add Learning SketchUp 2013/33_positioning-an-imported-texture.mp4 [2014-05-25 21:41:29 CEST] Committer: Adding 34_editin..tchup.mp4 35_editin..oshop.mp4 36_hide-e..-tool.mp4 37_creati..iling.mp4 38_assign..roups.mp4 39_adding..ter-7.mp4 40_creati..lding.mp4 41_copy-a..place.mp4 42_why-we..nents.mp4 and 57 other files
+ok
+add Learning SketchUp 2013/34_editing-texture-colour-in-sketchup.mp4 ok
+add Learning SketchUp 2013/35_editing-a-texture-in-photoshop.mp4 ok
+add Learning SketchUp 2013/36_hide-edges-and-lines-with-the-eraser-tool.mp4 ok
+add Learning SketchUp 2013/37_creating-the-ceiling.mp4 ok
+add Learning SketchUp 2013/38_assigning-layers-within-groups.mp4 ok
+add Learning SketchUp 2013/39_adding-detail-chapter-7.mp4 ok
+add Learning SketchUp 2013/40_creating-crown-moulding.mp4 ok
+add Learning SketchUp 2013/41_copy-and-paste-in-place.mp4 ok
+add Learning SketchUp 2013/42_why-we-use-groups-and-components.mp4 ok
+add Learning SketchUp 2013/43_creating-the-staircase.mp4 ok
+add Learning SketchUp 2013/44_adding-riser-detail.mp4 ok
+add Learning SketchUp 2013/45_making-a-unique-bottom-step.mp4 ok
+add Learning SketchUp 2013/46_adding-spindles-with-move-and-copy.mp4 ok
+add Learning SketchUp 2013/47_adding-railing.mp4 ok
+add Learning SketchUp 2013/48_review-of-components-and-nested-groups.mp4 ok
+add Learning SketchUp 2013/49_creating-doors.mp4 ok
+add Learning SketchUp 2013/50_creating-the-front-window-frame.mp4 ok
+add Learning SketchUp 2013/51_double-hung-windows.mp4 ok
+add Learning SketchUp 2013/52_installing-bit-tools-plugins.mp4 ok
+add Learning SketchUp 2013/53_creating-walls-and-door-openings.mp4 ok
+add Learning SketchUp 2013/54_using-the-window-feature.mp4 ok
+add Learning SketchUp 2013/55_starting-at-the-base.mp4 ok
+add Learning SketchUp 2013/56_building-the-mantle.mp4 ok
+add Learning SketchUp 2013/57_mantle-columns.mp4 ok
+add Learning SketchUp 2013/58_mantle-support.mp4 ok
+add Learning SketchUp 2013/59_adding-textures.mp4 ok
+add Learning SketchUp 2013/60_base-cabinets.mp4 ok
+add Learning SketchUp 2013/61_wall-cabinets.mp4 ok
+add Learning SketchUp 2013/62_cabinet-doors.mp4 ok
+add Learning SketchUp 2013/63_creating-the-countertop.mp4 ok
+add Learning SketchUp 2013/64_adding-materials.mp4 ok
+add Learning SketchUp 2013/65_adding-appliances.mp4 ok
+add Learning SketchUp 2013/66_adding-the-fridge-and-sink.mp4 ok
+add Learning SketchUp 2013/67_using-the-3d-warehouse.mp4 ok
+add Learning SketchUp 2013/68_using-form-fonts.mp4 ok
+add Learning SketchUp 2013/69_using-the-podium-browser.mp4 ok
+add Learning SketchUp 2013/70_creating-a-library.mp4 ok
+add Learning SketchUp 2013/71_setting-up-to-match-a-new-photo.mp4 ok
+add Learning SketchUp 2013/72_creating-the-massing-model.mp4 ok
+add Learning SketchUp 2013/73_applying-textures.mp4 ok
+add Learning SketchUp 2013/74_adding-detail-chapter-13.mp4 ok
+add Learning SketchUp 2013/75_saving-and-placing-into-the-model.mp4 ok
+add Learning SketchUp 2013/76_creating-the-exterior.mp4 ok
+add Learning SketchUp 2013/77_setting-the-building-in-place-geolocation.mp4 ok
+add Learning SketchUp 2013/78_reset-axis-to-align-building.mp4 ok
+add Learning SketchUp 2013/79_creating-the-front-facade.mp4 ok
+add Learning SketchUp 2013/80_adding-context.mp4 ok
+add Learning SketchUp 2013/81_get-photo-google-street-view.mp4 ok
+add Learning SketchUp 2013/82_using-3d-text.mp4 ok
+add Learning SketchUp 2013/83_add-solar-panels-with-skelion-plugin.mp4 ok
+add Learning SketchUp 2013/84_creating-scenes-and-updating.mp4 ok
+add Learning SketchUp 2013/85_styles.mp4 ok
+add Learning SketchUp 2013/86_scenes-for-animation.mp4 ok
+add Learning SketchUp 2013/87_section-cut-for-interior-elevations.mp4 ok
+add Learning SketchUp 2013/88_creating-a-group.mp4 ok
+add Learning SketchUp 2013/89_creating-the-animation.mp4 ok
+add Learning SketchUp 2013/90_jpeg-and-png-files.mp4 ok
+add Learning SketchUp 2013/91_dwg-elevation-and-plan-pro-feature.mp4 ok
+add Learning SketchUp 2013/92_kmz-for-google-earth.mp4 ok
+add Learning SketchUp 2013/93_collada-files.mp4 ok
+add Learning SketchUp 2013/94_animation-options.mp4 ok
+add Learning SketchUp 2013/95_add-final-touches.mp4 ok
+add Learning SketchUp 2013/96_export-display-options.mp4 ok
+add Learning SketchUp 2013/97_stacking-images-in-photoshop.mp4 ok
+add Learning SketchUp 2013/98_multiply-and-opacity.mp4 ok
+add Learning SketchUp 2013/99_saving-the-image.mp4 [2014-05-25 21:41:31 CEST] Committer: Committing changes to git
+[2014-05-25 21:41:32 CEST] Pusher: Syncing with diskstation 
+
+WORM-s8756441-m1398385688--Learning SketchUp 2013%34_editing-texture-colour-in-sketchup.mp4
+       32768   0%    0.00kB/s    0:00:00
+     2654208  30%    1.97MB/s    0:00:03
+     5734400  65%    2.32MB/s    0:00:01
+Already up-to-date.
+     8756441 100%    2.66MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 8757681 bytes  received 42 bytes  1592313.27 bytes/sec
+total size is 8756441  speedup is 1.00
+[2014-05-25 21:41:37 CEST] Transferrer: Uploaded 34_editin..tchup.mp4
+
+WORM-s16632826-m1398386674--Learning SketchUp 2013%33_positioning-an-imported-texture.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4423680  26%    4.12MB/s    0:00:02
+     8486912  51%    3.96MB/s    0:00:02
+    12517376  75%    3.90MB/s    0:00:01
+remote: merge git-annex     16580608  99%    3.87MB/s    0:00:00
+    16632826 100%    3.89MB/s    0:00:04 (xfer#1, to-check=0/1)
+[2014-05-25 21:41:42 CEST] RemoteControl: Syncing with diskstation 
+
+sent 16635024 bytes  received 42 bytes  3024557.45 bytes/sec
+total size is 16632826  speedup is 1.00
+[2014-05-25 21:41:43 CEST] Transferrer: Uploaded 33_positi..xture.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: merge synced/master 
+WORM-s13603741-m1398386183--Learning SketchUp 2013%32_importing-and-applying-a-texture.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3244032  23%    3.06MB/s    0:00:03
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e459e2f..297826c  git-annex  -> diskstation/git-annex
+   e459e2f..26c6449  synced/git-annex -> diskstation/synced/git-annex
+   6f2044d..7500a88  synced/master -> diskstation/synced/master
+Already up-to-date.
+Updating 6f2044d..7500a88        
+remote: Fast-forward        
+     6520832  47%    3.08MB/s    0:00:02
+remote:  Learning SketchUp 2013/01_introduction.mp4                               | 1 +        
+remote:  Learning SketchUp 2013/02_setting-up-the-template.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/03_setting-up-the-toolbars.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/04_how-to-access-your-working-files.mp4           | 1 +        
+remote:  Learning SketchUp 2013/05_line-tool.mp4                                  | 1 +        
+remote:  Learning SketchUp 2013/06_rectangle-tool.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/07_circle-tool.mp4                                | 1 +        
+remote:  Learning SketchUp 2013/08_polygon-tool.mp4                               | 1 +        
+remote:  Learning SketchUp 2013/09_arc-tool.mp4                                   | 1 +        
+remote:  Learning SketchUp 2013/100_adding-lighting.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/101_add-reflections-to-existing-textures.mp4      | 1 +        
+remote:  Learning SketchUp 2013/102_model-presets-create-a-preview-rendering.mp4  | 1 +        
+remote:  Learning SketchUp 2013/103_rendering-a-high-quality-image.mp4            | 1 +        
+remote:  Learning SketchUp 2013/104_post-processing-in-photoshop.mp4              | 1 +        
+remote:  Learning SketchUp 2013/105_what-is-layout.mp4                            | 1 +        
+remote:  Learning SketchUp 2013/106_adjusting-the-model-settings.mp4              | 1 +        
+remote:  Learning SketchUp 2013/108_adding-additional-pages-and-content.mp4       | 1 +        
+remote:  Learning SketchUp 2013/109_updating-the-model-references.mp4             | 1 +        
+remote:  Learning SketchUp 2013/10_freehand-tool.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/111_about-dan-brown.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/11_navigating-in-3d.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/12_push-pull-and-move-tool.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/13_using-follow-me-complex-roof-pitches.mp4       | 1 +        
+remote:  Learning SketchUp 2013/14_creating-a-mansard-roof.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/15_creating-a-gambrel-roof.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/16_measurements.mp4                               | 1 +        
+remote:  Learning SketchUp 2013/18_extruding-your-walls-push-pull-and-offset.mp4  | 1 +        
+remote:  Learning SketchUp 2013/19_creating-doors-and-openings.mp4                | 1 +        
+remote:  .../20_clean-up-using-the-eraser-to-remove-unwanted-edges.mp4            | 1 +        
+remote:  Learning SketchUp 2013/21_why-groups.mp4                                 | 1 +        
+remote:  Learning SketchUp 2013/22_creating-the-second-floor.mp4                  | 1 +        
+remote:  Learning SketchUp 2013/23_creating-additional-openings.mp4               | 1 +        
+remote:  Learning SketchUp 2013/24_hide-model-and-other-useful-shortcuts.mp4      | 1 +        
+remote:  Learning SketchUp 2013/25_using-the-outliner.mp4                         | 1 +        
+remote:  Learning SketchUp 2013/26_using-layers-to-control-visibility.mp4         | 1 +        
+remote:  Learning SketchUp 2013/27_viewing-layer-states-of-the-model.mp4          | 1 +        
+remote:  Learning SketchUp 2013/28_field-of-view.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/29_dividing-faces-to-create-your-rooms.mp4        | 1 +        
+remote:  Learning SketchUp 2013/30_area-tool-for-calculations.mp4                 | 1 +        
+remote:  Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture-2.mp4     | 1 +        
+remote:  Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture.mp4       | 1 +        
+remote:  Learning SketchUp 2013/32_importing-and-applying-a-texture.mp4           | 1 +        
+remote:  Learning SketchUp 2013/33_positioning-an-imported-texture.mp4            | 1 +        
+remote:  Learning SketchUp 2013/34_editing-texture-colour-in-sketchup.mp4         | 1 +        
+remote:  Learning SketchUp 2013/35_editing-a-texture-in-photoshop.mp4             | 1 +        
+remote:  Learning SketchUp 2013/36_hide-edges-and-lines-with-the-eraser-tool.mp4  | 1 +        
+remote:  Learning SketchUp 2013/37_creating-the-ceiling.mp4                       | 1 +        
+remote:  Learning SketchUp 2013/38_assigning-layers-within-groups.mp4             | 1 +        
+remote:  Learning SketchUp 2013/39_adding-detail-chapter-7.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/40_creating-crown-moulding.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/41_copy-and-paste-in-place.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/42_why-we-use-groups-and-components.mp4           | 1 +        
+remote:  Learning SketchUp 2013/43_creating-the-staircase.mp4                     | 1 +        
+remote:  Learning SketchUp 2013/44_adding-riser-detail.mp4                        | 1 +        
+remote:  Learning SketchUp 2013/45_making-a-unique-bottom-step.mp4                | 1 +        
+remote:  Learning SketchUp 2013/46_adding-spindles-with-move-and-copy.mp4         | 1 +        
+remote:  Learning SketchUp 2013/47_adding-railing.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/48_review-of-components-and-nested-groups.mp4     | 1 +        
+remote:  Learning SketchUp 2013/49_creating-doors.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/50_creating-the-front-window-frame.mp4            | 1 +        
+remote:  Learning SketchUp 2013/51_double-hung-windows.mp4                        | 1 +        
+remote:  Learning SketchUp 2013/52_installing-bit-tools-plugins.mp4               | 1 +        
+remote:  Learning SketchUp 2013/53_creating-walls-and-door-openings.mp4           | 1 +        
+remote:  Learning SketchUp 2013/54_using-the-window-feature.mp4                   | 1 +        
+remote:  Learning SketchUp 2013/55_starting-at-the-base.mp4                       | 1 +        
+remote:  Learning SketchUp 2013/56_building-the-mantle.mp4                        | 1 +        
+remote:  Learning SketchUp 2013/57_mantle-columns.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/58_mantle-support.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/59_adding-textures.mp4                            | 1 +        
+remote:  Learning SketchUp 2013/60_base-cabinets.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/61_wall-cabinets.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/62_cabinet-doors.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/63_creating-the-countertop.mp4                    | 1 +        
+remote:  Learning SketchUp 2013/64_adding-materials.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/65_adding-appliances.mp4                          | 1 +        
+remote:  Learning SketchUp 2013/66_adding-the-fridge-and-sink.mp4                 | 1 +        
+remote:  Learning SketchUp 2013/67_using-the-3d-warehouse.mp4                     | 1 +        
+remote:  Learning SketchUp 2013/68_using-form-fonts.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/69_using-the-podium-browser.mp4                   | 1 +        
+remote:  Learning SketchUp 2013/70_creating-a-library.mp4                         | 1 +        
+remote:  Learning SketchUp 2013/71_setting-up-to-match-a-new-photo.mp4            | 1 +        
+remote:  Learning SketchUp 2013/72_creating-the-massing-model.mp4                 | 1 +        
+remote:  Learning SketchUp 2013/73_applying-textures.mp4                          | 1 +        
+remote:  Learning SketchUp 2013/74_adding-detail-chapter-13.mp4                   | 1 +        
+remote:  Learning SketchUp 2013/75_saving-and-placing-into-the-model.mp4          | 1 +        
+remote:  Learning SketchUp 2013/76_creating-the-exterior.mp4                      | 1 +        
+remote:  Learning SketchUp 2013/77_setting-the-building-in-place-geolocation.mp4  | 1 +        
+remote:  Learning SketchUp 2013/78_reset-axis-to-align-building.mp4               | 1 +        
+remote:  Learning SketchUp 2013/79_creating-the-front-facade.mp4                  | 1 +        
+remote:  Learning SketchUp 2013/80_adding-context.mp4                             | 1 +        
+remote:  Learning SketchUp 2013/81_get-photo-google-street-view.mp4               | 1 +        
+remote:  Learning SketchUp 2013/82_using-3d-text.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/83_add-solar-panels-with-skelion-plugin.mp4       | 1 +        
+remote:  Learning SketchUp 2013/84_creating-scenes-and-updating.mp4               | 1 +        
+remote:  Learning SketchUp 2013/85_styles.mp4                                     | 1 +        
+remote:  Learning SketchUp 2013/86_scenes-for-animation.mp4                       | 1 +        
+remote:  Learning SketchUp 2013/87_section-cut-for-interior-elevations.mp4        | 1 +        
+remote:  Learning SketchUp 2013/88_creating-a-group.mp4                           | 1 +        
+remote:  Learning SketchUp 2013/89_creating-the-animation.mp4                     | 1 +        
+remote:  Learning SketchUp 2013/90_jpeg-and-png-files.mp4                         | 1 +        
+remote:  Learning SketchUp 2013/91_dwg-elevation-and-plan-pro-feature.mp4         | 1 +        
+remote:  Learning SketchUp 2013/92_kmz-for-google-earth.mp4                       | 1 +        
+remote:  Learning SketchUp 2013/93_collada-files.mp4                              | 1 +        
+remote:  Learning SketchUp 2013/94_animation-options.mp4                          | 1 +        
+remote:  Learning SketchUp 2013/95_add-final-touches.mp4                          | 1 +        
+remote:  Learning SketchUp 2013/96_export-display-options.mp4                     | 1 +        
+remote:  Learning SketchUp 2013/97_stacking-images-in-photoshop.mp4               | 1 +        
+remote:  Learning SketchUp 2013/98_multiply-and-opacity.mp4                       | 1 +        
+remote:  Learning SketchUp 2013/99_saving-the-image.mp4                           | 1 +        
+remote:  109 files changed, 109 insertions(+)        
+remote:  create mode 120000 Learning SketchUp 2013/01_introduction.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/02_setting-up-the-template.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/03_setting-up-the-toolbars.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/04_how-to-access-your-working-files.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/05_line-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/06_rectangle-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/07_circle-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/08_polygon-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/09_arc-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/100_adding-lighting.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/101_add-reflections-to-existing-textures.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/102_model-presets-create-a-preview-rendering.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/103_rendering-a-high-quality-image.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/104_post-processing-in-photoshop.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/105_what-is-layout.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/106_adjusting-the-model-settings.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/108_adding-additional-pages-and-content.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/109_updating-the-model-references.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/10_freehand-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/111_about-dan-brown.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/11_navigating-in-3d.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/12_push-pull-and-move-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/13_using-follow-me-complex-roof-pitches.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/14_creating-a-mansard-roof.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/15_creating-a-gambrel-roof.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/16_measurements.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/18_extruding-your-walls-push-pull-and-offset.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/19_creating-doors-and-openings.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/20_clean-up-using-the-eraser-to-remove-unwanted-edges.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/21_why-groups.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/22_creating-the-second-floor.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/23_creating-additional-openings.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/24_hide-model-and-other-useful-shortcuts.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/25_using-the-outliner.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/26_using-layers-to-control-visibility.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/27_viewing-layer-states-of-the-model.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/28_field-of-view.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/29_dividing-faces-to-create-your-rooms.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/30_area-tool-for-calculations.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture-2.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/31_using-paint-bucket-for-floor-texture.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/32_importing-and-applying-a-texture.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/33_positioning-an-imported-texture.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/34_editing-texture-colour-in-sketchup.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/35_editing-a-texture-in-photoshop.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/36_hide-edges-and-lines-with-the-eraser-tool.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/37_creating-the-ceiling.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/38_assigning-layers-within-groups.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/39_adding-detail-chapter-7.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/40_creating-crown-moulding.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/41_copy-and-paste-in-place.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/42_why-we-use-groups-and-components.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/43_creating-the-staircase.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/44_adding-riser-detail.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/45_making-a-unique-bottom-step.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/46_adding-spindles-with-move-and-copy.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/47_adding-railing.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/48_review-of-components-and-nested-groups.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/49_creating-doors.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/50_creating-the-front-window-frame.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/51_double-hung-windows.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/52_installing-bit-tools-plugins.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/53_creating-walls-and-door-openings.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/54_using-the-window-feature.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/55_starting-at-the-base.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/56_building-the-mantle.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/57_mantle-columns.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/58_mantle-support.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/59_adding-textures.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/60_base-cabinets.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/61_wall-cabinets.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/62_cabinet-doors.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/63_creating-the-countertop.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/64_adding-materials.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/65_adding-appliances.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/66_adding-the-fridge-and-sink.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/67_using-the-3d-warehouse.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/68_using-form-fonts.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/69_using-the-podium-browser.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/70_creating-a-library.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/71_setting-up-to-match-a-new-photo.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/72_creating-the-massing-model.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/73_applying-textures.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/74_adding-detail-chapter-13.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/75_saving-and-placing-into-the-model.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/76_creating-the-exterior.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/77_setting-the-building-in-place-geolocation.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/78_reset-axis-to-align-building.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/79_creating-the-front-facade.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/80_adding-context.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/81_get-photo-google-street-view.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/82_using-3d-text.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/83_add-solar-panels-with-skelion-plugin.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/84_creating-scenes-and-updating.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/85_styles.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/86_scenes-for-animation.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/87_section-cut-for-interior-elevations.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/88_creating-a-group.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/89_creating-the-animation.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/90_jpeg-and-png-files.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/91_dwg-elevation-and-plan-pro-feature.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/92_kmz-for-google-earth.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/93_collada-files.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/94_animation-options.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/95_add-final-touches.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/96_export-display-options.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/97_stacking-images-in-photoshop.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/98_multiply-and-opacity.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/99_saving-the-image.mp4        
+     8224768  60%    2.54MB/s    0:00:02
+remote: 
+remote: ok        
+remote: (Recording state in git...)        
+[2014-05-25 21:41:47 CEST] RemoteControl: Syncing with diskstation 
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e459e2f..26c6449  git-annex -> synced/git-annex
+   6f2044d..7500a88  master -> synced/master
+    10911744  80%    2.52MB/s    0:00:01
+    13603741 100%    2.69MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 13605572 bytes  received 42 bytes  2473748.00 bytes/sec
+total size is 13603741  speedup is 1.00
+[2014-05-25 21:41:49 CEST] Transferrer: Uploaded 32_import..xture.mp4
+
+WORM-s13731971-m1398386799--Learning SketchUp 2013%31_using-paint-bucket-for-floor-texture.mp4
+       32768   0%    0.00kB/s    0:00:00
+     2752512  20%    2.48MB/s    0:00:04
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   297826c..ee2d7a6  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/master is at 7500a886b58db7f0a3d2d279a946215525109cd2 but expected 6f2044d781d283993104edb9f8b96041801c1e76
+ ! 6f2044d..7500a88  master     -> diskstation/master  (unable to update local ref)
+[2014-05-25 21:41:51 CEST] Pusher: Syncing with diskstation 
+     5373952  39%    2.45MB/s    0:00:03
+     9404416  68%    2.88MB/s    0:00:01
+    12681216  92%    2.63MB/s    0:00:00
+    13731971 100%    2.84MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 13733822 bytes  received 42 bytes  2497066.18 bytes/sec
+total size is 13731971  speedup is 1.00
+[2014-05-25 21:41:54 CEST] Transferrer: Uploaded 31_using-..xture.mp4
+
+WORM-s13731971-m1398386799--Learning SketchUp 2013%31_using-paint-bucket-for-floor-texture-2.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      3211264  23%    2.96MB/s    0:00:03
+     7634944  55%    3.55MB/s    0:00:01
+[2014-05-25 21:41:57 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   26c6449..9d66740  git-annex -> synced/git-annex
+    11370496  82%    3.54MB/s    0:00:00
+    13731971 100%    3.62MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 13733824 bytes  received 42 bytes  2497066.55 bytes/sec
+total size is 13731971  speedup is 1.00
+[2014-05-25 21:41:59 CEST] Transferrer: Uploaded 31_using-..ure-2.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ee2d7a6..be030de  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 9d667409bdd47098b595460d26a4a47a7477b602 but expected 26c64492572c692eb6c5e3af0922849d42142cc5
+ ! 26c6449..9d66740  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s6958518-m1398385748--Learning SketchUp 2013%30_area-tool-for-calculations.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4096000  58%    3.77MB/s    0:00:00
+[2014-05-25 21:42:01 CEST] Pusher: Syncing with diskstation 
+     5505024  79%    2.56MB/s    0:00:00
+     6958518 100%    2.63MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 6959530 bytes  received 42 bytes  1988449.14 bytes/sec
+total size is 6958518  speedup is 1.00
+[2014-05-25 21:42:02 CEST] Transferrer: Uploaded 30_area-t..tions.mp4
+
+WORM-s17894336-m1398385618--Learning SketchUp 2013%29_dividing-faces-to-create-your-rooms.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5210112  29%    4.90MB/s    0:00:02
+     8617984  48%    3.99MB/s    0:00:02
+    10715136  59%    3.34MB/s    0:00:02
+[2014-05-25 21:42:07 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9d66740..2f65ea4  git-annex -> synced/git-annex
+    13336576  74%    3.11MB/s    0:00:01
+    16842752  94%    2.72MB/s    0:00:00
+    17894336 100%    3.16MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 17896694 bytes  received 42 bytes  2753344.00 bytes/sec
+total size is 17894336  speedup is 1.00
+[2014-05-25 21:42:09 CEST] Transferrer: Uploaded 29_dividi..rooms.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   be030de..afc435c  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 2f65ea464ab39db40b09478a6857d41450b394d3 but expected 9d667409bdd47098b595460d26a4a47a7477b602
+ ! 9d66740..2f65ea4  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:42:10 CEST] Committer: Adding 107_addin..sions.mp4 110_prese..aving.mp4
+ok
+(Recording state in git...)
+(Recording state in git...)
+
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+(merging diskstation/git-annex into git-annex...)
+(Recording state in git...)
+add Learning SketchUp 2013/107_adding-annotations-and-dimensions.mp4 ok
+add Learning SketchUp 2013/110_presenting-and-saving.mp4 [2014-05-25 21:42:10 CEST] Committer: Committing changes to git
+
+WORM-s16183756-m1398386984--Learning SketchUp 2013%28_field-of-view.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:42:11 CEST] Pusher: Syncing with diskstation 
+     5177344  31%    4.80MB/s    0:00:02
+Already up-to-date.
+     9306112  57%    4.38MB/s    0:00:01
+    13434880  83%    4.21MB/s    0:00:00
+remote: merge git-annex     16183756 100%    3.91MB/s    0:00:03 (xfer#1, to-check=0/1)
+[2014-05-25 21:42:16 CEST] RemoteControl: Syncing with diskstation 
+
+sent 16185880 bytes  received 42 bytes  2942894.91 bytes/sec
+total size is 16183756  speedup is 1.00
+[2014-05-25 21:42:16 CEST] Transferrer: Uploaded 28_field-..-view.m(merging synced/git-annex into git-annex...)        
+premote: (Recording state in git...)        
+4remote: ok        
+remote: merge synced/master 
+
+WORM-s8653832-m1398386968--Learning SketchUp 2013%110_presenting-and-saving.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   afc435c..2feeb97  git-annex  -> diskstation/git-annex
+   2f65ea4..de80d6d  synced/git-annex -> diskstation/synced/git-annex
+   7500a88..af4c173  synced/master -> diskstation/synced/master
+     4390912  50%    4.13MB/s    0:00:01
+Already up-to-date.
+     7045120  81%    3.30MB/s    0:00:00
+Updating 7500a88..af4c173        
+remote: Fast-forward        
+remote:  Learning SketchUp 2013/107_adding-annotations-and-dimensions.mp4 | 1 +        
+remote:  Learning SketchUp 2013/110_presenting-and-saving.mp4             | 1 +        
+remote:  2 files changed, 2 insertions(+)        
+remote:  create mode 120000 Learning SketchUp 2013/107_adding-annotations-and-dimensions.mp4        
+remote:  create mode 120000 Learning SketchUp 2013/110_presenting-and-saving.mp4        
+     8653832 100%    3.26MB/s    0:00:02 (xfer#1, to-check=0/1)
+remote: 
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2f65ea4..de80d6d  git-annex -> synced/git-annex
+   7500a88..af4c173  master -> synced/master
+
+sent 8655048 bytes  received 42 bytes  1923353.33 bytes/sec
+total size is 8653832  speedup is 1.00
+[2014-05-25 21:42:20 CEST] Transferrer: Uploaded 110_prese..aving.mp4
+[2014-05-25 21:42:20 CEST] RemoteControl: Syncing with diskstation 
+
+WORM-s12740321-m1398386533--Learning SketchUp 2013%107_adding-annotations-and-dimensions.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2feeb97..c393949  git-annex  -> diskstation/git-annex
+   7500a88..af4c173  master     -> diskstation/master
+     4685824  36%    4.30MB/s    0:00:01
+     7667712  60%    3.56MB/s    0:00:01
+    10518528  82%    3.25MB/s    0:00:00
+[2014-05-25 21:42:24 CEST] Pusher: Syncing with diskstation 
+    12740321 100%    3.20MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 12742046 bytes  received 42 bytes  2316743.27 bytes/sec
+total size is 12740321  speedup is 1.00
+[2014-05-25 21:42:25 CEST] Transferrer: Uploaded 107_addin..sions.mp4
+
+WORM-s21683651-m1398384839--Learning SketchUp 2013%27_viewing-layer-states-of-the-model.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4358144  20%    4.11MB/s    0:00:04
+     7438336  34%    3.47MB/s    0:00:04
+[2014-05-25 21:42:29 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   de80d6d..da93668  git-annex -> synced/git-annex
+     9273344  42%    2.81MB/s    0:00:04
+    12189696  56%    2.78MB/s    0:00:03
+    15532032  71%    2.54MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c393949..9f19ee8  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at da936685ca807cb619e2d6073c857cdcdc345dde but expected de80d6dd537ca7e4bfade9d40eade18afc58878b
+ ! de80d6d..da93668  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    19300352  89%    2.70MB/s    0:00:00
+    21683651 100%    2.95MB/s    0:00:06 (xfer#1, to-check=0/1)
+[2014-05-25 21:42:33 CEST] Pusher: Syncing with diskstation 
+
+sent 21686467 bytes  received 42 bytes  2551354.00 bytes/sec
+total size is 21683651  speedup is 1.00
+[2014-05-25 21:42:33 CEST] Transferrer: Uploaded 27_viewin..model.mp4
+
+WORM-s16669986-m1398385184--Learning SketchUp 2013%26_using-layers-to-control-visibility.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4259840  25%    3.95MB/s    0:00:03
+     7274496  43%    3.37MB/s    0:00:02
+[2014-05-25 21:42:37 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   da93668..fc553e7  git-annex -> synced/git-annex
+    10387456  62%    3.21MB/s    0:00:01
+    13500416  80%    3.14MB/s    0:00:00
+    16613376  99%    2.87MB/s    0:00:00
+    16669986 100%    3.09MB/s    0:00:05 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9f19ee8..a8b9203  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at fc553e72a5ea5a077a254df3f557b3d6241d9342 but expected da936685ca807cb619e2d6073c857cdcdc345dde
+ ! da93668..fc553e7  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 16672191 bytes  received 42 bytes  2564958.92 bytes/sec
+total size is 16669986  speedup is 1.00
+[2014-05-25 21:42:40 CEST] Transferrer: Uploaded 26_using-..ility.mp4
+
+WORM-s8161367-m1398386819--Learning SketchUp 2013%25_using-the-outliner.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4620288  56%    4.32MB/s    0:00:00
+[2014-05-25 21:42:41 CEST] Pusher: Syncing with diskstation 
+     8161367 100%    3.89MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 8162519 bytes  received 42 bytes  3265024.40 bytes/sec
+total size is 8161367  speedup is 1.00
+[2014-05-25 21:42:42 CEST] Transferrer: Uploaded 25_using-..liner.mp4
+
+WORM-s26081165-m1398387035--Learning SketchUp 2013%24_hide-model-and-other-useful-shortcuts.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4620288  17%    4.27MB/s    0:00:04
+remote: merge git-annex      6193152  23%    2.82MB/s    0:00:06
+     9568256  36%    2.93MB/s    0:00:05
+    13631488  52%    3.16MB/s    0:00:03
+[2014-05-25 21:42:47 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   fc553e7..7eccd72  git-annex -> synced/git-annex
+    17203200  65%    2.92MB/s    0:00:02
+    21561344  82%    3.62MB/s    0:00:01
+    25362432  97%    3.72MB/s    0:00:00
+    26081165 100%    3.37MB/s    0:00:07 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a8b9203..829ce2e  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7eccd720d952d1ec3a1ee00cc524732ec970285f but expected fc553e72a5ea5a077a254df3f557b3d6241d9342
+ ! fc553e7..7eccd72  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 26084521 bytes  received 42 bytes  2745743.47 bytes/sec
+total size is 26081165  speedup is 1.00
+[2014-05-25 21:42:51 CEST] Transferrer: Uploaded 24_hide-m..tcuts.mp4
+
+WORM-s24710536-m1398386140--Learning SketchUp 2013%23_creating-additional-openings.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:42:52 CEST] Pusher: Syncing with diskstation 
+     5111808  20%    4.80MB/s    0:00:03
+     9142272  36%    4.25MB/s    0:00:03
+    12648448  51%    3.92MB/s    0:00:03
+    16023552  64%    3.71MB/s    0:00:02
+remote: merge git-annex     19365888  78%    3.27MB/s    0:00:01
+    22478848  90%    3.05MB/s    0:00:00
+[2014-05-25 21:42:58 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7eccd72..5dd7ceb  git-annex -> synced/git-annex
+    24710536 100%    3.34MB/s    0:00:07 (xfer#1, to-check=0/1)
+
+sent 24713719 bytes  received 42 bytes  2907501.29 bytes/sec
+total size is 24710536  speedup is 1.00
+[2014-05-25 21:42:59 CEST] Transferrer: Uploaded 23_creati..nings.mp4
+
+WORM-s27007278-m1398386399--Learning SketchUp 2013%22_creating-the-second-floor.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   829ce2e..432e319  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 5dd7ceb17a57b1f11edb692c3c20eb05f7c89aa7 but expected 7eccd720d952d1ec3a1ee00cc524732ec970285f
+ ! 7eccd72..5dd7ceb  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     4194304  15%    3.94MB/s    0:00:05
+     6946816  25%    3.24MB/s    0:00:06
+[2014-05-25 21:43:02 CEST] Pusher: Syncing with diskstation 
+     9830400  36%    3.06MB/s    0:00:05
+    12582912  46%    2.96MB/s    0:00:04
+remote: merge git-annex     15761408  58%    2.73MB/s    0:00:04
+    18481152  68%    2.71MB/s    0:00:03
+[2014-05-25 21:43:06 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5dd7ceb..114c7a8  git-annex -> synced/git-annex
+    21889024  81%    2.82MB/s    0:00:01
+    24805376  91%    2.86MB/s    0:00:00
+    27007278 100%    2.89MB/s    0:00:08 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   432e319..ee3c95a  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 114c7a8e0d0873ea44ebfd8a5989b7e4f6fe300d but expected 5dd7ceb17a57b1f11edb692c3c20eb05f7c89aa7
+ ! 5dd7ceb..114c7a8  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 27010738 bytes  received 42 bytes  2572455.24 bytes/sec
+total size is 27007278  speedup is 1.00
+[2014-05-25 21:43:09 CEST] Transferrer: Uploaded 22_creati..floor.mp4
+
+WORM-s11952523-m1398387004--Learning SketchUp 2013%21_why-groups.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3538944  29%    3.13MB/s    0:00:02
+[2014-05-25 21:43:11 CEST] Pusher: Syncing with diskstation 
+     4849664  40%    2.11MB/s    0:00:03
+     8257536  69%    2.44MB/s    0:00:01
+    11272192  94%    2.54MB/s    0:00:00
+remote: merge git-annex     11952523 100%    2.56MB/s    0:00:04 (xfer#1, to-check=0/1)
+[2014-05-25 21:43:15 CEST] RemoteControl: Syncing with diskstation 
+
+sent 11954128 bytes  received 42 bytes  2173485.45 bytes/sec
+total size is 11952523  speedup is 1.00
+[2014-05-25 21:43:15 CEST] Transferrer: Uploaded 21_why-groups.mp4
+
+WORM-s14698958-m1401045757--Learning SketchUp 2013%20_clean-up-using-the-eraser-to-remove-unwanted-edges.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   114c7a8..70d2843  git-annex -> synced/git-annex
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ee3c95a..292456c  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 70d2843ca3fd83291be9e3a83c8a2b1d393344fc but expected 114c7a8e0d0873ea44ebfd8a5989b7e4f6fe300d
+ ! 114c7a8..70d2843  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:43:17 CEST] RemoteControl: Syncing with diskstation 
+     4489216  30%    4.09MB/s    0:00:02
+     7634944  51%    3.53MB/s    0:00:01
+    10715136  72%    3.32MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   292456c..489a02f  git-annex  -> diskstation/git-annex
+    14254080  96%    3.32MB/s    0:00:00
+    14698958 100%    3.27MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 14700939 bytes  received 42 bytes  2261689.38 bytes/sec
+total size is 14698958  speedup is 1.00
+[2014-05-25 21:43:21 CEST] Transferrer: Uploaded 20_clean-..edges.mp4
+[2014-05-25 21:43:21 CEST] Pusher: Syncing with diskstation 
+
+WORM-s53078315-m1401045818--Learning SketchUp 2013%19_creating-doors-and-openings.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5046272   9%    4.66MB/s    0:00:10
+     9109504  17%    4.21MB/s    0:00:10
+remote: merge git-annex     12779520  24%    3.96MB/s    0:00:09
+    16187392  30%    3.76MB/s    0:00:09
+    20676608  38%    3.66MB/s    0:00:08
+[2014-05-25 21:43:27 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   70d2843..0d8c767  git-annex -> synced/git-annex
+    24739840  46%    3.67MB/s    0:00:07
+    28573696  53%    3.71MB/s    0:00:06
+    32243712  60%    3.76MB/s    0:00:05
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   489a02f..7a7f5ca  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 0d8c76720fa6b51cf2cf5edf847e732dd550ab40 but expected 70d2843ca3fd83291be9e3a83c8a2b1d393344fc
+ ! 70d2843..0d8c767  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    36765696  69%    3.74MB/s    0:00:04
+    40697856  76%    3.72MB/s    0:00:03
+    44564480  83%    3.73MB/s    0:00:02
+    47316992  89%    3.53MB/s    0:00:01
+    50331648  94%    3.18MB/s    0:00:00
+    53078315 100%    3.62MB/s    0:00:13 (xfer#1, to-check=0/1)
+
+sent 53084957 bytes  received 42 bytes  3424838.65 bytes/sec
+total size is 53078315  speedup is 1.00
+[2014-05-25 21:43:36 CEST] Transferrer: Uploaded 19_creati..nings.mp4
+[2014-05-25 21:43:36 CEST] Pusher: Syncing with diskstation 
+
+WORM-s30352251-m1398385646--Learning SketchUp 2013%18_extruding-your-walls-push-pull-and-offset.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4784128  15%    4.50MB/s    0:00:05
+remote: merge git-annex      8159232  26%    3.81MB/s    0:00:05
+    10256384  33%    3.17MB/s    0:00:06
+[2014-05-25 21:43:40 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   0d8c767..6f8ae3d  git-annex -> synced/git-annex
+    13271040  43%    3.06MB/s    0:00:05
+    16318464  53%    2.65MB/s    0:00:05
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7a7f5ca..bef94a6  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 6f8ae3d49d1006e2d5cf957d7539c0818db4df12 but expected 0d8c76720fa6b51cf2cf5edf847e732dd550ab40
+ ! 0d8c767..6f8ae3d  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    19070976  62%    2.51MB/s    0:00:04
+    21954560  72%    2.71MB/s    0:00:03
+    24969216  82%    2.72MB/s    0:00:01
+    27852800  91%    2.69MB/s    0:00:00
+    30352251 100%    2.87MB/s    0:00:10 (xfer#1, to-check=0/1)
+
+sent 30356135 bytes  received 42 bytes  2639667.57 bytes/sec
+total size is 30352251  speedup is 1.00
+[2014-05-25 21:43:48 CEST] Transferrer: Uploaded 18_extrud..ffset.mp4
+[2014-05-25 21:43:48 CEST] Pusher: Syncing with diskstation 
+
+WORM-s14102612-m1398386513--Learning SketchUp 2013%16_measurements.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4554752  32%    4.23MB/s    0:00:02
+     7634944  54%    3.59MB/s    0:00:01
+remote: merge git-annex     10584064  75%    3.29MB/s    0:00:01
+[2014-05-25 21:43:52 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   6f8ae3d..32eee1a  git-annex -> synced/git-annex
+    13434880  95%    3.13MB/s    0:00:00
+    14102612 100%    3.14MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 14104483 bytes  received 42 bytes  2564459.09 bytes/sec
+total size is 14102612  speedup is 1.00
+[2014-05-25 21:43:53 CEST] Transferrer: Uploaded 16_measurements.mp4
+
+WORM-s16792198-m1398384994--Learning SketchUp 2013%15_creating-a-gambrel-roof.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   bef94a6..10025f1  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 32eee1aff2a03a33e7cc200fefcef41ce775767e but expected 6f8ae3d49d1006e2d5cf957d7539c0818db4df12
+ ! 6f8ae3d..32eee1a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     4128768  24%    3.88MB/s    0:00:03
+     7012352  41%    3.26MB/s    0:00:02
+[2014-05-25 21:43:56 CEST] Pusher: Syncing with diskstation 
+     9895936  58%    3.07MB/s    0:00:02
+    12648448  75%    2.95MB/s    0:00:01
+remote: merge git-annex     14745600  87%    2.48MB/s    0:00:00
+    16416768  97%    2.20MB/s    0:00:00
+    16792198 100%    2.58MB/s    0:00:06 (xfer#1, to-check=0/1)
+[2014-05-25 21:44:01 CEST] RemoteControl: Syncing with diskstation 
+
+sent 16794408 bytes  received 42 bytes  1975817.65 bytes/sec
+total size is 16792198  speedup is 1.00
+[2014-05-25 21:44:01 CEST] Transferrer: Uploaded 15_creati..-roof.mp4
+
+WORM-s33139501-m1398386446--Learning SketchUp 2013%14_creating-a-mansard-roof.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   32eee1a..cc461b8  git-annex -> synced/git-annex
+     4685824  14%    4.39MB/s    0:00:06
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   10025f1..f39db09  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at cc461b8c48eb38d8f0b020a9c22440dada4973f0 but expected 32eee1aff2a03a33e7cc200fefcef41ce775767e
+ ! 32eee1a..cc461b8  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:44:03 CEST] RemoteControl: Syncing with diskstation 
+     8159232  24%    3.84MB/s    0:00:06
+    11730944  35%    3.67MB/s    0:00:05
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f39db09..d356ca4  git-annex  -> diskstation/git-annex
+    16351232  49%    3.85MB/s    0:00:04
+[2014-05-25 21:44:07 CEST] Pusher: Syncing with diskstation 
+    20119552  60%    3.63MB/s    0:00:03
+    23265280  70%    3.52MB/s    0:00:02
+    25952256  78%    3.31MB/s    0:00:02
+remote: merge git-annex     28803072  86%    2.89MB/s    0:00:01
+(merging synced/git-annex into git-annex...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   cc461b8..f90e094  git-annex -> synced/git-annex
+    31653888  95%    2.67MB/s    0:00:00
+    33139501 100%    3.28MB/s    0:00:09 (xfer#1, to-check=0/1)
+
+sent 33143707 bytes  received 42 bytes  2882065.13 bytes/sec
+total size is 33139501  speedup is 1.00
+[2014-05-25 21:44:12 CEST] Transferrer: Uploaded 14_creati..-roof.mp4
+
+WORM-s32543230-m1398386371--Learning SketchUp 2013%13_using-follow-me-complex-roof-pitches.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4718592  14%    4.45MB/s    0:00:06
+[2014-05-25 21:44:14 CEST] Pusher: Syncing with diskstation 
+     7340032  22%    3.45MB/s    0:00:07
+    10125312  31%    3.18MB/s    0:00:06
+    12877824  39%    3.03MB/s    0:00:06
+remote: merge git-annex     15892480  48%    2.64MB/s    0:00:06
+    18579456  57%    2.64MB/s    0:00:05
+    21561344  66%    2.67MB/s    0:00:04
+[2014-05-25 21:44:20 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f90e094..795020d  git-annex -> synced/git-annex
+    24412160  75%    2.70MB/s    0:00:02
+    27164672  83%    2.61MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d356ca4..7d763cd  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 795020d6aa856441f602de8d1f2f7efb98c00f20 but expected f90e0945bc55e8e50115bccec9672d1df7c23e69
+ ! f90e094..795020d  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    28737536  88%    2.28MB/s    0:00:01
+    30703616  94%    2.05MB/s    0:00:00
+    32543230 100%    2.58MB/s    0:00:12 (xfer#1, to-check=0/1)
+
+sent 32547377 bytes  received 42 bytes  2410919.93 bytes/sec
+total size is 32543230  speedup is 1.00
+[2014-05-25 21:44:25 CEST] Transferrer: Uploaded 13_using-..tches.mp4
+[2014-05-25 21:44:25 CEST] Pusher: Syncing with diskstation 
+
+WORM-s22461160-m1401045786--Learning SketchUp 2013%12_push-pull-and-move-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4161536  18%    3.80MB/s    0:00:04
+remote: merge git-annex      6782976  30%    3.13MB/s    0:00:04
+     9666560  43%    2.95MB/s    0:00:04
+[2014-05-25 21:44:29 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   795020d..496b7bd  git-annex -> synced/git-annex
+    12681216  56%    2.91MB/s    0:00:03
+    15859712  70%    2.70MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7d763cd..2bf57cb  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 496b7bd40f4c979efdd6196eccadeeb370bb4ec3 but expected 795020d6aa856441f602de8d1f2f7efb98c00f20
+ ! 795020d..496b7bd  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    18579456  82%    2.72MB/s    0:00:01
+    20414464  90%    2.50MB/s    0:00:00
+    22461160 100%    2.69MB/s    0:00:07 (xfer#1, to-check=0/1)
+
+sent 22464062 bytes  received 42 bytes  2364642.53 bytes/sec
+total size is 22461160  speedup is 1.00
+[2014-05-25 21:44:34 CEST] Transferrer: Uploaded 12_push-p..-tool.mp4
+[2014-05-25 21:44:34 CEST] Pusher: Syncing with diskstation 
+
+WORM-s15320679-m1398386653--Learning SketchUp 2013%11_navigating-in-3d.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4587520  29%    4.18MB/s    0:00:02
+remote: merge git-annex      7471104  48%    3.45MB/s    0:00:02
+    10223616  66%    3.16MB/s    0:00:01
+[2014-05-25 21:44:38 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   496b7bd..eefc387  git-annex -> synced/git-annex
+    12976128  84%    3.00MB/s    0:00:00
+    15320679 100%    2.92MB/s    0:00:04 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2bf57cb..310d31e  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at eefc387772b3e6ba46f51fbecd86cdabcd27db96 but expected 496b7bd40f4c979efdd6196eccadeeb370bb4ec3
+ ! 496b7bd..eefc387  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 15322702 bytes  received 42 bytes  2357345.23 bytes/sec
+total size is 15320679  speedup is 1.00
+[2014-05-25 21:44:40 CEST] Transferrer: Uploaded 11_naviga..in-3d.mp4
+
+WORM-s6065317-m1398386928--Learning SketchUp 2013%111_about-dan-brown.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4292608  70%    3.98MB/s    0:00:00
+[2014-05-25 21:44:42 CEST] Pusher: Syncing with diskstation 
+     6065317 100%    3.02MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 6066211 bytes  received 42 bytes  1733215.14 bytes/sec
+total size is 6065317  speedup is 1.00
+[2014-05-25 21:44:43 CEST] Transferrer: Uploaded 111_about..brown.mp4
+
+WORM-s2764724-m1398386941--Learning SketchUp 2013%10_freehand-tool.mp4
+       32768   1%    0.00kB/s    0:00:00
+     2764724 100%    5.18MB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 2765211 bytes  received 42 bytes  1843502.00 bytes/sec
+total size is 2764724  speedup is 1.00
+[2014-05-25 21:44:45 CEST] Transferrer: Uploaded 10_freeha..-tool.mp4
+remote: merge git-annex 
+WORM-s6834151-m1398385049--Learning SketchUp 2013%109_updating-the-model-references.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  61%    3.81MB/s    0:00:00
+     6834151 100%    3.46MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:44:47 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   eefc387..dc4c11c  git-annex -> synced/git-annex
+
+sent 6835151 bytes  received 42 bytes  1952912.29 bytes/sec
+total size is 6834151  speedup is 1.00
+[2014-05-25 21:44:48 CEST] Transferrer: Uploaded 109_updat..ences.mp4
+
+WORM-s6878166-m1398386493--Learning SketchUp 2013%108_adding-additional-pages-and-content.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4259840  61%    3.87MB/s    0:00:00
+     6878166 100%    3.80MB/s    0:00:01 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   310d31e..e2f5d0d  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at dc4c11c618002775bb0e8dcf4b132113c40875ed but expected eefc387772b3e6ba46f51fbecd86cdabcd27db96
+ ! eefc387..dc4c11c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 6879176 bytes  received 42 bytes  1965490.86 bytes/sec
+total size is 6878166  speedup is 1.00
+[2014-05-25 21:44:51 CEST] Transferrer: Uploaded 108_addin..ntent.mp4
+
+WORM-s8253246-m1398386838--Learning SketchUp 2013%106_adjusting-the-model-settings.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:44:52 CEST] Pusher: Syncing with diskstation 
+     2588672  31%    2.32MB/s    0:00:02
+     4554752  55%    2.10MB/s    0:00:01
+     8093696  98%    2.51MB/s    0:00:00
+     8253246 100%    2.52MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 8254417 bytes  received 42 bytes  1834324.22 bytes/sec
+total size is 8253246  speedup is 1.00
+[2014-05-25 21:44:55 CEST] Transferrer: Uploaded 106_adjus..tings.mp4
+
+WORM-s5364896-m1398386068--Learning SketchUp 2013%105_what-is-layout.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4816896  89%    4.56MB/s    0:00:00
+     5364896 100%    4.39MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 5365701 bytes  received 42 bytes  2146297.20 bytes/sec
+total size is 5364896  speedup is 1.00
+[2014-05-25 21:44:58 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:44:58 CEST] Transferrer: Uploaded 105_what-..ayout.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   dc4c11c..a19dfa9  git-annex -> synced/git-annex
+
+WORM-s7390741-m1398386693--Learning SketchUp 2013%104_post-processing-in-photoshop.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4227072  57%    3.91MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e2f5d0d..73400d3  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at a19dfa9bd0b4aee28bf67773a9f578a9bb94f2e9 but expected dc4c11c618002775bb0e8dcf4b132113c40875ed
+ ! dc4c11c..a19dfa9  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     7241728  97%    3.34MB/s    0:00:00
+     7390741 100%    3.35MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 7391808 bytes  received 42 bytes  1642633.33 bytes/sec
+total size is 7390741  speedup is 1.00
+[2014-05-25 21:45:02 CEST] Transferrer: Uploaded 104_post-..oshop.mp4
+
+WORM-s12544086-m1398385948--Learning SketchUp 2013%103_rendering-a-high-quality-image.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:45:03 CEST] Pusher: Syncing with diskstation 
+     4292608  34%    3.96MB/s    0:00:02
+     7307264  58%    3.39MB/s    0:00:01
+     9535488  76%    2.97MB/s    0:00:00
+remote: merge git-annex     12419072  99%    2.91MB/s    0:00:00
+    12544086 100%    2.90MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 12545784 bytes  received 42 bytes  2281059.27 bytes/sec
+total size is 12544086  speedup is 1.00
+[2014-05-25 21:45:07 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:45:07 CEST] Transferrer: Uploaded 103_rende..image.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a19dfa9..96ceb2c  git-annex -> synced/git-annex
+
+WORM-s6567293-m1398384854--Learning SketchUp 2013%102_model-presets-create-a-preview-rendering.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4128768  62%    3.83MB/s    0:00:00
+     6567293 100%    3.26MB/s    0:00:01 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   73400d3..3e5d1b8  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 96ceb2c0e06ff0f1372950ab38c2aa2ebb0f00d7 but expected a19dfa9bd0b4aee28bf67773a9f578a9bb94f2e9
+ ! a19dfa9..96ceb2c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 6568272 bytes  received 42 bytes  1876661.14 bytes/sec
+total size is 6567293  speedup is 1.00
+[2014-05-25 21:45:11 CEST] Transferrer: Uploaded 102_model..ering.mp4
+
+WORM-s8030582-m1398385367--Learning SketchUp 2013%101_add-reflections-to-existing-textures.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4423680  55%    4.18MB/s    0:00:00
+[2014-05-25 21:45:12 CEST] Pusher: Syncing with diskstation 
+     7569408  94%    3.54MB/s    0:00:00
+     8030582 100%    3.53MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 8031737 bytes  received 42 bytes  2294794.00 bytes/sec
+total size is 8030582  speedup is 1.00
+[2014-05-25 21:45:14 CEST] Transferrer: Uploaded 101_add-r..tures.mp4
+
+WORM-s13509940-m1398384818--Learning SketchUp 2013%100_adding-lighting.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4587520  33%    4.25MB/s    0:00:02
+remote: merge git-annex      7831552  57%    3.62MB/s    0:00:01
+    10420224  77%    3.24MB/s    0:00:00
+[2014-05-25 21:45:18 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   96ceb2c..a5f9c8b  git-annex -> synced/git-annex
+    13509940 100%    3.28MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 13511743 bytes  received 42 bytes  2456688.18 bytes/sec
+total size is 13509940  speedup is 1.00
+[2014-05-25 21:45:19 CEST] Transferrer: Uploaded 100_addin..hting.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   3e5d1b8..6ea05e0  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at a5f9c8b9874d4d3fe571687365c391050325bc87 but expected 96ceb2c0e06ff0f1372950ab38c2aa2ebb0f00d7
+ ! 96ceb2c..a5f9c8b  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s6047748-m1398386548--Learning SketchUp 2013%09_arc-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4751360  78%    4.47MB/s    0:00:00
+     6047748 100%    4.50MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 6048630 bytes  received 42 bytes  2419468.80 bytes/sec
+total size is 6047748  speedup is 1.00
+[2014-05-25 21:45:22 CEST] Pusher: Syncing with diskstation 
+[2014-05-25 21:45:22 CEST] Transferrer: Uploaded 09_arc-tool.mp4
+
+WORM-s7257160-m1398385203--Learning SketchUp 2013%08_polygon-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5079040  69%    4.65MB/s    0:00:00
+remote: merge git-annex      7257160 100%    4.35MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:45:25 CEST] RemoteControl: Syncing with diskstation 
+
+sent 7258194 bytes  received 42 bytes  2073781.71 bytes/sec
+total size is 7257160  speedup is 1.00
+[2014-05-25 21:45:25 CEST] Transferrer: Uploaded 08_polygon-tool.mp4
+
+WORM-s6789048-m1398386463--Learning SketchUp 2013%07_circle-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a5f9c8b..05787b8  git-annex -> synced/git-annex
+     2654208  39%    2.46MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   6ea05e0..b78228d  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 05787b8b7c6dd1aad45fdb0a019a2ed5e56b26bb but expected a5f9c8b9874d4d3fe571687365c391050325bc87
+ ! a5f9c8b..05787b8  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:45:28 CEST] RemoteControl: Syncing with diskstation 
+     5013504  73%    2.35MB/s    0:00:00
+     6789048 100%    2.62MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 6790025 bytes  received 42 bytes  1940019.14 bytes/sec
+total size is 6789048  speedup is 1.00
+[2014-05-25 21:45:29 CEST] Transferrer: Uploaded 07_circle-tool.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   b78228d..f1fd60c  git-annex  -> diskstation/git-annex
+
+WORM-s3766669-m1398384958--Learning SketchUp 2013%06_rectangle-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:45:31 CEST] Pusher: Syncing with diskstation 
+     3702784  98%    2.95MB/s    0:00:00
+     3766669 100%    3.00MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 3767277 bytes  received 42 bytes  1506927.60 bytes/sec
+total size is 3766669  speedup is 1.00
+[2014-05-25 21:45:31 CEST] Transferrer: Uploaded 06_rectan..-tool.mp4
+
+WORM-s5571735-m1398386867--Learning SketchUp 2013%05_line-tool.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5144576  92%    4.78MB/s    0:00:00
+     5571735 100%    4.70MB/s    0:00:01 (xfer#1, to-check=0/1)
+remote: merge git-annex 
+sent 5572562 bytes  received 42 bytes  2229041.60 bytes/sec
+total size is 5571735  speedup is 1.00
+[2014-05-25 21:45:33 CEST] Transferrer: Uploaded 05_line-tool.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+[2014-05-25 21:45:35 CEST] RemoteConTo joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+trol: Syncing with diskstati   05787b8..2a723a6  ogit-annex -> synced/git-annexn
+ 
+
+WORM-s13796050-m1398386633--Learning SketchUp 2013%04_how-to-access-your-working-files.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4915200  35%    4.65MB/s    0:00:01
+     8159232  59%    3.77MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f1fd60c..bdd7ed6  git-annex  -> diskstation/git-annex
+    11304960  81%    3.45MB/s    0:00:00
+    13796050 100%    3.57MB/s    0:00:03 (xfer#1, to-check=0/1)
+[2014-05-25 21:45:38 CEST] Pusher: Syncing with diskstation 
+
+sent 13797905 bytes  received 42 bytes  2508717.64 bytes/sec
+total size is 13796050  speedup is 1.00
+[2014-05-25 21:45:39 CEST] Transferrer: Uploaded 04_how-to..files.mp4
+
+WORM-s5852944-m1398386582--Learning SketchUp 2013%03_setting-up-the-toolbars.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4947968  84%    4.65MB/s    0:00:00
+     5852944 100%    4.42MB/s    0:00:01 (xfer#1, to-check=0/1)
+remote: merge git-annex [2014-05-25 21:45:42 CEST] RemoteControl: Syncing with diskstation 
+
+sent 5853817 bytes  received 42 bytes  2341543.60 bytes/sec
+total size is 5852944  speedup is 1.00
+[2014-05-25 21:45:42 CEST] Transferrer: Uploaded 03_settin..lbars.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2a723a6..dc76c23  git-annex -> synced/git-annex
+
+WORM-s3829366-m1398386198--Learning SketchUp 2013%02_setting-up-the-template.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3829366 100%    4.68MB/s    0:00:00 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   bdd7ed6..84f8e25  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at dc76c234409bd5cfac50be70dd21ef8be88aed9b but expected 2a723a6697455228d8b2e95a7015aafb4be4f003
+ ! 2a723a6..dc76c23  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 3829991 bytes  received 42 bytes  1532013.20 bytes/sec
+total size is 3829366  speedup is 1.00
+[2014-05-25 21:45:45 CEST] Transferrer: Uploaded 02_settin..plate.mp4
+
+WORM-s6528377-m1398386753--Learning SketchUp 2013%01_introduction.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4718592  72%    4.42MB/s    0:00:00
+[2014-05-25 21:45:47 CEST] Pusher: Syncing with diskstation 
+     6528377 100%    3.21MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 6529323 bytes  received 42 bytes  2611746.00 bytes/sec
+total size is 6528377  speedup is 1.00
+[2014-05-25 21:45:48 CEST] Transferrer: Uploaded 01_introduction.mp4
+
+WORM-s5900041-m1398386278--Learning SketchUp 2013%99_saving-the-image.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5079040  86%    4.72MB/s    0:00:00
+     5900041 100%    4.60MB/s    0:00:01 (xfer#1, to-check=0/1)
+remote: merge git-annex 
+sent 5900915 bytes  received 42 bytes  2360382.80 bytes/sec
+total size is 5900041  speedup is 1.00
+[2014-05-25 21:45:50 CEST] Transferrer: Uploaded 99_saving..image.mp4
+
+WORM-s7221607-m1398385119--Learning SketchUp 2013%98_multiply-and-opacity.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:45:52 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   dc76c23..60c1e82  git-annex -> synced/git-annex
+     4456448  61%    4.07MB/s    0:00:00
+     7221607 100%    4.25MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 7222645 bytes  received 42 bytes  2889074.80 bytes/sec
+total size is 7221607  speedup is 1.00
+[2014-05-25 21:45:54 CEST] Transferrer: Uploaded 98_multip..acity.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   84f8e25..3261510  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 60c1e827e829b642d4618889b425c0bfc259b2c9 but expected dc76c234409bd5cfac50be70dd21ef8be88aed9b
+ ! dc76c23..60c1e82  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s6262129-m1398386258--Learning SketchUp 2013%97_stacking-images-in-photoshop.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4947968  79%    4.69MB/s    0:00:00
+     6262129 100%    4.40MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:45:56 CEST] Pusher: Syncing with diskstation 
+
+sent 6263059 bytes  received 42 bytes  2505240.40 bytes/sec
+total size is 6262129  speedup is 1.00
+[2014-05-25 21:45:56 CEST] Transferrer: Uploaded 97_stacki..oshop.mp4
+
+WORM-s9298049-m1398385793--Learning SketchUp 2013%96_export-display-options.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5177344  55%    4.84MB/s    0:00:00
+remote: merge git-annex      8519680  91%    4.01MB/s    0:00:00
+     9298049 100%    3.97MB/s    0:00:02 (xfer#1, to-check=0/1)
+[2014-05-25 21:46:00 CEST] RemoteControl: Syncing with diskstation 
+
+sent 9299341 bytes  received 42 bytes  2656966.57 bytes/sec
+total size is 9298049  speedup is 1.00
+[2014-05-25 21:46:00 CEST] Transferrer: Uploaded 96_export..tions.mp4
+
+WORM-s7895136-m1398385533--Learning SketchUp 2013%95_add-final-touches.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   60c1e82..f08968c  git-annex -> synced/git-annex
+     4325376  54%    4.06MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   3261510..c9b4dc3  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at f08968c15cbe86c49c1fb71f22f578ad7cecd680 but expected 60c1e827e829b642d4618889b425c0bfc259b2c9
+ ! 60c1e82..f08968c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:46:02 CEST] RemoteControl: Syncing with diskstation 
+     7895136 100%    3.99MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 7896251 bytes  received 42 bytes  2256083.71 bytes/sec
+total size is 7895136  speedup is 1.00
+[2014-05-25 21:46:03 CEST] Transferrer: Uploaded 95_add-fi..uches.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c9b4dc3..78519cd  git-annex  -> diskstation/git-annex
+
+WORM-s13569035-m1398385318--Learning SketchUp 2013%94_animation-options.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5373952  39%    5.00MB/s    0:00:01
+[2014-05-25 21:46:05 CEST] Pusher: Syncing with diskstation 
+     9437184  69%    4.45MB/s    0:00:00
+    13565952  99%    4.26MB/s    0:00:00
+    13569035 100%    4.26MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 13570847 bytes  received 42 bytes  3015753.11 bytes/sec
+total size is 13569035  speedup is 1.00
+[2014-05-25 21:46:07 CEST] Transferrer: Uploaded 94_animat..tions.mp4
+
+WORM-s8278464-m1398386213--Learning SketchUp 2013%93_collada-files.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5341184  64%    4.98MB/s    0:00:00
+     8278464 100%    4.37MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:46:10 CEST] RemoteControl: Syncing with diskstation 
+
+sent 8279623 bytes  received 42 bytes  2365618.57 bytes/sec
+total size is 8278464  speedup is 1.00
+[2014-05-25 21:46:10 CEST] Transferrer: Uploaded 93_collad..files.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f08968c..f99a466  git-annex -> synced/git-annex
+
+WORM-s8934010-m1398386414--Learning SketchUp 2013%92_kmz-for-google-earth.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4784128  53%    4.43MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   78519cd..e30d06f  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at f99a466d7568addbbc99cb058f66a2c03c571fba but expected f08968c15cbe86c49c1fb71f22f578ad7cecd680
+ ! f08968c..f99a466  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     8934010 100%    4.24MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 8935256 bytes  received 42 bytes  2552942.29 bytes/sec
+total size is 8934010  speedup is 1.00
+[2014-05-25 21:46:13 CEST] Transferrer: Uploaded 92_kmz-fo..earth.mp4
+
+WORM-s9716042-m1398384915--Learning SketchUp 2013%91_dwg-elevation-and-plan-pro-feature.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5341184  54%    5.00MB/s    0:00:00
+[2014-05-25 21:46:15 CEST] Pusher: Syncing with diskstation 
+     9371648  96%    4.39MB/s    0:00:00
+     9716042 100%    4.44MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 9717398 bytes  received 42 bytes  2776411.43 bytes/sec
+total size is 9716042  speedup is 1.00
+[2014-05-25 21:46:16 CEST] Transferrer: Uploaded 91_dwg-el..ature.mp4
+
+WORM-s14343030-m1398386888--Learning SketchUp 2013%90_jpeg-and-png-files.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5079040  35%    4.81MB/s    0:00:01
+     9535488  66%    4.50MB/s    0:00:01
+[2014-05-25 21:46:19 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f99a466..af84b87  git-annex -> synced/git-annex
+    13565952  94%    4.25MB/s    0:00:00
+    14343030 100%    3.99MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 14344935 bytes  received 42 bytes  2608177.64 bytes/sec
+total size is 14343030  speedup is 1.00
+[2014-05-25 21:46:21 CEST] Transferrer: Uploaded 90_jpeg-a..files.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e30d06f..c6bcde6  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at af84b876d0902aa7da89ca414becf5b9d98d8a19 but expected f99a466d7568addbbc99cb058f66a2c03c571fba
+ ! f99a466..af84b87  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s10692771-m1398385558--Learning SketchUp 2013%89_creating-the-animation.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5341184  49%    4.94MB/s    0:00:01
+[2014-05-25 21:46:23 CEST] Pusher: Syncing with diskstation 
+     9535488  89%    4.43MB/s    0:00:00
+    10692771 100%    4.41MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 10694236 bytes  received 42 bytes  3055508.00 bytes/sec
+total size is 10692771  speedup is 1.00
+[2014-05-25 21:46:24 CEST] Transferrer: Uploaded 89_creati..ation.mp4
+
+WORM-s14320839-m1398385514--Learning SketchUp 2013%88_creating-a-group.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5308416  37%    5.02MB/s    0:00:01
+remote: merge git-annex      9469952  66%    4.47MB/s    0:00:01
+    13631488  95%    4.28MB/s    0:00:00
+    14320839 100%    4.31MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 14322742 bytes  received 42 bytes  3182840.89 bytes/sec
+total size is 14320839  speedup is 1.00
+[2014-05-25 21:46:28 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:46:28 CEST] Transferrer: Uploaded 88_creati..group.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   af84b87..7f1137a  git-annex -> synced/git-annex
+
+WORM-s20730987-m1398385414--Learning SketchUp 2013%87_section-cut-for-interior-elevations.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5341184  25%    4.91MB/s    0:00:03
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c6bcde6..a8341a2  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7f1137a28d8b17c5cdc10e856578da6337d1143c but expected af84b876d0902aa7da89ca414becf5b9d98d8a19
+ ! af84b87..7f1137a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     9371648  45%    4.38MB/s    0:00:02
+    13860864  66%    4.33MB/s    0:00:01
+[2014-05-25 21:46:33 CEST] Pusher: Syncing with diskstation 
+    18055168  87%    4.23MB/s    0:00:00
+    20730987 100%    4.19MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 20733689 bytes  received 42 bytes  3189804.77 bytes/sec
+total size is 20730987  speedup is 1.00
+[2014-05-25 21:46:35 CEST] Transferrer: Uploaded 87_sectio..tions.mp4
+
+WORM-s21661288-m1398385144--Learning SketchUp 2013%86_scenes-for-animation.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5177344  23%    4.89MB/s    0:00:03
+     9404416  43%    4.46MB/s    0:00:02
+[2014-05-25 21:46:38 CEST] RemoteControl: Syncing with diskstation 
+    13631488  62%    4.28MB/s    0:00:01
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7f1137a..9338de4  git-annex -> synced/git-annex
+    17170432  79%    4.04MB/s    0:00:01
+    20905984  96%    3.69MB/s    0:00:00
+    21661288 100%    3.90MB/s    0:00:05 (xfer#1, to-check=0/1)
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a8341a2..72c4e65  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 9338de4e5a82415622d40ef588287666f8757fc0 but expected 7f1137a28d8b17c5cdc10e856578da6337d1143c
+ ! 7f1137a..9338de4  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+sent 21664091 bytes  received 42 bytes  3332943.54 bytes/sec
+total size is 21661288  speedup is 1.00
+[2014-05-25 21:46:41 CEST] Transferrer: Uploaded 86_scenes..ation.mp4
+
+WORM-s23994784-m1398385930--Learning SketchUp 2013%85_styles.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5177344  21%    4.83MB/s    0:00:03
+[2014-05-25 21:46:42 CEST] Pusher: Syncing with diskstation 
+     9371648  39%    4.39MB/s    0:00:03
+    13565952  56%    4.26MB/s    0:00:02
+    17661952  73%    4.17MB/s    0:00:01
+remote: merge git-annex     21856256  91%    3.94MB/s    0:00:00
+    23994784 100%    4.08MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 23997857 bytes  received 42 bytes  3691984.46 bytes/sec
+total size is 23994784  speedup is 1.00
+[2014-05-25 21:46:48 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:46:48 CEST] Transferrer: Uploaded 85_styles.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   9338de4..47c3025  git-annex -> synced/git-annex
+
+WORM-s9421737-m1398386334--Learning SketchUp 2013%84_creating-scenes-and-updating.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4128768  43%    3.80MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   72c4e65..3862dfd  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 47c3025b26597ab96c6553b17d40df2473761367 but expected 9338de4e5a82415622d40ef588287666f8757fc0
+ ! 9338de4..47c3025  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     7045120  74%    3.29MB/s    0:00:00
+     9421737 100%    3.42MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 9423051 bytes  received 42 bytes  2094020.67 bytes/sec
+total size is 9421737  speedup is 1.00
+[2014-05-25 21:46:52 CEST] Transferrer: Uploaded 84_creati..ating.mp4
+
+WORM-s15890796-m1398387058--Learning SketchUp 2013%83_add-solar-panels-with-skelion-plugin.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3932160  24%    3.64MB/s    0:00:03
+[2014-05-25 21:46:54 CEST] Pusher: Syncing with diskstation 
+     8093696  50%    3.80MB/s    0:00:02
+    11304960  71%    3.54MB/s    0:00:01
+    14516224  91%    3.40MB/s    0:00:00
+    15890796 100%    3.45MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 15892907 bytes  received 42 bytes  2889627.09 bytes/sec
+total size is 15890796  speedup is 1.00
+[2014-05-25 21:46:58 CEST] Transferrer: Uploaded 83_add-so..lugin.mp4
+remote: merge git-annex 
+WORM-s9278449-m1398386852--Learning SketchUp 2013%82_using-3d-text.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5439488  58%    5.07MB/s    0:00:00
+     9278449 100%    4.51MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:47:00 CEST] RemoteControl: Syncing with diskstation 
+
+sent 9279732 bytes  received 42 bytes  3711909.60 bytes/sec
+total size is 9278449  speedup is 1.00
+[2014-05-25 21:47:00 CEST] Transferrer: Uploaded 82_using-..-text.mp4
+
+WORM-s11983231-m1398385259--Learning SketchUp 2013%81_get-photo-google-street-view.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   47c3025..a7b0dc9  git-annex -> synced/git-annex
+     5079040  42%    4.63MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   3862dfd..5f94bb2  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at a7b0dc9c64973369eb06a57d14ed6e64ec20fa07 but expected 47c3025b26597ab96c6553b17d40df2473761367
+ ! 47c3025..a7b0dc9  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:47:03 CEST] RemoteControl: Syncing with diskstation 
+     9404416  78%    4.32MB/s    0:00:00
+    11983231 100%    4.36MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 11984858 bytes  received 42 bytes  2663311.11 bytes/sec
+total size is 11983231  speedup is 1.00
+[2014-05-25 21:47:04 CEST] Transferrer: Uploaded 81_get-ph..-view.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5f94bb2..521740c  git-annex  -> diskstation/git-annex
+
+WORM-s10154793-m1398385298--Learning SketchUp 2013%80_adding-context.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5242880  51%    4.94MB/s    0:00:00
+[2014-05-25 21:47:06 CEST] Pusher: Syncing with diskstation 
+     9437184  92%    4.40MB/s    0:00:00
+    10154793 100%    4.41MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 10156182 bytes  received 42 bytes  2901778.29 bytes/sec
+total size is 10154793  speedup is 1.00
+[2014-05-25 21:47:07 CEST] Transferrer: Uploaded 80_adding..ntext.mp4
+
+WORM-s15455988-m1398386244--Learning SketchUp 2013%79_creating-the-front-facade.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5308416  34%    4.93MB/s    0:00:02
+remote: merge git-annex      9306112  60%    4.38MB/s    0:00:01
+    12124160  78%    3.73MB/s    0:00:00
+[2014-05-25 21:47:12 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a7b0dc9..7a6f85f  git-annex -> synced/git-annex
+    13434880  86%    3.11MB/s    0:00:00
+    15455988 100%    3.14MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 15458036 bytes  received 42 bytes  2810559.64 bytes/sec
+total size is 15455988  speedup is 1.00
+[2014-05-25 21:47:13 CEST] Transferrer: Uploaded 79_creati..acade.mp4
+
+WORM-s7511926-m1398385903--Learning SketchUp 2013%78_reset-axis-to-align-building.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   521740c..57437fb  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7a6f85f7864920fbcac361f47558fc352f1d2d16 but expected a7b0dc9c64973369eb06a57d14ed6e64ec20fa07
+ ! a7b0dc9..7a6f85f  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     4554752  60%    4.27MB/s    0:00:00
+     7511926 100%    4.13MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:47:16 CEST] Pusher: Syncing with diskstation 
+
+sent 7513008 bytes  received 42 bytes  2146585.71 bytes/sec
+total size is 7511926  speedup is 1.00
+[2014-05-25 21:47:16 CEST] Transferrer: Uploaded 78_reset-..lding.mp4
+
+WORM-s9197360-m1398386099--Learning SketchUp 2013%77_setting-the-building-in-place-geolocation.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4521984  49%    4.04MB/s    0:00:01
+remote: merge git-annex      7962624  86%    3.66MB/s    0:00:00
+     9197360 100%    3.73MB/s    0:00:02 (xfer#1, to-check=0/1)
+[2014-05-25 21:47:21 CEST] RemoteControl: Syncing with diskstation 
+
+sent 9198659 bytes  received 42 bytes  2628200.29 bytes/sec
+total size is 9197360  speedup is 1.00
+[2014-05-25 21:47:21 CEST] Transferrer: Uploaded 77_settin..ation.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7a6f85f..7457693  git-annex -> synced/git-annex
+
+WORM-s11971891-m1398387083--Learning SketchUp 2013%76_creating-the-exterior.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4784128  39%    4.52MB/s    0:00:01
+     8355840  69%    3.95MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   57437fb..394b254  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7457693b085f06be2a38cfaafb7c76b34eb62960 but expected 7a6f85f7864920fbcac361f47558fc352f1d2d16
+ ! 7a6f85f..7457693  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    11971891 100%    4.15MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 11973511 bytes  received 42 bytes  3421015.14 bytes/sec
+total size is 11971891  speedup is 1.00
+[2014-05-25 21:47:25 CEST] Transferrer: Uploaded 76_creati..erior.mp4
+[2014-05-25 21:47:26 CEST] Pusher: Syncing with diskstation 
+
+WORM-s6407146-m1398386568--Learning SketchUp 2013%75_saving-and-placing-into-the-model.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4390912  68%    4.14MB/s    0:00:00
+     6324224  98%    2.99MB/s    0:00:00
+     6407146 100%    3.02MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 6408097 bytes  received 42 bytes  1830896.86 bytes/sec
+total size is 6407146  speedup is 1.00
+[2014-05-25 21:47:28 CEST] Transferrer: Uploaded 75_saving..model.mp4
+
+WORM-s8962345-m1398386088--Learning SketchUp 2013%74_adding-detail-chapter-13.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5144576  57%    4.78MB/s    0:00:00
+     8962345 100%    4.67MB/s    0:00:01 (xfer#1, to-check=0/1)
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+
+sent 8963599 bytes  received 42 bytes  2561040.29 bytes/sec
+total size is 8962345  speedup is 1.00
+   7457693..ea4b518  git-annex -> synced/git-annex
+[2014-05-25 21:47:31 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:47:31 CEST] Transferrer: Uploaded 74_adding..er-13.mp4
+
+WORM-s7160845-m1398385888--Learning SketchUp 2013%73_applying-textures.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4816896  67%    4.45MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   394b254..c52b780  git-annex  -> diskstation/git-annex
+     7160845 100%    4.44MB/s    0:00:01 (xfer#1, to-check=0/1)
+
+sent 7161872 bytes  received 42 bytes  2046261.14 bytes/sec
+total size is 7160845  speedup is 1.00
+[2014-05-25 21:47:34 CEST] Transferrer: Uploaded 73_applyi..tures.mp4
+
+WORM-s11661338-m1398385993--Learning SketchUp 2013%72_creating-the-massing-model.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:47:35 CEST] Pusher: Syncing with diskstation 
+     5341184  45%    4.97MB/s    0:00:01
+     8028160  68%    3.71MB/s    0:00:00
+     9601024  82%    2.97MB/s    0:00:00
+    11661338 100%    3.00MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 11662923 bytes  received 42 bytes  2120539.09 bytes/sec
+total size is 11661338  speedup is 1.00
+[2014-05-25 21:47:39 CEST] Transferrer: Uploaded 72_creati..model.mp4
+
+WORM-s18351413-m1398385439--Learning SketchUp 2013%71_setting-up-to-match-a-new-photo.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4816896  26%    4.56MB/s    0:00:02
+     8945664  48%    4.23MB/s    0:00:02
+[2014-05-25 21:47:42 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ea4b518..d1f5994  git-annex -> synced/git-annex
+    13467648  73%    4.25MB/s    0:00:01
+    17104896  93%    4.04MB/s    0:00:00
+    18351413 100%    4.03MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 18353823 bytes  received 42 bytes  3337066.36 bytes/sec
+total size is 18351413  speedup is 1.00
+[2014-05-25 21:47:44 CEST] Transferrer: Uploaded 71_settin..photo.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c52b780..c25cca9  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at d1f5994466b35d4c32ad5a9bbb9dd071e461e3e2 but expected ea4b518d3f3234433b2819aa9965b5613366f1bb
+ ! ea4b518..d1f5994  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s13344990-m1398385353--Learning SketchUp 2013%70_creating-a-library.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3506176  26%    3.17MB/s    0:00:03
+[2014-05-25 21:47:47 CEST] Pusher: Syncing with diskstation 
+     6914048  51%    3.20MB/s    0:00:01
+    11337728  84%    3.52MB/s    0:00:00
+    13344990 100%    3.56MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 13346775 bytes  received 42 bytes  2426694.00 bytes/sec
+total size is 13344990  speedup is 1.00
+[2014-05-25 21:47:49 CEST] Transferrer: Uploaded 70_creati..brary.mp4
+
+WORM-s9842222-m1398386008--Learning SketchUp 2013%69_using-the-podium-browser.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5275648  53%    4.88MB/s    0:00:00
+     8323072  84%    3.89MB/s    0:00:00
+     9842222 100%    3.92MB/s    0:00:02 (xfer#1, to-check=0/1)
+[2014-05-25 21:47:52 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   d1f5994..33198fa  git-annex -> synced/git-annex
+
+sent 9843584 bytes  received 42 bytes  2812464.57 bytes/sec
+total size is 9842222  speedup is 1.00
+[2014-05-25 21:47:53 CEST] Transferrer: Uploaded 69_using-..owser.mp4
+
+WORM-s11662587-m1398385968--Learning SketchUp 2013%68_using-form-fonts.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4653056  39%    4.33MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c25cca9..2496e60  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 33198fa7a8195245180bb53efbdec32359506368 but expected d1f5994466b35d4c32ad5a9bbb9dd071e461e3e2
+ ! d1f5994..33198fa  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     9437184  80%    4.41MB/s    0:00:00
+    11662587 100%    4.32MB/s    0:00:02 (xfer#1, to-check=0/1)
+[2014-05-25 21:47:57 CEST] Pusher: Syncing with diskstation 
+
+sent 11664162 bytes  received 42 bytes  3332629.71 bytes/sec
+total size is 11662587  speedup is 1.00
+[2014-05-25 21:47:57 CEST] Transferrer: Uploaded 68_using-..fonts.mp4
+
+WORM-s8289672-m1398385702--Learning SketchUp 2013%67_using-the-3d-warehouse.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5439488  65%    4.99MB/s    0:00:00
+remote: merge git-annex      8289672 100%    4.48MB/s    0:00:01 (xfer#1, to-check=0/1)
+[2014-05-25 21:48:00 CEST] RemoteControl: Syncing with diskstation 
+
+sent 8290840 bytes  received 42 bytes  3316352.80 bytes/sec
+total size is 8289672  speedup is 1.00
+[2014-05-25 21:48:00 CEST] Transferrer: Uploaded 67_using-..house.mp4
+
+WORM-s12841748-m1398385284--Learning SketchUp 2013%66_adding-the-fridge-and-sink.mp4
+       32768   0%    0.00kB/s    0:00:00
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   33198fa..f4258a2  git-annex -> synced/git-annex
+     3899392  30%    3.62MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   2496e60..8f91b25  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at f4258a2cd12ee4f23f3a9c9b9c635b9d59075f21 but expected 33198fa7a8195245180bb53efbdec32359506368
+ ! 33198fa..f4258a2  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:48:03 CEST] RemoteControl: Syncing with diskstation 
+     7897088  61%    3.69MB/s    0:00:01
+    11698176  91%    3.66MB/s    0:00:00
+    12841748 100%    3.72MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 12843477 bytes  received 42 bytes  2335185.27 bytes/sec
+total size is 12841748  speedup is 1.00
+[2014-05-25 21:48:05 CEST] Transferrer: Uploaded 66_adding..-sink.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8f91b25..c4dc443  git-annex  -> diskstation/git-annex
+
+WORM-s15640646-m1398385334--Learning SketchUp 2013%65_adding-appliances.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5505024  35%    5.08MB/s    0:00:01
+[2014-05-25 21:48:07 CEST] Pusher: Syncing with diskstation 
+     9601024  61%    4.50MB/s    0:00:01
+    13860864  88%    4.32MB/s    0:00:00
+    15640646 100%    4.28MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 15642710 bytes  received 42 bytes  3476167.11 bytes/sec
+total size is 15640646  speedup is 1.00
+[2014-05-25 21:48:09 CEST] Transferrer: Uploaded 65_adding..ances.mp4
+
+WORM-s14906076-m1398385849--Learning SketchUp 2013%64_adding-materials.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4620288  30%    4.38MB/s    0:00:02
+[2014-05-25 21:48:12 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   f4258a2..89ce825  git-annex -> synced/git-annex
+     7700480  51%    3.61MB/s    0:00:01
+    10649600  71%    3.30MB/s    0:00:01
+    13467648  90%    3.13MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c4dc443..6fdf232  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 89ce825f4a57b9bc5490b2c0f7dc77e9b3cf0016 but expected f4258a2cd12ee4f23f3a9c9b9c635b9d59075f21
+ ! f4258a2..89ce825  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    14906076 100%    3.07MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 14908047 bytes  received 42 bytes  2293552.15 bytes/sec
+total size is 14906076  speedup is 1.00
+[2014-05-25 21:48:15 CEST] Transferrer: Uploaded 64_adding..rials.mp4
+
+WORM-s9700735-m1398385733--Learning SketchUp 2013%63_creating-the-countertop.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4554752  46%    4.18MB/s    0:00:01
+[2014-05-25 21:48:17 CEST] Pusher: Syncing with diskstation 
+     7569408  78%    3.53MB/s    0:00:00
+     9700735 100%    3.40MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 9702080 bytes  received 42 bytes  2156027.11 bytes/sec
+total size is 9700735  speedup is 1.00
+[2014-05-25 21:48:19 CEST] Transferrer: Uploaded 63_creati..ertop.mp4
+
+WORM-s15089043-m1398386778--Learning SketchUp 2013%62_cabinet-doors.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      4456448  29%    4.05MB/s    0:00:02
+     7340032  48%    3.36MB/s    0:00:02
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   89ce825..be1967a  git-annex -> synced/git-annex
+[2014-05-25 21:48:22 CEST] RemoteControl: Syncing with diskstation 
+    10223616  67%    3.12MB/s    0:00:01
+    13369344  88%    3.08MB/s    0:00:00
+    15089043 100%    3.02MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 15091035 bytes  received 42 bytes  2321704.15 bytes/sec
+total size is 15089043  speedup is 1.00
+[2014-05-25 21:48:25 CEST] Transferrer: Uploaded 62_cabine..doors.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   6fdf232..5d94435  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at be1967a15a951b38c76e4e8f674812a01df4c8c8 but expected 89ce825f4a57b9bc5490b2c0f7dc77e9b3cf0016
+ ! 89ce825..be1967a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s10872872-m1398384973--Learning SketchUp 2013%61_wall-cabinets.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4194304  38%    3.90MB/s    0:00:01
+[2014-05-25 21:48:27 CEST] Pusher: Syncing with diskstation 
+     7208960  66%    3.34MB/s    0:00:01
+    10190848  93%    3.16MB/s    0:00:00
+    10872872 100%    3.14MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 10874348 bytes  received 42 bytes  2416531.11 bytes/sec
+total size is 10872872  speedup is 1.00
+remote: merge git-annex [2014-05-25 21:48:29 CEST] Transferrer: Uploaded 61_wall-c..inets.mp4
+
+WORM-s14169006-m1398385488--Learning SketchUp 2013%60_base-cabinets.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4292608  30%    3.96MB/s    0:00:02
+[2014-05-25 21:48:31 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   be1967a..0c0e83a  git-annex -> synced/git-annex
+     7143424  50%    3.29MB/s    0:00:02
+    10289152  72%    3.16MB/s    0:00:01
+    13139968  92%    3.03MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   5d94435..c7aef43  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 0c0e83a4b729ed1ef86e4854405ec752226bbd09 but expected be1967a15a951b38c76e4e8f674812a01df4c8c8
+ ! be1967a..0c0e83a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    14169006 100%    3.08MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 14170886 bytes  received 42 bytes  2180142.77 bytes/sec
+total size is 14169006  speedup is 1.00
+[2014-05-25 21:48:35 CEST] Transferrer: Uploaded 60_base-c..inets.mp4
+[2014-05-25 21:48:35 CEST] Pusher: Syncing with diskstation 
+
+WORM-s13699702-m1398385658--Learning SketchUp 2013%59_adding-textures.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4063232  29%    3.80MB/s    0:00:02
+remote: merge git-annex      7503872  54%    3.54MB/s    0:00:01
+    11599872  84%    3.65MB/s    0:00:00
+    13699702 100%    3.75MB/s    0:00:03 (xfer#1, to-check=0/1)
+[2014-05-25 21:48:41 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   0c0e83a..cd5b9c0  git-annex -> synced/git-annex
+
+sent 13701528 bytes  received 42 bytes  3044793.33 bytes/sec
+total size is 13699702  speedup is 1.00
+[2014-05-25 21:48:42 CEST] Transferrer: Uploaded 59_adding..tures.mp4
+
+WORM-s10444949-m1398386483--Learning SketchUp 2013%58_mantle-support.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5177344  49%    4.89MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c7aef43..e499593  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at cd5b9c01988d7c7b10730356ed55cc8b1422ce52 but expected 0c0e83a4b729ed1ef86e4854405ec752226bbd09
+ ! 0c0e83a..cd5b9c0  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     9175040  87%    4.34MB/s    0:00:00
+    10444949 100%    3.92MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 10446374 bytes  received 42 bytes  2984690.29 bytes/sec
+total size is 10444949  speedup is 1.00
+[2014-05-25 21:48:46 CEST] Transferrer: Uploaded 58_mantle..pport.mp4
+[2014-05-25 21:48:46 CEST] Pusher: Syncing with diskstation 
+
+WORM-s24021797-m1398385079--Learning SketchUp 2013%57_mantle-columns.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5079040  21%    4.81MB/s    0:00:03
+     9011200  37%    4.25MB/s    0:00:03
+    13041664  54%    4.09MB/s    0:00:02
+remote: merge git-annex     17006592  70%    3.97MB/s    0:00:01
+    20643840  85%    3.61MB/s    0:00:00
+[2014-05-25 21:48:52 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   cd5b9c0..7f4755f  git-annex -> synced/git-annex
+    23887872  99%    3.44MB/s    0:00:00
+    24021797 100%    3.69MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 24024882 bytes  received 42 bytes  3203323.20 bytes/sec
+total size is 24021797  speedup is 1.00
+[2014-05-25 21:48:53 CEST] Transferrer: Uploaded 57_mantle..lumns.mp4
+
+WORM-s20301926-m1398385822--Learning SketchUp 2013%56_building-the-mantle.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e499593..a7e1df5  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 7f4755fe1b2fbe86253a5854d83948a479df1302 but expected cd5b9c01988d7c7b10730356ed55cc8b1422ce52
+ ! cd5b9c0..7f4755f  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     4358144  21%    4.07MB/s    0:00:03
+[2014-05-25 21:48:55 CEST] Pusher: Syncing with diskstation 
+     7241728  35%    3.34MB/s    0:00:03
+    10125312  49%    3.14MB/s    0:00:03
+    13271040  65%    3.10MB/s    0:00:02
+remote: merge git-annex     16154624  79%    2.73MB/s    0:00:01
+    18972672  93%    2.74MB/s    0:00:00
+[2014-05-25 21:49:00 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   7f4755f..367f02c  git-annex -> synced/git-annex
+    20301926 100%    2.92MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 20304560 bytes  received 42 bytes  2388776.71 bytes/sec
+total size is 20301926  speedup is 1.00
+[2014-05-25 21:49:01 CEST] Transferrer: Uploaded 56_buildi..antle.mp4
+
+WORM-s15278630-m1398386298--Learning SketchUp 2013%55_starting-at-the-base.mp4
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a7e1df5..200c73f  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 367f02ceec6d27fdb719156715a8a24a9f0cc149 but expected 7f4755fe1b2fbe86253a5854d83948a479df1302
+ ! 7f4755f..367f02c  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     4653056  30%    4.41MB/s    0:00:02
+     7733248  50%    3.61MB/s    0:00:02
+[2014-05-25 21:49:04 CEST] Pusher: Syncing with diskstation 
+    10616832  69%    3.32MB/s    0:00:01
+    13500416  88%    3.14MB/s    0:00:00
+    15278630 100%    3.14MB/s    0:00:04 (xfer#1, to-check=0/1)
+remote: merge git-annex 
+sent 15280653 bytes  received 42 bytes  2350876.15 bytes/sec
+total size is 15278630  speedup is 1.00
+[2014-05-25 21:49:07 CEST] Transferrer: Uploaded 55_starti..-base.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   367f02c..e9cb764  git-annex -> synced/git-annex
+
+WORM-s17900868-m1398386914--Learning SketchUp 2013%54_using-the-window-feature.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:49:08 CEST] RemoteControl: Syncing with diskstation 
+     4718592  26%    4.44MB/s    0:00:02
+     8290304  46%    3.92MB/s    0:00:02
+    12189696  68%    3.85MB/s    0:00:01
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   200c73f..e2eb7b5  git-annex  -> diskstation/git-annex
+    16482304  92%    3.88MB/s    0:00:00
+    17900868 100%    3.91MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 17903215 bytes  received 42 bytes  2754347.23 bytes/sec
+total size is 17900868  speedup is 1.00
+[2014-05-25 21:49:13 CEST] Pusher: Syncing with diskstation 
+[2014-05-25 21:49:13 CEST] Transferrer: Uploaded 54_using-..ature.mp4
+
+WORM-s13516185-m1398386734--Learning SketchUp 2013%53_creating-walls-and-door-openings.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5242880  38%    4.94MB/s    0:00:01
+     9273344  68%    4.36MB/s    0:00:00
+remote: merge git-annex     13369344  98%    4.17MB/s    0:00:00
+    13516185 100%    4.17MB/s    0:00:03 (xfer#1, to-check=0/1)
+[2014-05-25 21:49:18 CEST] RemoteControl: Syncing with diskstation 
+
+sent 13518004 bytes  received 42 bytes  3004010.22 bytes/sec
+total size is 13516185  speedup is 1.00
+[2014-05-25 21:49:18 CEST] Transferrer: Uploaded 53_creati..nings.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+
+WORM-s18590095-m1398385163--Learning SketchUp 2013%52_installing-bit-tools-plugins.mp4
+   e9cb764..c7f1783  git-annex -> synced/git-annex
+       32768   0%    0.00kB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   e2eb7b5..ff506d2  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at c7f178361d32682b60332b5c508a3ce0aec3925c but expected e9cb7644b684d418952b4132c725211eb045b260
+ ! e9cb764..c7f1783  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+[2014-05-25 21:49:19 CEST] RemoteControl: Syncing with diskstation 
+     4259840  22%    3.88MB/s    0:00:03
+     6684672  35%    3.09MB/s    0:00:03
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ff506d2..ff2bd4c  git-annex  -> diskstation/git-annex
+    10813440  58%    3.36MB/s    0:00:02
+[2014-05-25 21:49:23 CEST] Pusher: Syncing with diskstation 
+    14876672  80%    3.46MB/s    0:00:01
+    18590095 100%    3.53MB/s    0:00:05 (xfer#1, to-check=0/1)
+
+sent 18592530 bytes  received 42 bytes  2860395.69 bytes/sec
+total size is 18590095  speedup is 1.00
+[2014-05-25 21:49:24 CEST] Transferrer: Uploaded 52_instal..ugins.mp4
+
+WORM-s28284719-m1398385600--Learning SketchUp 2013%51_double-hung-windows.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5046272  17%    4.72MB/s    0:00:04
+remote: merge git-annex      9076736  32%    4.27MB/s    0:00:04
+    13303808  47%    4.16MB/s    0:00:03
+[2014-05-25 21:49:29 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   c7f1783..a39803a  git-annex -> synced/git-annex
+    16711680  59%    3.89MB/s    0:00:02
+    18841600  66%    3.14MB/s    0:00:02
+    21331968  75%    2.78MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   ff2bd4c..338767b  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at a39803aef5ce739ae6a6472a7de156efac31bebc but expected c7f178361d32682b60332b5c508a3ce0aec3925c
+ ! c7f1783..a39803a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    26050560  92%    2.89MB/s    0:00:00
+    28284719 100%    3.45MB/s    0:00:07 (xfer#1, to-check=0/1)
+
+sent 28288329 bytes  received 42 bytes  2977723.26 bytes/sec
+total size is 28284719  speedup is 1.00
+[2014-05-25 21:49:34 CEST] Transferrer: Uploaded 51_double..ndows.mp4
+
+WORM-s16987083-m1398385579--Learning SketchUp 2013%50_creating-the-front-window-frame.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:49:35 CEST] Pusher: Syncing with diskstation 
+     5144576  30%    4.85MB/s    0:00:02
+     9371648  55%    4.39MB/s    0:00:01
+    11468800  67%    3.58MB/s    0:00:01
+    15859712  93%    3.72MB/s    0:00:00
+    16987083 100%    3.75MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 16989325 bytes  received 42 bytes  3088975.82 bytes/sec
+total size is 16987083  speedup is 1.00
+[2014-05-25 21:49:39 CEST] Transferrer: Uploaded 50_creati..frame.mp4
+remote: merge git-annex 
+WORM-s19055363-m1398385037--Learning SketchUp 2013%49_creating-doors.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5013504  26%    4.68MB/s    0:00:02
+[2014-05-25 21:49:41 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   a39803a..8462dc1  git-annex -> synced/git-annex
+     9011200  47%    4.21MB/s    0:00:02
+    13041664  68%    4.05MB/s    0:00:01
+    16351232  85%    3.83MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   338767b..47c33b6  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 8462dc1c099c64ff94d5d35cb2f2efaff89b028e but expected a39803aef5ce739ae6a6472a7de156efac31bebc
+ ! a39803a..8462dc1  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    19055363 100%    3.97MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 19057840 bytes  received 42 bytes  2931981.85 bytes/sec
+total size is 19055363  speedup is 1.00
+[2014-05-25 21:49:46 CEST] Pusher: Syncing with diskstation 
+[2014-05-25 21:49:46 CEST] Transferrer: Uploaded 49_creati..doors.mp4
+
+WORM-s11184398-m1398385463--Learning SketchUp 2013%48_review-of-components-and-nested-groups.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3375104  30%    2.72MB/s    0:00:02
+     5603328  50%    2.38MB/s    0:00:02
+remote: merge git-annex      9371648  83%    2.75MB/s    0:00:00
+    11184398 100%    2.89MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 11185939 bytes  received 42 bytes  2033814.73 bytes/sec
+total size is 11184398  speedup is 1.00
+[2014-05-25 21:49:52 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:49:52 CEST] Transferrer: Uploaded 48_review..roups.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   8462dc1..877c07a  git-annex -> synced/git-annex
+
+WORM-s19612237-m1398385719--Learning SketchUp 2013%47_adding-railing.mp4
+       32768   0%    0.00kB/s    0:00:00
+     3997696  20%    3.75MB/s    0:00:04
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   47c33b6..bb182f5  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 877c07ad78a25ddf859ac96049ec938fa9b0b5f3 but expected 8462dc1c099c64ff94d5d35cb2f2efaff89b028e
+ ! 8462dc1..877c07a  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     8257536  42%    3.88MB/s    0:00:02
+    12845056  65%    4.02MB/s    0:00:01
+    17039360  86%    4.00MB/s    0:00:00
+[2014-05-25 21:49:57 CEST] Pusher: Syncing with diskstation 
+    19612237 100%    3.99MB/s    0:00:04 (xfer#1, to-check=0/1)
+
+sent 19614782 bytes  received 42 bytes  3017665.23 bytes/sec
+total size is 19612237  speedup is 1.00
+[2014-05-25 21:49:58 CEST] Transferrer: Uploaded 47_adding..iling.mp4
+
+WORM-s23427266-m1398386041--Learning SketchUp 2013%46_adding-spindles-with-move-and-copy.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4128768  17%    3.80MB/s    0:00:04
+remote: merge git-annex      7176192  30%    3.33MB/s    0:00:04
+    11304960  48%    3.53MB/s    0:00:03
+[2014-05-25 21:50:02 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   877c07a..873eda1  git-annex -> synced/git-annex
+    15138816  64%    3.53MB/s    0:00:02
+    18644992  79%    3.42MB/s    0:00:01
+    21135360  90%    3.29MB/s    0:00:00
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   bb182f5..470a1af  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 873eda1fd0b52f509bbd03a02ec5a3d6d8085488 but expected 877c07ad78a25ddf859ac96049ec938fa9b0b5f3
+ ! 877c07a..873eda1  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+    23427266 100%    3.17MB/s    0:00:07 (xfer#1, to-check=0/1)
+
+sent 23430295 bytes  received 42 bytes  2756510.24 bytes/sec
+total size is 23427266  speedup is 1.00
+[2014-05-25 21:50:06 CEST] Transferrer: Uploaded 46_adding..-copy.mp4
+
+WORM-s28584390-m1398385775--Learning SketchUp 2013%45_making-a-unique-bottom-step.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:50:07 CEST] Pusher: Syncing with diskstation 
+     5472256  19%    4.96MB/s    0:00:04
+     9895936  34%    4.53MB/s    0:00:04
+    14221312  49%    4.40MB/s    0:00:03
+remote: merge git-annex     18055168  63%    4.21MB/s    0:00:02
+    22609920  79%    4.05MB/s    0:00:01
+[2014-05-25 21:50:12 CEST] RemoteControl: Syncing with diskstation 
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   873eda1..274fd99  git-annex -> synced/git-annex
+    26279936  91%    3.88MB/s    0:00:00
+    28584390 100%    4.06MB/s    0:00:06 (xfer#1, to-check=0/1)
+
+sent 28588044 bytes  received 42 bytes  3363304.24 bytes/sec
+total size is 28584390  speedup is 1.00
+[2014-05-25 21:50:14 CEST] Transferrer: Uploaded 45_making..-step.mp4
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   470a1af..989e8b5  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at 274fd99803c01b7911e45dcb050480eb4bfe2a82 but expected 873eda1fd0b52f509bbd03a02ec5a3d6d8085488
+ ! 873eda1..274fd99  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+
+WORM-s24162552-m1398385100--Learning SketchUp 2013%44_adding-riser-detail.mp4
+       32768   0%    0.00kB/s    0:00:00
+     5341184  22%    5.06MB/s    0:00:03
+[2014-05-25 21:50:17 CEST] Pusher: Syncing with diskstation 
+     9240576  38%    4.38MB/s    0:00:03
+    13959168  57%    4.38MB/s    0:00:02
+    18153472  75%    4.28MB/s    0:00:01
+remote: merge git-annex     22347776  92%    4.00MB/s    0:00:00
+    24162552 100%    4.15MB/s    0:00:05 (xfer#1, to-check=0/1)
+[2014-05-25 21:50:22 CEST] RemoteControl: Syncing with diskstation 
+
+sent 24165658 bytes  received 42 bytes  3222093.33 bytes/sec
+total size is 24162552  speedup is 1.00
+[2014-05-25 21:50:22 CEST] Transferrer: Uploaded 44_adding..etail.mp4
+(merging synced/git-annex into git-annex...)        
+remote: (Recording state in git...)        
+remote: ok        
+remote: (Recording state in git...)        
+To joern@annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   274fd99..baa9cda  git-annex -> synced/git-annex
+
+WORM-s14814183-m1398385868--Learning SketchUp 2013%43_creating-the-staircase.mp4
+       32768   0%    0.00kB/s    0:00:00
+     4947968  33%    4.69MB/s    0:00:02
+From annex.diskstation.local:/volume1/homes/joern/Annex.movies
+   989e8b5..c15470f  git-annex  -> diskstation/git-annex
+error: Ref refs/remotes/diskstation/synced/git-annex is at baa9cdae739f6bc1f928d9abe82c0f83b6645093 but expected 274fd99803c01b7911e45dcb050480eb4bfe2a82
+ ! 274fd99..baa9cda  synced/git-annex -> diskstation/synced/git-annex  (unable to update local ref)
+     9011200  60%    4.25MB/s    0:00:01
+    13729792  92%    4.31MB/s    0:00:00
+    14814183 100%    4.30MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 14816152 bytes  received 42 bytes  2693853.45 bytes/sec
+total size is 14814183  speedup is 1.00
+[2014-05-25 21:50:27 CEST] Transferrer: Uploaded 43_creati..rcase.mp4
+
+WORM-s14506973-m1398386318--Learning SketchUp 2013%42_why-we-use-groups-and-components.mp4
+       32768   0%    0.00kB/s    0:00:00
+[2014-05-25 21:50:27 CEST] Pusher: Syncing with diskstation 
+     5341184  36%    5.04MB/s    0:00:01
+     9633792  66%    4.55MB/s    0:00:01
+    13926400  95%    4.37MB/s    0:00:00
+    14506973 100%    4.38MB/s    0:00:03 (xfer#1, to-check=0/1)
+
+sent 14508912 bytes  received 42 bytes  3224212.00 bytes/sec
+total size is 14506973  speedup is 1.00
+[2014-05-25 21:50:31 CEST] Transferrer: Uploaded 42_why-we..nents.mp4
+
+WORM-s11494983-m1398385388--Learning SketchUp 2013%41_copy-and-paste-in-place.mp4
+       32768   0%    0.00kB/s    0:00:00
+remote: merge git-annex      5210112  45%    4.82MB/s    0:00:01
+     9404416  81%    4.37MB/s    0:00:00
+    11494983 100%    4.21MB/s    0:00:02 (xfer#1, to-check=0/1)
+
+sent 11496545 bytes  received 42 bytes  3284739.14 bytes/sec
+total size is 11494983  speedup is 1.00
+[2014-05-25 21:50:34 CEST] RemoteControl: Syncing with diskstation 
+[2014-05-25 21:50:34 CEST] Transferrer: Uploaded 41_copy-a..place.mp4
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/gpg_bundled_with_OSX_build_fails.mdwn b/doc/bugs/gpg_bundled_with_OSX_build_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/gpg_bundled_with_OSX_build_fails.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-What steps will reproduce the problem?
-
-run
-
-    /Applications/git-annex.app/Contents/MacOS/bin/gpg
-
-from the terminal
-
-What is the expected output? What do you see instead?
-
-I expect to see typical gpg output.  Instead, I see
-
-    dyld: Library not loaded: /opt/local/lib/libiconv.2.dylib
-        Referenced from: /Applications/git-annex.app/Contents/MacOS/bin/gpg
-        Reason: Incompatible library version: gpg requires version 8.0.0 or later, but libiconv.2.dylib provides version 7.0.0
-    Trace/BPT trap: 5
-
-What version of git-annex are you using? On what operating system?
-
-git annex Version: 3.20121017 on Mac OS X 10.7.5
-
-[[!tag /design/assistant/OSX]]
-
-> Libraries are now handled better in the OSX app and this should be able
-> to happen anymore. [[done]] --[[Joey]] 
diff --git a/doc/bugs/gpg_error_on_android.mdwn b/doc/bugs/gpg_error_on_android.mdwn
deleted file mode 100644
--- a/doc/bugs/gpg_error_on_android.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-### Please describe the problem.
-
-Adding an existing cloud repo on box.com results in an gpg error:
-
-    user error (gpg ["--quiet","--trust-model","always","--batch","--passphrase-fd","86","--decrypt"] exited 2)
-
-### What steps will reproduce the problem?
-
-Enabling an existing cloud repository.
-
-### What version of git-annex are you using? On what operating system?
-
-Latest Android (4.20130516-g32 40006) on a rooted Samsung Galaxy Note (CyanogenMod 10.1)
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
-
-(merging refs/synced/de8a8792-70de-48c3-a646-a168ce1d9d35/c25hdXRoQGphYmJlci5vcmc=/git-annex into git-annex...)
-(Recording state in git...)
-(gpg) gpg: can't open `/usr/local/share/gnupg/options.skel': No such file or directory
-gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/secring.gpg.lock' done via O_EXCL
-gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/pubring.gpg.lock' done via O_EXCL
-gpg: encrypted with unknown algorithm 3
-gpg: decryption failed: secret key not available
-(gpg) gpg: encrypted with unknown algorithm 3
-gpg: decryption failed: secret key not available
-(gpg) gpg: encrypted with unknown algorithm 3
-gpg: decryption failed: secret key not available
-(gpg) gpg: encrypted with unknown algorithm 3
-gpg: decryption failed: secret key not available
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; I have deployed the new gpg build for Android and the
-> nightly Android app build is now using it. --[[Joey]]
diff --git a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn b/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
deleted file mode 100644
--- a/doc/bugs/gpg_hangs_on_glacier_remote_creation.mdwn
+++ /dev/null
@@ -1,78 +0,0 @@
-### Please describe the problem.
-when attempting to create a glacier special remote one of the gpg sub-commands hangs without returning.
-
-### What steps will reproduce the problem?
-I'm not sure what will reproduce this issue. I recently upgraded from the apt-get version of git-annex (version 3) to the cabal version (version 4 shown below), but I'm not sure if that is relevant at all).
-
-### What version of git-annex are you using? On what operating system?
-
-git version: 1.7.9.5
-
-(git annex was installed using cabal)
-[[!format sh """
-$> git-annex version
-git-annex version: 4.20130709
-build flags: Testsuite S3 Inotify DBus
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-"""]]
-
-OS version:
-
-12.04.2 LTS, Precise Pangolin
-
-GPG version:
-
-[[!format sh """
-$> gpg --version
-gpg (GnuPG) 1.4.11
-Copyright (C) 2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Home: ~/.gnupg
-Supported algorithms:
-Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
-Cipher: 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH, CAMELLIA128,
-        CAMELLIA192, CAMELLIA256
-Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
-Compression: Uncompressed, ZIP, ZLIB, BZIP2
-"""]]
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-$> git annex initremote glacier type=glacier encryption=annex-l1@ggg.local embedcreds=yes vault=some-vault-name --verbose --debug
-[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","show-ref","git-annex"]
-[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","show-ref","--hash","refs/heads/git-annex"]
-[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..181aa86dfd264557ab73285220d70c67f868b349","--oneline","-n1"]
-[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..1dc6e1c4bca2102fc25e86491ab89338750ee1f6","--oneline","-n1"]
-[2013-07-20 22:45:13 MDT] read: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","log","refs/heads/git-annex..b919b83cafeff420d23af24ff7de35b4ff955c8c","--oneline","-n1"]
-[2013-07-20 22:45:13 MDT] chat: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","cat-file","--batch"]
-[2013-07-20 22:45:13 MDT] read: git ["config","--null","--list"]
-initremote glacier (encryption setup) [2013-07-20 22:45:13 MDT] read: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--with-colons","--list-public-keys","annex-l1@ggg.local"]
-[2013-07-20 22:45:13 MDT] read: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--gen-random","--armor","2","512"]
-[2013-07-20 22:47:37 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--encrypt","--no-encrypt-to","--no-default-recipient","--recipient","DF31708872834ABA"]
-(with gpg key DF31708872834ABA) [2013-07-20 22:47:37 MDT] call: glacier ["--region=us-east-1","vault","create","some-vault-name"]
-[2013-07-20 22:47:38 MDT] call: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","config","remote.glacier.annex-glacier","true"]
-[2013-07-20 22:47:38 MDT] call: git ["--git-dir=/home/cantora/annex-l1/.git","--work-tree=/home/cantora/annex-l1","config","remote.glacier.annex-uuid","a9739087-7860-4ed0-bc38-0b6031b1afd3"]
-(gpg) [2013-07-20 22:47:38 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--decrypt"]
-[2013-07-20 22:47:38 MDT] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--batch","--passphrase-fd","3","--symmetric","--force-mdc"]
-#at this point it simply waits forever. not sure what it's waiting for, stdin maybe? maybe fd 3 is empty??
-
-#[on a different terminal]
-$> ps ax | grep gpg | grep -v ssh
- 2024 ?        Ss     0:00 /usr/bin/gpg-agent --daemon --sh --write-env-file=/home/cantora/.gnupg/gpg-agent-info-ggg /usr/bin/dbus-launch --exit-with-session gnome-session --session=ubuntu
- 8341 pts/4    SL+    0:00 gpg --batch --no-tty --use-agent --quiet --trust-model always --batch --passphrase-fd 3 --symmetric --force-mdc
- 8652 pts/5    S+     0:00 grep --color=auto gpg
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; see comments --[[Joey]] 
diff --git a/doc/bugs/gpg_needs_--use-agent.mdwn b/doc/bugs/gpg_needs_--use-agent.mdwn
deleted file mode 100644
--- a/doc/bugs/gpg_needs_--use-agent.mdwn
+++ /dev/null
@@ -1,53 +0,0 @@
-git-annex gpg encryption fails here when GPG_AGENT_INFO is set, it needs to be supplied --use-agent to work.
-
-Output from git-annex:
-
-    copy file (to origin...) (gpg) gpg: can't query passphrase in batch mode
-    gpg: decryption failed: secret key not available
-    Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2
-    
-    git-annex: user error (Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2)
-    failed
-
-Reproduced on command-line:
-
-    [0 zerodogg@browncoats ~]$ echo test > testfile
-    [0 zerodogg@browncoats ~]$ gpg -e testfile
-    [0 zerodogg@browncoats ~]$ gpg --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg 
-    gpg: can't query passphrase in batch mode
-    gpg: decryption failed: secret key not available
-    [2 zerodogg@browncoats ~]$ gpg --use-agent --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg
-    test
-    [0 zerodogg@browncoats ~]$ 
-
-A patch to fix this issue:
-
-
-    From 77cb02d15245e9ad6e127388adcda960000fb3b8 Mon Sep 17 00:00:00 2001
-    From: Eskild Hustvedt <code@zerodogg.org>
-    Date: Fri, 17 Aug 2012 09:21:44 +0200
-    Subject: [PATCH] Explicitly enable agent to ensure decryption works
-    
-    Otherwise gpg will fail when GPG_AGENT_INFO is set in certain cases.
-    ---
-     Utility/Gpg.hs |    2 +-
-     1 file changed, 1 insertion(+), 1 deletion(-)
-    
-    diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
-    index e13afe5..c28b209 100644
-    --- a/Utility/Gpg.hs
-    +++ b/Utility/Gpg.hs
-    @@ -29,7 +29,7 @@ stdParams params = do
-        b <- getEnv "GPG_BATCH"
-        let batch = if isNothing e && isNothing b
-            then []
-    -       else ["--batch", "--no-tty"]
-    +       else ["--batch", "--no-tty", "--use-agent"]
-        return $ batch ++ defaults ++ toCommand params
-        where
-            -- be quiet, even about checking the trustdb
-    -- 
-    1.7.10.4
-
-> Thanks, [[done]].. I never noticed this since I have use-agent set in
-> gpg.conf. --[[Joey]
diff --git a/doc/bugs/gsha256sum_crashes.mdwn b/doc/bugs/gsha256sum_crashes.mdwn
deleted file mode 100644
--- a/doc/bugs/gsha256sum_crashes.mdwn
+++ /dev/null
@@ -1,92 +0,0 @@
-[[!meta title="SIGILL on Mavericks"]]
-
-### Please describe the problem.
-
-gsha256sum crashes continiously, so that excessive logs must be removed and the notebook is not responsive.
-
-Mac OS Mavericks
-
-### What steps will reproduce the problem?
-
-I cannot reproduce it. My guess is that it has problems with special characters in filenames of my music repository.
-
-### What version of git-annex are you using? On what operating system?
-
-Version: 5.20131221-g00d1673
-Build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash 
-
-### Please provide any additional information below.
-
-
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-[2014-01-01 11:50:02 CET] main: starting assistant version 5.20131221-g00d1673
-[2014-01-01 11:53:43 CET] TransferScanner: Syncing with sokrates.local_Musik 
-Already up-to-date.
-
-(scanning...) [2014-01-01 11:53:45 CET] Watcher: Performing startup scan
-Already up-to-date.
-
-
-  The installed version of git is too old for .gitignores to be honored by git-annex.
-To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
-   0ec1344..c7bc58c  git-annex -> synced/git-annex
-
-.DS_Store
-           0   0%    0.00kB/s    0:00:00
-       21508 100%  238.68kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 42 bytes  received 21602 bytes  14429.33 bytes/sec
-total size is 21508  speedup is 0.99
-[2014-01-01 12:10:03 CET] Transferrer: Downloaded .DS_Store
-[2014-01-01 12:10:03 CET] Pusher: Syncing with sokrates.local_Musik 
-To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
-   c7bc58c..c3ad19a  git-annex -> synced/git-annex
-(Recording state in git...)
-(started...) [2014-01-01 12:33:25 CET] Committer: Adding 15 - 23 s.. drøm.ogg 04 Cuatro..ielo.flac 05 Compadrón.flac 07 Buscan..dón.flac 10 Adiós..lita.flac 12 Bésam..Boca.flac 14 Nunca ..idar.flac 03 Adiós..ngo).flac 06 Selecc..ngo).flac and 2745 other files
-
-add Edvard Grieg/Grieg Edition/Complete Piano Music/Complete Piano Music, Volume X (feat. piano_ Geir Henning Braaten)/15 - 23 småstykker for klaver, EG 104 No. 7- En drøm.ogg Committer crashed: gsha256sum parse error
-[2014-01-01 12:33:27 CET] Committer: warning Committer crashed: gsha256sum parse error
-
-.DS_Store
-           0   0%    0.00kB/s    0:00:00
-        6148 100%    5.86MB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 42 bytes  received 6242 bytes  4189.33 bytes/sec
-total size is 6148  speedup is 0.98
-[2014-01-01 12:49:45 CET] Transferrer: Downloaded .DS_Store
-[2014-01-01 12:49:45 CET] Pusher: Syncing with sokrates.local_Musik 
-[2014-01-01 12:53:42 CET] NetWatcherFallback: Syncing with sokrates.local_Musik 
-From ssh://git-annex-sokrates.local-juh_Musik/~/Musik
-   0ec1344..c3ad19a  git-annex  -> sokrates.local_Musik/git-annex
-fatal: Unable to create '/home/juh/Musik/.git/refs/heads/synced/git-annex.lock': Die Datei existiert bereits.
-
-If no other git process is currently running, this probably means a
-git process crashed in this repository earlier. Make sure no other git
-process is running and remove the file manually to continue.
-git-annex-shell: git-shell failed
-fatal: The remote end hung up unexpectedly
-fatal: The remote end hung up unexpectedly
-To ssh://juh@git-annex-sokrates.local-juh_Musik/~/Musik/
-   c3ad19a..e6da014  git-annex -> synced/git-annex
-From ssh://git-annex-sokrates.local-juh_Musik/~/Musik
-   c3ad19a..e6da014  git-annex  -> sokrates.local_Musik/git-annex
-Everything up-to-date
-[2014-01-01 13:11:59 CET] UpgradeWatcher: A new version of git-annex has been installed. 
-
-"""]]
-
-I can send you the crash report of hsha256sum if you need it.
-
-> Fine, we'll stop using this on OSX, since git-annex has its own builtin
-> and not even much slower hashers. done--[[Joey]]
-
->> I'm told that other programs, such as wget, also crash with SIGILL.
->> Are there multiple OSX architectures with different instructions sets or
->> what? --[[Joey]]
-
->>> Fixed and confirmed fixed now. gsha256sum etc added back to
->>> OSX app. [[done]] --[[Joey]]
diff --git a/doc/bugs/host_with_rysnc_installed__44___not_recognized.mdwn b/doc/bugs/host_with_rysnc_installed__44___not_recognized.mdwn
deleted file mode 100644
--- a/doc/bugs/host_with_rysnc_installed__44___not_recognized.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-What steps will reproduce the problem?
-Set up a remote server using ssh to a FreeNAS box
-
-What is the expected output? What do you see instead?
-Neither rsync nor git-annex are installed
-rsync is in the path, user with permissions is able to run it
-
-What version of git-annex are you using? On what operating system?
-4.20130227 OSX
-
-Please provide any additional information below.
-ssh keys were installed to allow login, when ssh-askpass was not found on osx version
-
-[[!meta title="webapp rsync probe command failed on FreeNAS box"]]
-[[!tag /design/assistant]]
-
-> [[done]]; based on the error message it's using csh and 
-> the assistant will now wrap its shell commands to work with csh.
-> --[[Joey]]
diff --git a/doc/bugs/immediately_drops_files.mdwn b/doc/bugs/immediately_drops_files.mdwn
deleted file mode 100644
--- a/doc/bugs/immediately_drops_files.mdwn
+++ /dev/null
@@ -1,222 +0,0 @@
-### Please describe the problem.
-When I `git annex get` files in a certain directory, they are got, then are dropped.
-When I do the same in a different directory, then the files there remains (as expected).
-
-`git annex fsck` also fails on these files, but after that the problem persists.
-
-I'm not really sure where to look to see why this is happening, especially why only on some directories.
-The filesystem (ext4) this is on has several GB free.
-
-Looking at the (broken) symlinks, they are strange:
-
-[[!format sh """
-git annex fsck IMG_4230.JPG > /dev/null
-ls -l IMG_4230.JPG
-lrwxrwxrwx 1 walter walter 207 Aug 13 12:14 IMG_4230.JPG -> ../../../.git/annex/objects/86/KF/SHA256E-s4209479--bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG/SHA256E-s4209479--bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG
-"""]]
-
-But then after getting it (and it being dropped somehow), the symlink is different (the number of ..s)
-
-[[!format sh """
-git annex get IMG_4230.JPG > /dev/null
-ls -l IMG_4230.JPG
-lrwxrwxrwx 1 walter walter 210 Aug 13 12:16 IMG_4230.JPG -> ../../../../.git/annex/objects/86/KF/SHA256E-s4209479--bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG/SHA256E-s4209479--bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG
-"""]]
-
-
-
-### What steps will reproduce the problem?
-
-I'm not really sure; I will test later whether this happens on other computers.
-
-### What version of git-annex are you using? On what operating system?
-    git-annex version: 4.20130812-gc590455
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-
-On ubuntu 12.10
-
-
---Walter
-
-### Please provide any additional information below.
-
-*output of git annex fsck*
-[[!format sh """
-git annex fsck 2013/08/01/IMG_4230.JPG
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","ls-files","--cached","-z","--","2013/08/01/IMG_4230.JPG"]
-[2013-08-13 12:01:25 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","check-attr","-z","--stdin","annex.backend","annex.numcopies","--"]
-fsck 2013/08/01/IMG_4230.JPG [2013-08-13 12:01:25 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","cat-file","--batch"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..3afd101dade8be4e1ed7ac48fdf4173274d3ecd7","--oneline","-n1"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 12:01:25 NZST] read: git ["config","--null","--list"]
-ok
-[2013-08-13 12:01:25 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","hash-object","-w","--stdin-paths","--no-filters"]
-[2013-08-13 12:01:25 NZST] feed: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-index","-z","--index-info"]
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-(Recording state in git...)
-[2013-08-13 12:01:25 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","write-tree"]
-[2013-08-13 12:01:25 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","commit-tree","78aca82f86ffb91bc841a3978f410e55aa6e0efe","-p","refs/heads/git-annex"]
-[2013-08-13 12:01:25 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-ref","refs/heads/git-annex","14908fedbd44917815dd013125b69def1f7f8f7c"]
-
-"""]]
-
-*output of git annex get* (output taken from daemon.log, as output from command does not include the dropping part)
-[[!format sh """
-git annex get 2013/08/01/IMG_4230.JPG
-[2013-08-13 12:03:46 NZST] TransferWatcher: transfer starting: Download UUID "e6bb2ef2-b2b5-11e1-bd1b-3fd40e5e767d" 2013/08/01/IMG_4230.JPG Nothing
-[2013-08-13 12:03:46 NZST] TransferWatcher: transfer starting: Download UUID "e6bb2ef2-b2b5-11e1-bd1b-3fd40e5e767d" 2013/08/01/IMG_4230.JPG Nothing
-[2013-08-13 12:03:46 NZST] TransferWatcher: transfer finishing: Transfer {transferDirection = Download, transferUUID = UUID "e6bb2ef2-b2b5-11e1-bd1b-3fd40e5e767d", transferKey = Key {keyName = "bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG", keyBackendName = "SHA256E", keySize = Just 4209479, keyMtime = Nothing}}
-[2013-08-13 12:03:46 NZST] Watcher: add symlink 01/IMG_4230.JPG
-[2013-08-13 12:03:46 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","hash-object","-t","blob","-w","--stdin","--no-filters"]
-[2013-08-13 12:03:46 NZST] Committer: committing 1 changes
-[2013-08-13 12:03:46 NZST] Committer: Committing changes to git
-[2013-08-13 12:03:46 NZST] feed: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-index","-z","--index-info"]
-[2013-08-13 12:03:46 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-08-13 12:03:46 NZST] Pusher: Synok
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-drop 01/IMG_4230.JPG cing with Adata, b(checking cloud...) itbucket 
-[2013-08-13 12:03:46 NZST] Committer: dropped 01/IMG_4230.JPG (from here) (copies now 4) : file renamed
-[2013-08-13 12:03:46 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","hash-object","-w","--stdin-paths","--no-filters"]
-[2013-08-13 12:03:46 NZST] feed: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-index","-z","--index-info"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","write-tree"]
-[2013-08-13 12:03:47 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","commit-tree","f288bfce8d133cc0ce00b65d48ca726809da34e6","-p","refs/heads/git-annex"]
-[2013-08-13 12:03:47 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-ref","refs/heads/git-annex","5a188246bda51207d12adf86c6d87568ca7076d7"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","symbolic-ref","HEAD"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","refs/heads/master"]
-[2013-08-13 12:03:47 NZST] Pusher: pushing to [Remote { name ="Adata" },Remote { name ="bitbucket" }]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 12:03:47 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","branch","-f","synced/master"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:03:47 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master:synced/master"]
-[2013-08-13 12:03:47 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","Adata","git-annex:synced/git-annex","master:synced/master"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..5a188246bda51207d12adf86c6d87568ca7076d7","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..3afd101dade8be4e1ed7ac48fdf4173274d3ecd7","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..5a188246bda51207d12adf86c6d87568ca7076d7","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..3afd101dade8be4e1ed7ac48fdf4173274d3ecd7","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 12:03:47 NZST] Watcher: add symlink 01/IMG_4230.JPG
-[2013-08-13 12:03:47 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","hash-object","-t","blob","-w","--stdin","--no-filters"]
-To /media/walter/327D522A6727FE79/Pictures
-   3afd101..5a18824  git-annex -> synced/git-annex
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","Adata","git-annex:synced/git-annex","master"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..5a188246bda51207d12adf86c6d87568ca7076d7","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..3afd101dade8be4e1ed7ac48fdf4173274d3ecd7","--oneline","-n1"]
-[2013-08-13 12:03:48 NZST] Committer: committing 1 changes
-[2013-08-13 12:03:48 NZST] Committer: Committing changes to git
-[2013-08-13 12:03:48 NZST] feed: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-index","-z","--index-info"]
-[2013-08-13 12:03:48 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-To git@bitbucket.org:waltersom/Pictures.git
-   3afd101..5a18824  git-annex -> synced/git-annex
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..5a188246bda51207d12adf86c6d87568ca7076d7","--oneline","-n1"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 12:03:52 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 12:03:58 NZST] Pusher: Syncing with Adata, bitbucket 
-[2013-08-13 12:03:58 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","symbolic-ref","HEAD"]
-[2013-08-13 12:03:58 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","refs/heads/master"]
-[2013-08-13 12:03:58 NZST] Pusher: pushing to [Remote { name ="Adata" },Remote { name ="bitbucket" }]
-[2013-08-13 12:03:58 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","branch","-f","synced/master"]
-[2013-08-13 12:03:58 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","Adata","git-annex:synced/git-annex","master:synced/master"]
-[2013-08-13 12:03:58 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master:synced/master"]
-Everything up-to-date
-[2013-08-13 12:03:58 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","Adata","git-annex:synced/git-annex","master"]
-Everything up-to-date
-[2013-08-13 12:04:02 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master"]
-
-"""
-]]
-
-
-
-I tried removing the USB drive I had plugged in, and was able to get the file from S3, and it wasn't dropped.
-However, checking the logs, I see that it did try to drop the file, but was unable to verify numcopies, so gives up.
-Also odd, is that it doesn't suggest making the USB drive available, but `git annex whereis` knows that the drive does have it. Also, annex.numcopies is 1, and it got it from S3, so why can't it drop it on the computer?
-Or, why does it say that it needs two copies? `git config annex.numcopies` gives 1.
-
-[[!format sh """
-[2013-08-13 16:52:08 NZST] TransferWatcher: transfer starting: Download UUID "be992080-b1db-11e1-8f79-1b10bb4092ef" 01/IMG_4230.JPG Nothing
-[2013-08-13 16:54:06 NZST] TransferWatcher: transfer starting: Download UUID "be992080-b1db-11e1-8f79-1b10bb4092ef" 01/IMG_4230.JPG Just 65504
-[...]
-[2013-08-13 16:54:06 NZST] TransferWatcher: transfer starting: Download UUID "be992080-b1db-11e1-8f79-1b10bb4092ef" 01/IMG_4230.JPG Just 4192256
-[2013-08-13 16:54:06 NZST] TransferWatcher: transfer finishing: Transfer {transferDirection = Download, transferUUID = UUID "be992080-b1db-11e1-8f79-1b10bb4092ef", transferKey = Key {keyName = "bba2489f526ed1288d23157b2b985bfda99321c52d05d3f4ddb92144b301318e.JPG", keyBackendName = "SHA256E", keySize = Just 4209479, keyMtime = Nothing}}
-[2013-08-13 16:54:06 NZST] Watcher: add symlink 01/IMG_4230.JPG
-[2013-08-13 16:54:06 NZST] chat: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","hash-object","-t","blob","-w","--stdin","--no-filters"]
-[2013-08-13 16:54:06 NZST] Committer: committing 1 changes
-[2013-08-13 16:54:06 NZST] Committer: Committing changes to git
-[2013-08-13 16:54:06 NZST] feed: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","update-index","-z","--index-info"]
-[2013-08-13 16:54:06 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","commit","--allow-empty-message","--no-edit","-m","","--quiet","--no-verify"]
-[2013-08-13 16:54:06 
-  Could only verify the existence of 1 out of 2 necessary copies
-
-  Try making some of these repositories available:
-  	416aa28e-b1d4-11e1-9539-c39b14a3f7d2 -- timeline laptop
-   	f42d30a0-b1d2-11e1-8b32-3bdd169e3280 -- my desktop
-
-  (Use --force to override this check, or adjust annex.numcopies.)
-failed
-(Recording state in git...)
-(Recording state in git...)
-(Recording state in git...)
-drop 01/IMG_4230.JPG NZST] Pusher:(checking cloud...)  Syncing with bitbucket 
-(unsafe) [2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","symbolic-ref","HEAD"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","refs/heads/master"]
-[2013-08-13 16:54:07 NZST] Pusher: pushing to [Remote { name ="bitbucket" }]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 16:54:07 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","branch","-f","synced/master"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 16:54:07 NZST] call: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master:synced/master"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..7b6b1c6c479a13f9d4ece135bdf3ba31bc484b31","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..11a0c19d7c79f3e574b81295782ab2820caea232","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..5ebb3e46b8fc109c2966ceccdd716f469d94fcad","--oneline","-n1"]
-[2013-08-13 16:54:07 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","ls-tree","-z","--","refs/heads/git-annex","uuid.log","remote.log","trust.log","group.log","preferred-content.log"]
-To git@bitbucket.org:waltersom/Pictures.git
-   5ebb3e4..7b6b1c6  git-annex -> synced/git-annex
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","git-annex"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","push","bitbucket","git-annex:synced/git-annex","master"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","show-ref","--hash","refs/heads/git-annex"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..7b6b1c6c479a13f9d4ece135bdf3ba31bc484b31","--oneline","-n1"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..9be78e75db197a26db6aaaffbcddf5057e30d23f","--oneline","-n1"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..2bae49a6e1ce85ad501b0fa85439da7cde8c8597","--oneline","-n1"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..b5858e25b7f7c45564ab463ecf3e74ecd8979609","--oneline","-n1"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..11a0c19d7c79f3e574b81295782ab2820caea232","--oneline","-n1"]
-[2013-08-13 16:54:12 NZST] read: git ["--git-dir=/home/walter/Photos/.git","--work-tree=/home/walter/Photos","log","refs/heads/git-annex..cad75ea77d513a24006ee0b56ff0aad12b7aa805","--oneline","-n1"]
-"""]]
diff --git a/doc/bugs/importfeed_fails__44___bad_feed_content.mdwn b/doc/bugs/importfeed_fails__44___bad_feed_content.mdwn
deleted file mode 100644
--- a/doc/bugs/importfeed_fails__44___bad_feed_content.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-### Please describe the problem.
-
-I just added a new podcast to my feeds list and it is complaining of "bad feed content" when trying to import.
-
-### What steps will reproduce the problem?
-
-1. git-annex importfeed --fast http://redecentralize.org/podcast/feed.rss
-3. see the sad error "warning: bad feed content"
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex version: 4.20130827
-
-### Please provide any additional information below.
-
-[[!format sh """
-greg@x200s:~/annex/Podcasts$ git-annex importfeed --fast http://redecentralize.org/podcast/feed.rss
-(checking known urls...)
-importfeed http://redecentralize.org/podcast/feed.rss 
---2013-09-09 15:05:17--  http://redecentralize.org/podcast/feed.rss
-Resolving redecentralize.org (redecentralize.org)... 204.232.175.78
-Connecting to redecentralize.org (redecentralize.org)|204.232.175.78|:80... connected.
-HTTP request sent, awaiting response... 200 OK
-Length: 4331 (4.2K) [text/xml]
-Saving to: ‘/tmp/feed12649’
-
-100%[==============================================================>] 4,331       --.-K/s   in 0.08s   
-
-2013-09-09 15:05:17 (56.0 KB/s) - ‘/tmp/feed12649’ saved [4331/4331]
-
-
-  warning: bad feed content
-ok
-"""]]
-
-> upstream bug <https://github.com/sof/feed/issues/5> ; [[done]] --[[Joey]]  
diff --git a/doc/bugs/importfeed_should_allow_pubdate_in_the_template.mdwn b/doc/bugs/importfeed_should_allow_pubdate_in_the_template.mdwn
deleted file mode 100644
--- a/doc/bugs/importfeed_should_allow_pubdate_in_the_template.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-importfeed is a great feature, but it doesn't allow templating the filename with the publish date.
-
-I would suggest adding pubdate option, which would fix this problem.
-
-> duplicate of [[todo/importfeed: allow ${itemdate} with --template]] [[done]] --[[Joey]] 
diff --git a/doc/bugs/importfeed_uses___34____95__foo__34___as_extension.mdwn b/doc/bugs/importfeed_uses___34____95__foo__34___as_extension.mdwn
deleted file mode 100644
--- a/doc/bugs/importfeed_uses___34____95__foo__34___as_extension.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-### Please describe the problem.
-When running importfeed on gitminutes <http://feeds.gitminutes.com/gitminutes-podcast> git-annex interprets the extension as "_mp3" rather than ".mp3" which means that renaming is needed for various audio players to accept the files.
-
-### What steps will reproduce the problem?
-git annex importfeed http://feeds.gitminutes.com/gitminutes-podcast --fast
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130802
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 4
-upgrade supported from repository versions: 0 1 2
-
-on Debian Sid
-
-> Already fixed in git. [[done]] --[[Joey]]
diff --git a/doc/bugs/incremental_fsck_should_not_use_sticky_bit.mdwn b/doc/bugs/incremental_fsck_should_not_use_sticky_bit.mdwn
--- a/doc/bugs/incremental_fsck_should_not_use_sticky_bit.mdwn
+++ b/doc/bugs/incremental_fsck_should_not_use_sticky_bit.mdwn
@@ -13,3 +13,5 @@
 ### What version of git-annex are you using? On what operating system?
 
 Debian's 4.20131106~bpo70+1
+
+[[!tag confirmed]]
diff --git a/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn b/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn
deleted file mode 100644
--- a/doc/bugs/internal_server_error_creating_repo_on_ssh_server.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-What steps will reproduce the problem?
-
-I downloaded the os x assistant today.
-
-I'd previously installed it but hadn't linked it to another repo.
-
-I tried to create a remote repo on an ssh server using the assistant.
-
-What is the expected output? What do you see instead?
-
-Creating a remote repo or giving an understandable error message.
-
-What version of git-annex are you using? On what operating system?
-
-3.20121212
-OS X 10.8.2 (Mountain Lion)
-
-The remote machine is running debian stable.
-
-Please provide any additional information below.
-
-Internal Server Error
-user error (gpg ["--quiet","--trust-model","always","--gen-random","--armor","1","512"] exited 127)
-git-annex version 3.20121212
-
-> [[done]], see comments --[[Joey]] 
diff --git a/doc/bugs/interrupting_migration_causes_problems.mdwn b/doc/bugs/interrupting_migration_causes_problems.mdwn
deleted file mode 100644
--- a/doc/bugs/interrupting_migration_causes_problems.mdwn
+++ /dev/null
@@ -1,52 +0,0 @@
-Killing a migration from WORM to SHA256 with ^C breaks things; future attempts to do the migration fail:
-
-    #!/bin/bash
-    
-    BASE=/tmp/migrate-bug
-    
-    set -x
-    
-    chmod -R +w $BASE
-    rm -rf $BASE
-    mkdir -p $BASE
-    cd $BASE
-    
-    # create annex
-    git init .
-    git annex init
-    
-    # make a big (sparse) file and add it
-    dd if=/dev/zero of=bigfile bs=1 count=0 seek=1G
-    git annex add --backend WORM bigfile
-    git commit -m 'added bigfile'
-    
-    # look at status
-    git annex status
-    
-    # now migrate it, but kill migration during checksum
-    # Simulate ^C by making a new process group and sending SIGINT
-    setsid git annex migrate --backend SHA256 bigfile &
-    PID=$!
-    sleep 1
-    kill -INT -$PID
-    wait
-    
-    # look at status
-    git annex status
-    
-    # this migration fails
-    git annex migrate --backend SHA256 bigfile
-    
-    # but fsck says everything's OK
-    git annex fsck
-
-The error:
-
-    migrate bigfile 
-    git-annex: /tmp/migrate-bug/.git/annex/objects/K9/V1/WORM-s1073741824-m1321566308--bigfile/WORM-s1073741824-m1321566308--bigfile: createLink: already exists (File exists)
-    failed
-    git-annex: migrate: 1 failed
-
-> Fixed it to delete the stale temp file. [[done]]
-> 
-> Thanks for making such clear test cases, Jim! --[[Joey]] 
diff --git a/doc/bugs/javascript_functions_qouting_issue.mdwn b/doc/bugs/javascript_functions_qouting_issue.mdwn
deleted file mode 100644
--- a/doc/bugs/javascript_functions_qouting_issue.mdwn
+++ /dev/null
@@ -1,44 +0,0 @@
-**What is the expected output? What do you see instead?**
-
-SyntaxError: missing ( before formal parameters
-
-function longpoll_"sidebar"() {
-
-reposi...c5e0ead (строка 5, столбец 18)
-	
-
-**Please provide any additional information below.**
-
-functions have illegal characters in their names: *function longpoll_"sidebar"*
-
-    <script>function longpoll_"sidebar"() {
-    	longpoll(longpoll_"sidebar"_url, '"sidebar"'
-    		, function() { setTimeout(longpoll_"sidebar", "10"); }
-    		, function() { webapp_disconnected(); }
-    	);
-    }
-    $(function() {
-    	$.get("/notifier/sidebar?auth=bd717e7499f2c42363719c833d3df2d25b77cf42184aacbcd0f969895911a0208ba17fd4f468c4b97274d5e3f7f419260e5df7d83d2e7642524a89325c5e0ead", function(url){
-    		longpoll_"sidebar"_url = url;
-    		setTimeout(longpoll_"sidebar", "10");
-    	});
-    });
-    function longpoll_"repolist"() {
-    	longpoll(longpoll_"repolist"_url, '"repolist"'
-    		, function() { setTimeout(longpoll_"repolist", "10"); }
-    		, function() { webapp_disconnected(); }
-    	);
-    }
-    $(function() {
-    	$.get("/notifier/repolist/RepoSelector%20%7BonlyCloud%20=%20False,%20onlyConfigured%20=%20False,%20includeHere%20=%20True%7D?auth=bd717e7499f2c42363719c833d3df2d25b77cf42184aacbcd0f969895911a0208ba17fd4f468c4b97274d5e3f7f419260e5df7d83d2e7642524a89325c5e0ead", function(url){
-    		longpoll_"repolist"_url = url;
-    		setTimeout(longpoll_"repolist", "10");
-    	});
-    });
-
-> This is already fixed in the 3.20130124 release. [[done]]
-> 
-> (Standalone builds of that release are not yet available for Mountian
-> Lion.
-> 
-> --[[Joey]] 
diff --git a/doc/bugs/journal_commit_error_when_using_annex.mdwn b/doc/bugs/journal_commit_error_when_using_annex.mdwn
deleted file mode 100644
--- a/doc/bugs/journal_commit_error_when_using_annex.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-Sorry for the noise - notabug - [[done]]
-
-Setup:
-
-* git-annex version: 3.20120629 on Debian unstable.
-* external RAID1 array connected via usb
-
-I did: <code> git-annex add \<a specific album of ogg files\> </code>
-
-When it gets to the fourth song, there is a long delay and a bunch of "journal commit I/O error" from the kernel start appearing. Then GNOME helpfully tells me that my drive was just connected (implying that it thought it was disconnected momentarily)
-
-Log outputs:
-
-Both trying to add whole album, failing at song 4
-
-* <http://paste.mitechie.com/show/745/>
-* <http://paste.mitechie.com/show/746/>
-
-Just trying to add song 4 individually
-
-* <http://paste.mitechie.com/show/747/> (lots o' journal commit I/O errors that time)
diff --git a/doc/bugs/json_is_broken_for_status.mdwn b/doc/bugs/json_is_broken_for_status.mdwn
deleted file mode 100644
--- a/doc/bugs/json_is_broken_for_status.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-### Please describe the problem.
-
-bad json produced
-
-### What steps will reproduce the problem?
-
-
-[[!format sh """
-$> git annex status --json
-,"success":true}
-
-in another one
-
-$> git annex status --json
-D hardware/g-box/builds/mine/.#yoh-debug-lastdidnotconnect.txt
-,"success":true}
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-
-Debian sid 5.20140116
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> Not all commands support json. Made this explict by making --json not be
-> a global option. Added --json support to status. [[done]]. --[[Joey]]
diff --git a/doc/bugs/long_running_assistant_causes_resource_starvation_on_OSX.mdwn b/doc/bugs/long_running_assistant_causes_resource_starvation_on_OSX.mdwn
deleted file mode 100644
--- a/doc/bugs/long_running_assistant_causes_resource_starvation_on_OSX.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-What steps will reproduce the problem?
-
-leave the assistant running for multiple days
-
-What is the expected output? 
-
-Glorious git-annex enlightenment
-
-What do you see instead?
-
-After ~2-3 days, there are hundreds of zombied git processes and the system is unable to fork new processes. This has occurred on 3 differently hardware configured mac's (macbooks and imacs) all running Mountain Lion 10.8.2 Build 12C3006
-In each case, once the system gets to this point, the only solution is forcing a reboot by holding down the power button as not even kill can spin up it's process.
-
-What version of git-annex are you using?
-
-    git-annex version: 3.20130122
-
-On what operating system?
-
-Mac OSX 10.8.2 Mountain Lion Build 12C3006
-
-Please provide any additional information below.
-
-I'm really not sure what to look for next. Happy to take suggestions.
-
-[!tag /design/assistant]]
-
-> [[done]], I found the zombie leak; the ConfigMonitor was 
-> leaving one zombie every time it checked a push/pull.
-> Not a fast leak, but over time they would add up. --[[Joey]]
diff --git a/doc/bugs/lsof__47__committer_thread_loops_occassionally.mdwn b/doc/bugs/lsof__47__committer_thread_loops_occassionally.mdwn
deleted file mode 100644
--- a/doc/bugs/lsof__47__committer_thread_loops_occassionally.mdwn
+++ /dev/null
@@ -1,53 +0,0 @@
-I've noticed this to occur occassionally 
-
-<pre>
-laplace:atest jtang$ ls
-1@  2@	3@  4@	5@  readme.txt@
-laplace:atest jtang$ git annex watch -d --foreground
-watch . [2012-07-29 11:49:26 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","show-ref","git-annex"] 
-[2012-07-29 11:49:26 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","show-ref","--hash","refs/heads/git-annex"] 
-[2012-07-29 11:49:26 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","log","refs/heads/git-annex..f85faa60e73efabc2e92f837b19c3918d3ab030f","--oneline","-n1"] 
-[2012-07-29 11:49:26 IST] chat: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","cat-file","--batch"] 
-(scanning...) [2012-07-29 11:49:26 IST] Assistant: all threads started
-[2012-07-29 11:49:26 IST] Merger: watching /Users/jtang/sandbox/atest/.git/refs/heads/synced
-[2012-07-29 11:49:26 IST] TransferWatcher: watching for transfers
-[2012-07-29 11:49:26 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","symbolic-ref","HEAD"] 
-[2012-07-29 11:49:26 IST] call: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","add","--update"] 
-[2012-07-29 11:49:26 IST] Merger: merging changes into Just refs/heads/master
-[2012-07-29 11:49:26 IST] call: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","merge","--no-edit","refs/heads/synced/master"] 
-(started...) [2012-07-29 11:49:26 IST] Watcher: watching .
-[2012-07-29 11:49:26 IST] WebApp: running on port 60042
-Already up-to-date.
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./1
-[2012-07-29 11:49:26 IST] chat: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","cat-file","--batch"] 
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./2
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./3
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./4
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./5
-[2012-07-29 11:49:26 IST] Watcher: add symlink ./readme.txt
-[2012-07-29 11:49:27 IST] Committer: committing 6 changes
-(Recording state in git...)
-[2012-07-29 11:49:27 IST] feed: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","update-index","-z","--index-info"] 
-[2012-07-29 11:49:27 IST] call: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","commit","--allow-empty-message","-m","","--allow-empty","--quiet"] 
-[2012-07-29 11:49:28 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","symbolic-ref","HEAD"] 
-[2012-07-29 11:49:28 IST] Pusher: pushing to []
-[2012-07-29 11:49:28 IST] call: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","branch","-f","synced/master"] 
-[2012-07-29 11:49:28 IST] read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","symbolic-ref","HEAD"] 
-[2012-07-29 11:49:28 IST] Merger: merging changes into Just refs/heads/master
-[2012-07-29 11:49:28 IST] call: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","merge","--no-edit","refs/heads/synced/master"] 
-Already up-to-date.
-[2012-07-29 11:49:43 IST] Watcher: file added ./.gitignore
-[2012-07-29 11:49:43 IST] read: lsof ["-F0can","+d","/Users/jtang/sandbox/atest/.git/annex/tmp/"] 
-[2012-07-29 11:49:44 IST] Committer: delaying commit of 0 changes
-[2012-07-29 11:49:45 IST] read: lsof ["-F0can","+d","/Users/jtang/sandbox/atest/.git/annex/tmp/"] 
-[2012-07-29 11:49:46 IST] Committer: delaying commit of 0 changes
-[2012-07-29 11:49:47 IST] read: lsof ["-F0can","+d","/Users/jtang/sandbox/atest/.git/annex/tmp/"] 
-[2012-07-29 11:49:48 IST] Committer: delaying commit of 0 changes
-[2012-07-29 11:49:49 IST] read: lsof ["-F0can","+d","/Users/jtang/sandbox/atest/.git/annex/tmp/"] 
-</pre>
-
-I ran " git annex watch -d --foreground" to watch what was going one, and just created a .gitignore file and the the commiter/lsof thread just loops over and over.... I only noticed as my laptop battery had drained at somepoint when git-annex was running in the background.
-
-[[!meta title="assistant: lsof/committer thread loops occassionally"]]
-
-> Closing this since it doesn't seem reproducible. [[done]] --[[Joey]]
diff --git a/doc/bugs/mac_os_x_10.7_DMG_out_of_date.mdwn b/doc/bugs/mac_os_x_10.7_DMG_out_of_date.mdwn
deleted file mode 100644
--- a/doc/bugs/mac_os_x_10.7_DMG_out_of_date.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-### Please describe the problem.
-
-This URL:
-http://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg
-currently points to a DMG with an .app that has ctime/mtime of Dec 29.
-
-After launching the app, the About screen says this:
-
-Version: 5.20131230-g684f2e6 
-
-> Nobody is autobuilding git-annex for old versions of OSX, which 
-> is why the download page says, "**warning: not being updated any longer**"
-> 
-> So, not a bug, and nothing ca be done, unless someone steps up to run an
-> autobuilder. You can of course build it from source yourself. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/make_SHA512E_the_default.mdwn b/doc/bugs/make_SHA512E_the_default.mdwn
deleted file mode 100644
--- a/doc/bugs/make_SHA512E_the_default.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-What steps will reproduce the problem?
-
-As described in
-http://git-annex.branchable.com/backends/#comment-3c1cd45d2a015b4fc412dd813293ad7d
-, sha512 is faster. On my 64-bit system, the speed difference is about
-1.5times.
-
-What is the expected output? What do you see instead?
-
-
-What version of git-annex are you using? On what operating system?
-
-
-Please provide any additional information below.
-
-> You are free to change the default in your own annexes. This is very easy
-> to do: `echo '* annex.backend=SHA512E' > .gitattributes`
-> 
-> I don't anticipate moving to SHA512, because
-> 
-> 1. It makes `ls -l` really ugly. Each symlink takes like 4 lines
->    on an 80 column terminal.
-> 2. There are better hashes coming. Particularly SHA3. That should be
->    faster and/or more secure. And without adding so much length to the
->    hash.
-> 
-> --[[Joey]]
-
-[[done]]
diff --git a/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn b/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn
deleted file mode 100644
--- a/doc/bugs/making_annex-merge_try_a_fast-forward.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-While merging the git-annex branch, annex-merge does not end up in a fast-forward even when it would be possible.
-But as sometimes annex-merge takes time, it would probably be worth it
-(but maybe I miss something with my workflow...).
-
-> I don't think a fast-forward will make things much faster.
-> 
-> git-annex needs its index file to be updated to reflect the merge.
-> With the union merge it does now, this can be accomplished by using
-> `git-diff-index` to efficiently get a list of files that have changed,
-> and only merge those changes into the index with `git-update-index`.
-> Then the index gets committed, generating the merge.
-> 
-> To fast-forward, it would just reset the git-annex branch to the new
-> head of the remote it's merging to. But then the index needs to be
-> updated to reflect this new head too. To do that needs the same method
-> described above, essentially (with the difference that it can replace
-> files in the index with the version from the git-annex branch, rather
-> than merging in the changes... but only if the index is known to be
-> already committed and have no other changes, which would require both
-> an attempt to commit it first, and
-> locking). 
-> 
-> So will take basically the same amount of time, except
-> it would not need to commit the index at the end of the merge. The
-> most expensive work is the `git-diff-index` and `git-update-index`,
-> which are not avoided.
-> 
-> Although, perhaps fast-forward merge would use slightly
-> less space. --[[Joey]]
-
->> To avoid the ladder-merge between two repositories described at
->> <http://sprunge.us/LOMU>, seems a fast-forward should be detected and
->> written to git, even if the index is still updated the current way.
->> [[done]]
->> --[[Joey]]
diff --git a/doc/bugs/map_not_respecting_annex_ssh_options__63__.mdwn b/doc/bugs/map_not_respecting_annex_ssh_options__63__.mdwn
deleted file mode 100644
--- a/doc/bugs/map_not_respecting_annex_ssh_options__63__.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-### What steps will reproduce the problem?
-
-1. Have a remote that uses annex-ssh-options to specify an sshkey which is needed to invoke git-annex-shell on that remote.
-2. Run git-annex map.
-
-### What is the expected output? What do you see instead?
-
-I expect to see a map without any errors complaining of commands not recognized.
-
-Instead I see:
-
-    greg@x200s:~/Pictures/Photos$ git-annex map
-    map /home/greg/Pictures/Photos ok
-    map 60justin (sshing...) 
-    ok
-    map rose (sshing...) 
-    fatal: unrecognized command 'cd '/home/greg/Media/Pictures/Photos/' && git config --null --list'
-    git-annex-shell: git-shell failed
-
-relevant part of .git/config:
-
-    [remote "rose"]
-        url = greg@rose.makesad.us:/home/greg/Media/Pictures/Photos/
-        fetch = +refs/heads/*:refs/remotes/rose/*
-        annex-ssh-options = "-i /home/greg/.ssh/annex.x200s_rsa"
-        annex-trustlevel = trusted
-        annex-uuid = c0e4106e-2631-11e2-9749-1bfa37a61069
-
-
-### What version of git-annex are you using? On what operating system?
-
-    git-annex version: 3.20121017
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3
-    upgrade supported from repository versions: 0 1 2
-
-> [[done]], see comment --[[Joey]]
diff --git a/doc/bugs/microsd__47__thumbdrives_seem_to_die_when_using_the_ARM_build.mdwn b/doc/bugs/microsd__47__thumbdrives_seem_to_die_when_using_the_ARM_build.mdwn
deleted file mode 100644
--- a/doc/bugs/microsd__47__thumbdrives_seem_to_die_when_using_the_ARM_build.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-### Please describe the problem.
-
-1 thumb drive became corrupted when using as a server on raspberry pi, and 2 microSD cards when using as a client in my phone. Both happened during syncing largish repository. (corrupted = permanent input/output error)
-
-* Put git annex on my android phone with a 64GB (FAT) micro SD, fired up git annex, it got reported as corrupted half on hour later, reformatting worked but got reported as corrupted again.
-
-* Put git annex assistant on my raspberry pi, one of the thumbdrives in my LVM (ext4) got corrupted shortly after I began using the assistant. I replaced them with a cheap real SSD drive, and had no problem since.
-
-* Put git annex back on my android phone. Kept it going for an extended sync session, but it never started syncing. I kept it going for an hour or so, and my new 32GB microSD (FAT) got corrupted.
-
-The pattern is nothing like proof, but it seems to be too regular to be completely coincidental. The pattern seems to be: ARM + (SDcard|USBstick) + Assistant = drive corruption.
-
-My guess is that the ARM build might have some kind of unlucky write pattern or loop that causes increased wear, but I know very little of the interna.
-
-### What steps will reproduce the problem?
-
-* Get a raspberry pi and a USB stick, or an android phone and a microSD card
-* Get an [ARM build of the assistant](https://github.com/tradloff/git-annex-RPi)
-* Sync a largish (12GB) repository
-
-### What version of git-annex are you using? On what operating system?
-
-4.20131002 on the pi, 20131024 for the 32GB SD, and 20131015 for the 64GB SD.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-Unfortunately, daemon.log was unrecoverable along with the other files on the SD card.
-
-I can try and autosync the daemon.log somewhere if I happen to come along a bunch of scrap flash storage (not impossible).
-
-# End of transcript or log.
-"""]]
-
-[[done]]
diff --git a/doc/bugs/missing_dependency_in_git-annex-3.20130216.mdwn b/doc/bugs/missing_dependency_in_git-annex-3.20130216.mdwn
deleted file mode 100644
--- a/doc/bugs/missing_dependency_in_git-annex-3.20130216.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-What steps will reproduce the problem?
-
-build git-annex-3.20130216 on OS X lion
-
-
-What is the expected output? What do you see instead?
-
-successful compile; error was:
-
-```
-Annex/UUID.hs:30:8:
-    Could not find module `System.Random'
-    It is a member of the hidden package `random-1.0.1.1'.
-    Perhaps you need to add `random' to the build-depends in your .cabal file.
-    Use -v to see a list of the files searched for.
-```
-
-
-What version of git-annex are you using? On what operating system?
-
-building git-annex-3.20130216 on OS X Lion
-
-
-Please provide any additional information below.
-
-
-adding 'random' to the BuildDepends in git-annex.cabal does indeed fix the error.
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/missing_kde__47__gnome_menu_item..mdwn b/doc/bugs/missing_kde__47__gnome_menu_item..mdwn
deleted file mode 100644
--- a/doc/bugs/missing_kde__47__gnome_menu_item..mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-What steps will reproduce the problem?
-  apt-get install git-annex
-
-
-
-What is the expected output?
- a menu item at kde or gnome at internet> Git Annex , as
-http://git-annex.branchable.com/assistant/  shows.
-
- What do you see instead? no menu item.
-
-
-What version of git-annex are you using?
-Version: 1:1.7.10.4-1+wheezy1
-
- On what operating system?
-Wheezy
-
-
- Also
-I just installed git-annex on a squeeze system and had the same result.
-
-same with ubuntu precise 12.04
-
-> git-annex ships a /usr/share/applications/git-annex.desktop
-> file that provies the menu item. But there has never been a version
-> 1.7.10. I suspect this is user error; installing a version of git-annex
-> that predates the git-annex assistant and expecting it to have the
-> assistant and its menu item. [[done]] --[[Joey]] 
diff --git a/doc/bugs/moreinfo.mdwn b/doc/bugs/moreinfo.mdwn
--- a/doc/bugs/moreinfo.mdwn
+++ b/doc/bugs/moreinfo.mdwn
@@ -2,5 +2,5 @@
 information. Please respond to the bug and provide the requested
 information.
 
-[[!inline pages="./* and link(./moreinfo) and !link(./done) and !*/Discussion" sort=mtime show=10
+[[!inline pages="./* and link(./moreinfo) and !link(./done) and !*/Discussion" sort=mtime show=0
 archive=yes]]
diff --git a/doc/bugs/nfs_mounted_repo_results_in_errors_on_drop_move.mdwn b/doc/bugs/nfs_mounted_repo_results_in_errors_on_drop_move.mdwn
deleted file mode 100644
--- a/doc/bugs/nfs_mounted_repo_results_in_errors_on_drop_move.mdwn
+++ /dev/null
@@ -1,59 +0,0 @@
-I'm on an nfs mounted filesystem (some netapp somewhere).  This is repeatable, every time.
-
-    git init repo; cd repo;
-    git annex init repo
-    truncate -s 20M big
-    git annex add big
-    git commit -m "annexed file"
-    cd ..
-    git clone repo repo_copy
-    cd repo_copy;
-    git annex get .
-    git annex whereis big
-
-    #whereis big (2 copies) 
-    #   	9310b242-6021-4621-8cef-4548a00907ff -- here
-    #   	b3526e4d-38d7-4781-a9c3-436007899f1b -- origin (repo)
-    #ok
-
-    git annex drop big
-
-    #git-annex: /nfspath/repo_copy/.git/annex/objects/fM/4k/SHA1-s20971520--9674344c90c2f0646f0b78026e127c9b86e3ad77: removeDirectory: unsatisified constraints (Directory not empty)
-    #failed
-    #git-annex: drop: 1 failed
-
-    git annex drop big  # no error second time, I suspect nfs has caught up by now.
-    git annex fsck      # Doesn't know that the second drop succeeded.
-
-    #fsck big (fixing location log) 
-    #  ** Based on the location log, big
-    #  ** was expected to be present, but its content is missing.
-    #failed
-    #git-annex: fsck: 1 failed
-
-    git annex fsck
-
-    #fsck big ok
-
-    git annex whereis big
-
-    #whereis big (1 copy) 
-    #  	b3526e4d-38d7-4781-a9c3-436007899f1b -- origin (repo)
-    #ok
-
-I suspect git-annex is just too fast and optimistic for big slow nfs directories.
-
-> git-annex locks files while it is operating on their content
-> to avoid race conditions with other git-annex processes. 
-> Quite likely this problem (which I can reproduce) is due to
-> NFS having bad (non-POSIX) locking semantics. 
-> 
-> Probably the
-> lock is represented on the NFS server as some form of lock file
-> next to the file being locked, and so when that file is deleted, with
-> the lock still held, the directory, which should then be empty, still
-> contains this lock file.
-> 
-> So, this can be worked around by it not failing when the directory
-> unexpectedly cannot be removed. I've made that change. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/not_possible_to_have_annex_on_a_separate_filesystem.mdwn b/doc/bugs/not_possible_to_have_annex_on_a_separate_filesystem.mdwn
deleted file mode 100644
--- a/doc/bugs/not_possible_to_have_annex_on_a_separate_filesystem.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-I belive I have found a regression.
-
-Inspired by 
-<http://git-annex.branchable.com/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/>
-I tried to only have .git/annex/objects (also tested moving .git/annex) on NFS while having the rest on local SSD disk.
-
-But when trying to add files i get:
-
-     > git annex add testfile
-    add testfile (checksum...) 
-    git-annex: testfile: rename: unsupported operation (Invalid cross-device link)
-    failed
-    git-annex: add: 1 failed
-
-I have tried both using bind-mount and with a sym-link.
-
-> Grepping for `renameFile` and `createLink` will find all the places
-> in git-annex that assume one filesystem. These would have to be changed
-> to catch errors and fall back to expensive copying.
-> 
-> Putting a separate repository on the file server could work better
-> depending on what you're trying to do. --[[Joey]] 
-
->> I've added support for putting `.git/annex` on a separate filesystem
->> from the rest of the git repository.
->> 
->> Putting individual subdirectories like `.git/annex/objects` on separate
->> filesystems from other subdirectories is not fully supported; it may
->> work but it may be slow and a few things (like `git annex migrate`) are
->> known to fail due to using hard links. I don't think this is worth
->> supporting. [[done]]
->> --[[Joey]]
diff --git a/doc/bugs/old_data_isn__39__t_unused_after_migration.mdwn b/doc/bugs/old_data_isn__39__t_unused_after_migration.mdwn
deleted file mode 100644
--- a/doc/bugs/old_data_isn__39__t_unused_after_migration.mdwn
+++ /dev/null
@@ -1,66 +0,0 @@
-Old data isn't listed as unused after migrating backends:
-
-    #!/bin/bash
-    
-    BASE=/tmp/migrate-bug-2
-    set -x
-    chmod -R +w $BASE
-    rm -rf $BASE
-    mkdir -p $BASE
-    cd $BASE
-    
-    # create annex
-    git init .
-    git annex init
-    
-    # make a big (sparse) file and add it
-    dd if=/dev/zero of=bigfile bs=1 count=0 seek=1G
-    git annex add --backend WORM bigfile
-    git commit -m 'added bigfile'
-    
-    # migrate it
-    git annex migrate --backend SHA256 bigfile
-    
-    # status shows 2 keys taking up 2G
-    git annex status
-    
-    # but nothing is unused
-    git annex unused
-
-Output:
-
-    ++ git annex status
-    supported backends: SHA256 SHA1 SHA512 SHA224 SHA384 SHA256E SHA1E SHA512E SHA224E SHA384E WORM URL
-    supported remote types: git S3 bup directory rsync web hook
-    known repositories: 
-            ede95a82-1166-11e1-a475-475d55eb0f8f -- here
-    local annex keys: 2
-    local annex size: 2 gigabytes
-    visible annex keys: 1
-    visible annex size: 1 gigabyte
-    backend usage: 
-            WORM: 1
-            SHA256: 1
-    ++ git annex unused
-    unused . (checking for unused data...) (checking master...) ok
-
-The two files are hardlinked, so it's not taking up extra space, but it would be nice to be able to remove the old keys.
-
-> `git annex unused` checks the content of all branches, and assumes that,
-> when a branch contains a file that points to a key, that key is still 
-> used. In this case, the migration has staged a change to the file,
-> but it is not yet committed, so when it checks the master branch, it
-> still finds a file referring to the old key. 
-> 
-> So, slightly surprising, but not a bug. --[[Joey]] [[done]]
-
->> Thanks for the explanation.  In my real repository, it was a bit trickier:
->> the migration was commited to `master`, but other *remote* branches still
->> referenced those keys.  I was just doing a `git pull` from a central repo, but
->> needed a `git remote update` to remove those references from `remotes/foo/master` too.
->> --Jim
-
->>> I have considered making unused ignore remote tracking branches. 
->>> On the one hand, it can be a little bit confusing, and those branches
->>> can be out of date. On the other hand, it can be useful to know you're
->>> not dropping anything that some remote might still refer to. --[[Joey]] 
diff --git a/doc/bugs/on--git-dir_and_--work-tree_options.mdwn b/doc/bugs/on--git-dir_and_--work-tree_options.mdwn
deleted file mode 100644
--- a/doc/bugs/on--git-dir_and_--work-tree_options.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-git-annex does not take into account the --git-dir and --work-tree command line options (while they can be useful when scripting).
-
-    > mkdir /tmp/test
-    > cd /tmp/test
-    > git init
-    Initialized empty Git repository in /tmp/test/.git/
-    > git annex init test
-    init test ok
-    > touch foo
-    > cd
-    > git --git-dir=/tmp/test/.git --work-tree=/tmp/test annex add foo
-    git-annex: Not in a git repository.
-
-regular git add works:
-
-    > git --git-dir=/tmp/test/.git --work-tree=/tmp/test add foo
-    > git --git-dir=/tmp/test/.git --work-tree=/tmp/test status 
-    # On branch master
-    #
-    # Initial commit
-    #
-    # Changes to be committed:
-    #   (use "git rm --cached <file>..." to unstage)
-    #
-    #       new file:   foo
-    #
-
-git-annex version: 3.20110702
-
-> [[done]], git-annex now honors `GIT_DIR` and `GIT_WORK_TREE` like other
-> git commands do. --[[Joey]]
diff --git a/doc/bugs/one_test_fail_on_osx.mdwn b/doc/bugs/one_test_fail_on_osx.mdwn
deleted file mode 100644
--- a/doc/bugs/one_test_fail_on_osx.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-### Please describe the problem.
-
-git-annex test reports: 1 out of 120 tests failed
-
-    ...
-      Unit Tests (indirect)
-    ...
-        lock:                                           FAIL
-          lock --force failed
-    ...
-
-### What version of git-annex are you using? On what operating system?
-
-    $ git-annex version
-    git-annex version: 5.20131221-g00d1673
-    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-    remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-    local repository version: 3
-    default repository version: 3
-    supported repository versions: 3 5
-    upgrade supported from repository versions: 0 1 2 4
-
-    $ git --version
-    git version 1.8.4
-
-    System Version: OS X 10.9 (13A603)
-
-> This was a type in the test suite. It's already fixed in git. [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/ordering.mdwn b/doc/bugs/ordering.mdwn
deleted file mode 100644
--- a/doc/bugs/ordering.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-One would expect "git annex get foo bar" to first retrieve foo, and then
-bar. Actually though, it will operate on them in alphabetical order
-(probably). This is annoying when you wanted to 1st list the most important
-files to get. Maybe you'll run out of time before all can be gotten. The
-workaround of course is to run "git annex get" twice.
-
-This ordering comes from "git ls-files". git-annex passes it all the files
-the user specified. This is a useful optimisation -- earlier it would
-run "git ls-files" once per parameter, and so "git annex get *" could be
-rather slow. But, it produces this ordering problem.
-
-[[done]]
diff --git a/doc/bugs/pages_of_packfile_errors.mdwn b/doc/bugs/pages_of_packfile_errors.mdwn
deleted file mode 100644
--- a/doc/bugs/pages_of_packfile_errors.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-A repair that runs for ages. In the log file, pages and pages and pages of:
-
-error: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack does not match index
-warning: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack cannot be accessed
-error: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack does not match index
-warning: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack cannot be accessed
-error: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack does not match index
-warning: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack cannot be accessed
-error: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack does not match index
-warning: packfile /Volumes/BandZbackup2/annex/.git/objects/pack/pack-f0ae2f5cc83f11eab406518b9f06a344acf9c93c.pack cannot be accessed
-
-### What steps will reproduce the problem?
-
-Running git-annex, plugging in my external drive
-
-### What version of git-annex are you using? On what operating system?
-
-Auto-updated latest, I thought, but the about page says: Version: 5.20131230-g9a495e6 
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> I think I've fixed this bug. Followup if not.. [[done]] --[[Joey]] 
diff --git a/doc/bugs/pasting_into_annex_on_OSX.mdwn b/doc/bugs/pasting_into_annex_on_OSX.mdwn
deleted file mode 100644
--- a/doc/bugs/pasting_into_annex_on_OSX.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-What steps will reproduce the problem?
-
-Try pasting file into annex directory while assistant is running.
-
-
-What is the expected output? What do you see instead?
-
-Expect file to successfully paste into directory, then be annexed. Instead, see a permissions error, and file disappears.
-
-
-What version of git-annex are you using? On what operating system?
-
-OSX - 10.6. zsh. git-annex version: 3.20120826
-
-Please provide any additional information below.
-
-> Ok, I've put in the one second delay to adding by default on OSX.
-> I consider this bug done, at least for now..
-
->> Reopening since I've heard from someone else that it can still happen.
->> --[[Joey]] 
-
->>> Closing again, since the assistant now makes new repositories on OSX
->>> using direct mode, which should avoid this problem. NB: any existing
->>> repositories you have on OSX should be switched to use direct mode by
->>> manually running `git annex direct` in them. [[done]] --[[Joey]]
-
-[[!tag /design/assistant/OSX]]
diff --git a/doc/bugs/problem_to_addurl_--file_with_ftp.mdwn b/doc/bugs/problem_to_addurl_--file_with_ftp.mdwn
deleted file mode 100644
--- a/doc/bugs/problem_to_addurl_--file_with_ftp.mdwn
+++ /dev/null
@@ -1,67 +0,0 @@
-### Please describe the problem.
-I want to addurl using ftp protocol.
-`git annex addurl ftp://...` works fine, but `git annex addurl --file` fails with an error "failed to verify url exists".
-
-### What steps will reproduce the problem?
-
-setting up a new repo
-
-    % alias ga  
-    ga=/home/applis/git-annex.linux/git-annex  
-    % ga init  
-    init  ok  
-    (Recording state in git...)  
-
-addurl --file works with http
-
-    % wget http://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz  
-    [...]  
-    2014-03-27 15:25:06 (10,1 MB/s) - ‘git-annex-standalone-amd64.tar.gz’ saved [30689438/30689438]  
-    % ga add git-annex-standalone-amd64.tar.gz  
-    add git-annex-standalone-amd64.tar.gz ok  
-    (Recording state in git...)  
-    % ga addurl http://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz --file git-annex-standalone-amd64.tar.gz  
-    addurl git-annex-standalone-amd64.tar.gz ok  
-    (Recording state in git...)  
-
-addurl works with ftp:
-
-    % ga addurl ftp://ftp.belnet.be/debian-cd/7.4.0-live/i386/iso-hybrid/debian-live-7.4-i386-lxde-desktop.iso.log  
-    addurl ftp.belnet.be_debian_cd_7.4.0_live_i386_iso_hybrid_debian_live_7.4_i386_lxde_desktop.iso.log (downloading ftp://ftp.belnet.be/debian-cd/7.4.0-live/i386/iso-hybrid/debian-live-7.4-i386-lxde-desktop.iso.log ...)  
-    [...]  
-    2014-03-27 15:27:47 (11,1 MB/s) - ‘/data/annex/.git/annex/tmp/URL--ftp&c%%ftp.belnet.be%debian-cd%7.4.0-live%i386%iso-hybrid%debian-live-7.4-i386-lxde-desktop.iso.log’ saved [1235181]  
-    ok  
-    (Recording state in git...)  
-
-addurl --file doesn't work with ftp
-
-    % wget ftp://ftp.belnet.be/debian-cd/7.4.0-live/i386/iso-hybrid/debian-live-7.4-i386-standard.iso.zsync  
-    [...]  
-    2014-03-27 15:29:32 (19,4 MB/s) - ‘debian-live-7.4-i386-standard.iso.zsync’ saved [1932014]  
-    % ga add debian-live-7.4-i386-standard.iso.zsync  
-    add debian-live-7.4-i386-standard.iso.zsync ok  
-    (Recording state in git...)  
-    % ga addurl ftp://ftp.belnet.be/debian-cd/7.4.0-live/i386/iso-hybrid/debian-live-7.4-i386-standard.iso.zsync --file debian-live-7.4-i386-standard.iso.zsync   
-    addurl debian-live-7.4-i386-standard.iso.zsync   
-      failed to verify url exists: ftp://ftp.belnet.be/debian-cd/7.4.0-live/i386/iso-hybrid/debian-live-7.4-i386-standard.iso.zsync  
-    failed  
-    git-annex: addurl: 1 failed  
-
-### What version of git-annex are you using? On what operating system?
-
-I am using current git-annex binary linux version on Fedora 19.
-
-    % which git ; git --version  
-    /usr/bin/git  
-    git version 1.8.3.1  
-    % which ga ; ga version  
-    ga=/home/applis/git-annex.linux/git-annex  
-    git-annex version: 5.20140320-g63535e3  
-    build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash  
-    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL  
-    remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external  
-    local repository version: 5  
-    supported repository version: 5  
-    upgrade supported from repository versions: 0 1 2 4  
-
-> [[done]] --[[Joey]]
diff --git a/doc/bugs/problems_with_utf8_names.mdwn b/doc/bugs/problems_with_utf8_names.mdwn
deleted file mode 100644
--- a/doc/bugs/problems_with_utf8_names.mdwn
+++ /dev/null
@@ -1,81 +0,0 @@
-This bug is reopened to track some new UTF-8 filename issues caused by GHC
-7.4. In this version of GHC, git-annex's hack to support filenames in any
-encoding no longer works. Even unicode filenames fail to work when
-git-annex is built with 7.4. --[[Joey]]
-
-This bug is now fixed in current master. Once again, git-annex will work
-for all filename encodings, and all system encodings. It will
-only build with the new GHC. [[done]] --[[Joey]] 
-
-----
-
-Old, now fixed bug report follows:
-
-There are problems with displaying filenames in UTF8 encoding, as shown here:
-
-    $ echo $LANG
-    en_GB.UTF-8
-    $ git init
-    $ git annex init test
-    [...]
-    $ touch "Umlaut Ü.txt"
-    $ git annex add Uml*
-    add Umlaut Ã.txt ok
-    (Recording state in git...)
-    $ find -name U\* | hexdump -C
-    00000000  2e 2f 55 6d 6c 61 75 74  20 c3 9c 2e 74 78 74 0a  |./Umlaut ...txt.|
-    00000010
-    $ git annex find | hexdump -C
-    00000000  55 6d 6c 61 75 74 20 c3  83 c2 9c 2e 74 78 74 0a  |Umlaut .....txt.|
-    00000010
-    $
-
-It looks like the common latin1-to-UTF8 encoding. Functionality other than otuput seems not to be affected.
-
-> Yes, I believe that git-annex is reading filename data from git
-> as a stream of char8s, and not decoding unicode in it into logical
-> characters.
-> Haskell then I guess, tries to unicode encode it when it's output to
-> the console.
-> This only seems to matter WRT its output to the console; the data
-> does not get mangled internally and so it accesses the right files
-> under the hood.
-> 
-> I am too new to haskell to really have a handle on how to handle
-> unicode and other encodings issues with it. In general, there are three
-> valid approaches: --[[Joey]] 
-> 
-> 1. Convert all input data to unicode and be unicode clean end-to-end
->    internally. Problimatic here since filenames may not necessarily be
->    encoded in utf-8 (an archive could have historical filenames using
->    varying encodings), and you don't want which files are accessed to
->    depend on locale settings.
->    > I tried to do this by making parts of GitRepo call
->    > Codec.Binary.UTF8.String.decodeString when reading filenames from
->    > git. This seemed to break attempts to operate on the files,
->    > weirdly encoded strings were seen in syscalls in strace.
-> 1. Keep input and internal data un-decoded, but decode it when
->    outputting a filename (assuming the filename is encoded using the
->    user's configured encoding), and allow haskell's output encoding to then
->    encode it according to the user's locale configuration.
->    > This is now implemented. I'm not very happy that I have to watch
->    > out for any place that a filename is output and call `filePathToString`
->    > on it, but there are really not too many such places in git-annex.
->    >
->    > Note that this only affects filenames apparently. 
->    > (Names of files in the annex, and also some places where names
->    > of keys are displayed.) Utf-8 in the uuid.map file etc seems
->    > to be handled cleanly.
-> 1. Avoid encodings entirely. Mostly what I'm doing now; probably
->    could find a way to disable encoding of console output. Then the raw
->    filename would be displayed, which should work ok. git-annex does
->    not really need to pull apart filenames; they are almost entirely
->    opaque blobs. I guess that the `--exclude` option is the exception
->    to that, but it is currently not unicode safe anyway. (Update: tried
->    `--exclude` again, seems it is unicode clean..)
->    One other possible
->    issue would be that this could cause problems if git-annex were
->    translated.
->    > On second thought, I switched to this. Any decoding of a filename
->    > is going to make someone unhappy; the previous approach broke
->    > non-utf8 filenames.
diff --git a/doc/bugs/protocol_mismatch_after_interrupt.mdwn b/doc/bugs/protocol_mismatch_after_interrupt.mdwn
--- a/doc/bugs/protocol_mismatch_after_interrupt.mdwn
+++ b/doc/bugs/protocol_mismatch_after_interrupt.mdwn
@@ -29,3 +29,5 @@
 workaround: `cd .git/annex/; mv transfer transfer.old` on the other side.
 
 -- [[anarcat]]
+
+[[moreinfo]]
diff --git a/doc/bugs/quvi_0.9.5_does_not_work_with_git-annex.mdwn b/doc/bugs/quvi_0.9.5_does_not_work_with_git-annex.mdwn
deleted file mode 100644
--- a/doc/bugs/quvi_0.9.5_does_not_work_with_git-annex.mdwn
+++ /dev/null
@@ -1,87 +0,0 @@
-### Please describe the problem.
-The syntax of quvi has changed somewhat, breaking use in git-annex.
-
-quvi now requires one of four «commands» to be supplied: dump, get, info, scan
-
-### What steps will reproduce the problem?
-Install quvi 0.9.5, attempt to download a video.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 5.20140227-gd872677
-
-On ArchLinux up-to-date as of 28th of February 2014
-
-### Please provide any additional information below.
-
-[[!format text """
-[0 zerodogg@browncoats Dokumentar]$ git annex addurl 'quvi:https://www.youtube.com/watch?v=de20gulo78g' --debug  
-[2014-02-28 09:33:22 CET] read: quvi ["--verbosity","quiet","-c","http","https://www.youtube.com/watch?v=de20gulo78g"]
-error: `--verbosity' is not a quvi command. See 'quvi help'.
-git-annex: quvi failed
-[1 zerodogg@browncoats Dokumentar]$ quvi --version
-quvi v0.9.5
-  built on 2013-11-12 17:02:06 +0000 for x86_64-unknown-linux-gnu
-    with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
-  configuration: --prefix=/usr
-libquvi v0.9.4
-  built on 2013-12-17 11:27:41 +0000 for x86_64-unknown-linux-gnu
-    with gcc, -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4
-  configuration: --prefix=/usr
-libquvi-scripts v0.9.20131130
-  configuration: --prefix=/usr --with-nsfw --with-geoblocked
-
-Copyright (C) 2012,2013  Toni Gundogdu <legatvs@gmail.com>
-quvi comes with ABSOLUTELY NO WARRANTY.  You may redistribute copies of
-quvi under the terms of the GNU Affero General Public License version 3
-or later. For more information, see <http://www.gnu.org/licenses/agpl.html>.
-
-To contact the developers, please mail to <quvi-devel@lists.sourceforge.net>
-[0 zerodogg@browncoats Dokumentar]$  quvi
-Usage: quvi [--version] [--help] COMMAND [ARGS]
-
-quvi commands are:
-  dump    Query and print the property values
-  get     Save media stream to a file
-  info    Inspect the configuration and the script properties
-  scan    Scan and print the found embedded media URLs
-
-See 'quvi help COMMAND' for more information on a specific command.
-[0 zerodogg@browncoats Dokumentar]$ git annex version
-git-annex version: 5.20140227-gd872677
-build flags: Assistant Webapp Pairing S3 Inotify DBus XMPP Feeds Quvi TDFA
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
-remote types: git gcrypt S3 bup directory rsync web tahoe glacier hook external
-local repository version: 5
-supported repository version: 5
-upgrade supported from repository versions: 0 1 2 4
-"""]]
-
-quvi dump is probably something you could use
-
-[[!format text """
-[0 zerodogg@browncoats Dokumentar]$ quvi dump 'https://www.youtube.com/watch?v=de20gulo78g'
-QUVI_MEDIA_PROPERTY_THUMBNAIL_URL=https://i1.ytimg.com/vi/de20gulo78g/default.jpg                                                                                        
-QUVI_MEDIA_PROPERTY_TITLE=[Linux.conf.au 2013] - Git-annex
-QUVI_MEDIA_PROPERTY_ID=de20gulo78g
-QUVI_MEDIA_PROPERTY_START_TIME_MS=0
-QUVI_MEDIA_PROPERTY_DURATION_MS=2328000
-QUVI_MEDIA_STREAM_PROPERTY_VIDEO_ENCODING=vp8.0
-QUVI_MEDIA_STREAM_PROPERTY_AUDIO_ENCODING=vorbis
-QUVI_MEDIA_STREAM_PROPERTY_CONTAINER=webm
-QUVI_MEDIA_STREAM_PROPERTY_URL=[Long googlevideo.com URL]
-QUVI_MEDIA_STREAM_PROPERTY_ID=medium_webm_i43_360p
-QUVI_MEDIA_STREAM_PROPERTY_VIDEO_BITRATE_KBIT_S=0
-QUVI_MEDIA_STREAM_PROPERTY_AUDIO_BITRATE_KBIT_S=0
-QUVI_MEDIA_STREAM_PROPERTY_VIDEO_HEIGHT=360
-QUVI_MEDIA_STREAM_PROPERTY_VIDEO_WIDTH=640
-"""]]
-
-It does however output some status messages to STDERR (which it removes later) that doesn't look to be possible to suppress.
-
-[[!format text """
-[0 zerodogg@browncoats Dokumentar]$ quvi dump 'https://www.youtube.com/watch?v=de20gulo78g' >/dev/null 2>stderr
-[0 zerodogg@browncoats Dokumentar]$ cat -v stderr 
-status: o--- resolve <url> ...                                                 ^M                                                                               ^Mstatus: -o-- fetch <url> ...                                                   ^M                                                                               ^M%               [0 zerodogg@browncoats Dokumentar]$              
-""" ]]
-
-> quvi version now probed at runtime. [[done]] --[[Joey]]
diff --git a/doc/bugs/reinject_should_leave_file_in_place_on_checksum_mismatch.mdwn b/doc/bugs/reinject_should_leave_file_in_place_on_checksum_mismatch.mdwn
deleted file mode 100644
--- a/doc/bugs/reinject_should_leave_file_in_place_on_checksum_mismatch.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-What steps will reproduce the problem?
-
-Run git annex reinject source dest with a file that has the wrong content and thus a wrong checksum.
-
-What is the expected output? What do you see instead?
-
-The file should stay in it's original location. Currently it's moved to .git/annex/bad with a mangled filename.
-
-What version of git-annex are you using? On what operating system?
-
-git-annex version: 3.20120807
-Ubuntu 12.04 updated on Aug 20th
-annex was installed via cabal on Aug 20th, all other packages are from ubuntu.
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/remote_gcrypt_based_repos_and_conflicting_uuids.mdwn b/doc/bugs/remote_gcrypt_based_repos_and_conflicting_uuids.mdwn
--- a/doc/bugs/remote_gcrypt_based_repos_and_conflicting_uuids.mdwn
+++ b/doc/bugs/remote_gcrypt_based_repos_and_conflicting_uuids.mdwn
@@ -21,3 +21,10 @@
 
 # End of transcript or log.
 """]]
+
+> [[fixed|done]]; <>. I have updated the OSX autobuilder so tonight's
+> build will include the fixed git-remote-gcrypt. --[[Joey]]
+>
+> Note that gcrypt repositories affected by this bug are in fact empty, so
+> the first time a push is made with the fixed gcrypt it will probably
+> generate a new gcrypt-id and push everything.
diff --git a/doc/bugs/remote_not_showing_up_in_webapp.mdwn b/doc/bugs/remote_not_showing_up_in_webapp.mdwn
--- a/doc/bugs/remote_not_showing_up_in_webapp.mdwn
+++ b/doc/bugs/remote_not_showing_up_in_webapp.mdwn
@@ -86,3 +86,15 @@
 """]]
 
 Finally, note that you sometimes see `desktop008` above: it turns out I am running `git annex` from my workstation, which NFS-mounts the `/home` directory of `markov` into `/srv/musique`.  --[[anarcat]]
+
+Yesterday, I made the webapp register ssh remotes it creates. 
+They then show up in the webapp when run in a repository where that ssh
+remote is not enabled.
+
+You can also manually register a ssh remote. First set up the git remote
+as usual. Then run `git annex initremote type=git name=foo
+location=$url`.
+
+[[!meta title="webapp shows transfer from 'unknown' when no remote is configured for a system that is downloading files"]]
+
+[[!tag confirmed]]
diff --git a/doc/bugs/removable_device_configurator_chokes_on_spaces.mdwn b/doc/bugs/removable_device_configurator_chokes_on_spaces.mdwn
deleted file mode 100644
--- a/doc/bugs/removable_device_configurator_chokes_on_spaces.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-# What steps will reproduce the problem?
-
-1. Get a removable device and create a filesystem with a label containing a space, e.g.:
-    # mkfs.ext4 -L "Backup Home" /dev/sdb1
-2. Open the webapp and add a new repository on a removabledevice
-3. Select the devices mountpoint, e.g. /media/Backup\ Home
-
-# What is the expected output? What do you see instead?
-
-The configurator should remove spaces for branch names, but it actually seems to call git remote add with "Backup Home" as argument which is invalid.
-
-The assistant produces an internal server error and subsequently crashes completely.
-
-# What version of git-annex are you using? On what operating system?
-
-git-annex 3.20120924 from the Debian package in sid on Debian wheezy, amd64.
-
-> Thanks for reporting this, I've fixed it in git. [[done]] --[[Joey]] 
diff --git a/doc/bugs/repair_fails_when_home_on_seperate_partition.mdwn b/doc/bugs/repair_fails_when_home_on_seperate_partition.mdwn
deleted file mode 100644
--- a/doc/bugs/repair_fails_when_home_on_seperate_partition.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-### Please describe the problem.
-
-
-### What steps will reproduce the problem?
-
-(1) Place a broken repo on a different mount point than the root partition.
-
-(2) Run
-    git annex repair.
-
-### What version of git-annex are you using? On what operating system?
-
- 5.20131118-gc7e5cde on Ubuntu 12.04
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-$ git annex repair --force
-
-Running git fsck ...
-git fsck found 74 broken objects.
-Unpacking all pack files.
-Unpacking objects: 100% (2307/2307), done.
-Unpacking objects: 100% (241565/241565), done.
-Re-running git fsck to see if it finds more problems.
-Initialized empty Git repository in /tmp/tmprepo.0/.git/
-Trying to recover missing objects from remote pi.fritz.box__var_lib_store_annex
-Trying to recover missing objects from remote pi.fritz.box__var_lib_store_annex
-74 missing objects could not be recovered!
-
-
-Deleted remote branch pi.fritz.box__var_lib_store_annex/master (was dffa056).
-error: Could not read 4e01bbdc7ce31247ad66ab13ca46925ac2c8db9a
-fatal: Failed to traverse parents of commit 718525a48b4d6b3404eda5e189332d73c968a2be
-Deleted remote branch pi.fritz.box__var_lib_store_annex/synced/git-annex (was 718525a).
-Deleted remote branch pi.fritz.box__var_lib_store_annex/synced/master (was 9aedf69).
-Deleted remote branch pi.fritz.box_annex/synced/master (was 92b1042).
-Deleted remote branch store/master (was b059380).
-removed 5 remote tracking branches that referred to missing objects
-fatal: bad object refs/heads/git-annex
-fatal: bad object refs/heads/git-annex
-fatal: bad object refs/heads/git-annex
-error: remote branch 'git-annex' not found.
-
-git-annex: /tmp/packed-refs19813: rename: unsupported operation (Invalid cross-device link)
-failed
-git-annex: repair: 1 failed
-
-
-# End of transcript or log.
-"""]]
-
-> Thanks for reporting. As far as I can see, this was fixed
-> accidentially, when I rewrote the packed refs file handling code to not
-> re-write the file. It had been using a temp file, and renaming it, thus
-> the problem. I checked the repair code and can find no other probems
-> of this sort currently in it. [[done]] --[[Joey]]
diff --git a/doc/bugs/restart_daemon_required.mdwn b/doc/bugs/restart_daemon_required.mdwn
deleted file mode 100644
--- a/doc/bugs/restart_daemon_required.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-Git annex refuses to get/drop files until it's manually relaunched.
-
-I'm trying to setup a basic dropbox like system where a couple of computers sync with a local server I have constantly running ubuntu with ssh.
-
-I think I've setup git annex correctly: when I put files in the repo folder they get uploaded to the bare git repo on the server over ssh automatically and the other computer updates with a broken alias to the file. However the file does not then download from the server despite it being available without a manual restart of the daemon or a git-annex get command from the terminal.
-
-Additionally, files inside archive folders do not get dropped once uploaded to the server without a restart of the daemon.
-
-
-My computers are each setup with the ssh server as a 2nd repository (fullarchive), they are both OSX, and running Version: 4.20130521-g25dba9d according to the webapp. I have also entered my gmail/jabber account on each mac which I believe allows them to communicate indirectly when using the ssh repo.
-
-
-I don't know if this is a setup/misconfiguration error or a bug but I can't see how I've setup the assistant wrong, I did manually change the remote url in the config file, as the assistant was having issues connecting  (I'm sshing on 21 for various reasons, although I thought this was supported and I no longer receive errors in the webapp now I've specified my remote.
-
-Should I put the corresponding computers as a repositories of each other? I thought each syncing independently with a centralised git would be a more reliable/simple situation than a potential 3 way sync?
-
-
-I hope this is enough information, I'm usually good at working out issues myself, however this is just frustrating me and the git-annex solution is so nearly perfect if it would work reliably that I can't bring myself to give up on it!
-
-Thanks!
-
-> [[done]], release notes updated; see my comment --[[Joey]]
diff --git a/doc/bugs/rsync_remote_shows_no_progress.mdwn b/doc/bugs/rsync_remote_shows_no_progress.mdwn
deleted file mode 100644
--- a/doc/bugs/rsync_remote_shows_no_progress.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-What steps will reproduce the problem?
-Init a annex, add rsync remote (with or without encryption, does not matter), launch annex assistant
-
-What is the expected output? What do you see instead?
-In the dashboard, no progress is recorded for the transfer. Each file stays at 0% and then disappears as it is fully transfered. I expect the progressbar to move and show the actual transfer progress.
-
-What version of git-annex are you using? On what operating system?
-git head of today, Ubuntu 12.04
-
-Please provide any additional information below.
-I looked in the source code and found some hints that the rsync progress should actually be evaluated and shown, I'm opening a bug report for this reason.
-
-[[!meta title="assistant: No progress bars for file uploads"]]
-
-> now upload progress bars work! [[done]] --[[Joey]]
diff --git a/doc/bugs/scp_interrupt_to_background.mdwn b/doc/bugs/scp_interrupt_to_background.mdwn
deleted file mode 100644
--- a/doc/bugs/scp_interrupt_to_background.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-When getting a file with scp, SIGINT is blocked, exposing the git
-subcommand fork to background bug again. [[done]]
diff --git a/doc/bugs/show_version_without_having_to_be_in_a_git_repo.mdwn b/doc/bugs/show_version_without_having_to_be_in_a_git_repo.mdwn
deleted file mode 100644
--- a/doc/bugs/show_version_without_having_to_be_in_a_git_repo.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-It'd be nice to be able to run "git annex version" -- and maybe some other
-commands, like "git annex" itself for the help text, without having to be
-inside a git repo. Right now it requires you to be in a git repo even if
-it's not a git-annex repo.
-
-> You need a newer verison of git-annex. --[[Joey]] 
-
-	joey@gnu:/>git annex version
-	git-annex version: 3.20120124
-
-[[done]]
diff --git a/doc/bugs/signal_weirdness.mdwn b/doc/bugs/signal_weirdness.mdwn
--- a/doc/bugs/signal_weirdness.mdwn
+++ b/doc/bugs/signal_weirdness.mdwn
@@ -46,3 +46,5 @@
 Which is why the current behavior of not blocking SIGINT was chosen,
 as a less bad alternative. Still, I'd like to find a better one.
 --[[Joey]] 
+
+[[!tag confirmed]]
diff --git a/doc/bugs/smarter_flood_filling.mdwn b/doc/bugs/smarter_flood_filling.mdwn
deleted file mode 100644
--- a/doc/bugs/smarter_flood_filling.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-The assistant performs a flood fill, sending every file to every remote
-that will have it. This is naive, but it's a good way to ensure the file
-gets to every corner of the repo network that it possibly can.
-
-However, this means that locally paired computers will still upload files
-to a transfer repo, even when they're next to each other and that
-is a massive waste of bandwidth.
-
-It occurred to me this morning that there is a simple change that can avoid
-this.
-
-1. Ensure that locally paired computers have a lower cost than network
-   transfer remotes. (done)
-2. When queuing uploads, queue transfers to the lowest cost remotes first.
-   (already done)
-3. Just before starting a transfer, re-check if the transfer is still wanted.
-   (done)
-
-> [[done]]
-
-Now, unnecessary transfers to tranfer repos are avoided if it can send
-the file locally instead.
-
-It doesn't solve it for all network topologies of course. If there
-are three computers paired in a line "A --- B --- C", and all 3 share
-a transfer repo, A will still send to both B and the transfer repo
-even though B can reach C via a faster route.
-
-See also: [[assistant does not always use repo cost info when queueing downloads]]
-
-[[!tag /design/assistant]]
diff --git a/doc/bugs/softlink_mtime.mdwn b/doc/bugs/softlink_mtime.mdwn
deleted file mode 100644
--- a/doc/bugs/softlink_mtime.mdwn
+++ /dev/null
@@ -1,54 +0,0 @@
-When adding files to git annex, softlinks are created with current atime (and ctime, etc). Instead, the atime of the added file should be used and added to the meta-data, restoring it everywhere an annex is cloned to. -- RichiH
-
-Optionally, editing the meta-data should change the times in all annexes.
-
-> Thing is, git does not preserve file timestamps much at all. 
-> It's not uncommon for a `git checkout` to or `git update` to
-> mess up timestamps. This is why things like metastore exist (and
-> metastore should work ok with git annexed files too). Trying to 
-> make annexed file symlinks have better timestamp handling than regular
-> files in git seems pointless. --[[Joey]]
-
-> > Improving an area where git is (not yet?) good at still makes sense, imo. Photos and the like need absolute timestamps more than source code which is fine with relative timestamps (local builds & updates). Maintaining global timestamps for source code could even cause a lot of unwanted effects. As it is, this issue is the only, but a major, blocker for me before I can start adapting git-annex. As I have three different use cases for it, this is a shame. Unfortunately, I don't speak any Haskell so scratching my own itch isn't do-able (without major effort and not soon, at least). Is there a realistic chance that you will tackle this nonetheless or is this WONTFIX? -- RichiH
-
->>> Not quite WONTFIX. git-annex should at least, when adding new files,
->>> preserve their timestamp in the symlink it creates.
->>>
->>> Since it doesn't have anything to do with maintaining the symlinks
->>> during an update, or a clone, etc, maintaining the permissions of them 
->>> is also out of scope, and it's best to just use metastore if you need
->>> it. Otherwise, git-annex would have to reimplement metastore, and is
->>> unlikely to do it better.
-
->>>> OK, thanks for the clarification. Would it be acceptable for you to put the timestamps into the metastore with vanilla git? If such an option existed, everyone would be able to benefit and not just me. -- RichiH
-
->>>>> I've now committed to git changes to make git-annex add make
->>>>> symlinks that reflect the original file's mtime. (It's not possible
->>>>> to set the ctime of a symlink; nor would you want to as messing with
->>>>> ctimes can break backup software ... and atime doesn't much matter.)
->>>>> 
->>>>> So all you have to do is make the pre-commit hook call
->>>>> [metastore](http://david.hardeman.nu/software.php). The hook
->>>>> would look like this: ---[[Joey]]
-
-	#!/bin/sh
-	git annex pre-commit .
-	metastore --save
-	git add .metadata
-
->>>>>> Thanks a lot. Doing this in a new git-annex repo from the start should at least ensure local consistency and I assume I can simply add a post-pull hook to restore the mtimes on all all other repositories? -- RichiH
-
->>>>>>> This is even better:
-
-    #!/bin/sh
-    if ! type metastore >/dev/null; then echo "$0: metastore is not installed; exiting"; exit 1; fi
-    git annex pre-commit .
-    metastore --save
-    git add .metadata
-
->>>>>>> -- RichiH
-
->>>>>>>> After getting to actually play with this from different machines with a bare git as central instance for several distributed repos, the metastore trick does not work. The .metadata is causing merge conflicts for every pull. I removed the "done" tag from this issue. -- RichiH
-
->>>>>>>>> softbox sounds _really_ nice. File systems need to preserve mtimes. Oviously, it would be nice if git-annex exposed this to the upper layer instead of relying on this FUSE implementation, or the next, or the other totally cool thing around the corner to implement it again and again. 
->>>>>>>>> I talked to the author of metastore; he is aware that the format is merge-unfriendly but never needed merges for himself. He is aware that this is not ideal for something like git. He does not have the time to implement a text storage instead of binary and I lack the skills to do it. If metastore is used, all it would need to do is introduce a new version of the store (it's versioned, apparently) and save metadata in text, one file per line. xattr would need to be ASCII-armoured, the rest could be plain text. I still think storing this directly in git-annex would make the most sense. Introducing a metadata storage file per storage object in .git/annex and using the object file's name as index is impossible because several softlinks might point to one object so it would need to be done per-softlink :/ -- RichiH
diff --git a/doc/bugs/ssh-askpass_locks_me_out_of_x_console.mdwn b/doc/bugs/ssh-askpass_locks_me_out_of_x_console.mdwn
deleted file mode 100644
--- a/doc/bugs/ssh-askpass_locks_me_out_of_x_console.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-### Please describe the problem.
-
-Can't access X console after returning to work overnight.
-
-### What steps will reproduce the problem?
-
-1. Create git-annex remote repository, with git annex assistance, connected via ssh, using ssh-agent key for authentication.
-2. "ssh-add -D" to delete the ssh key when not attending computer. Forget to kill git-annex assistant.
-3. Lock screen with xscreeensaver.
-4. Return to work. Unlock screen. Find keyboard and mouse not responding. However there are no dialog boxes on screen.
-5. Open up text console, kill the numerous ssh-askpass processes. Find more ssh-askpass processes. Kill the git-annex processes, then kill the ssh-askpass processes. Find I can access the x console again.
-
-### What version of git-annex are you using? On what operating system?
-
-Version 5.20140320~bpo70+1 in Debian backports.
-
-### Please provide any additional information below.
-
-This isn't git-annex's fault, but it is a serious problem with using git-annex assistant.
-
-Suspect ssh-askpass isn't displaying dialog properly as it conflicts with xscreensaver, which is running at the time.
-
-Not really sure what the solution is.
-
-Unfortunately, Out of time for today, will double check this report makes sense tomorrow.
-
-> [[done]] per my comment. --[[Joey]]
diff --git a/doc/bugs/ssh_connection_caching_broken_on_NTFS.mdwn b/doc/bugs/ssh_connection_caching_broken_on_NTFS.mdwn
deleted file mode 100644
--- a/doc/bugs/ssh_connection_caching_broken_on_NTFS.mdwn
+++ /dev/null
@@ -1,66 +0,0 @@
-TL;DNR ssh connection caching seems to cause git-annex to not work on NTFS volumes.  Setting `annex.sshcaching` to `false` seems to solve the problem.
-
-## What version of git-annex are you using? On what operating system? Please provide any additional information below.
-
-* git-annex version: 3.20120629 on Debian Testing.
-* `the-repo` is located on an NTFS volume on a USB HDD.
-* `the-remote` is on the server `example.com`.
-* `example.com` is running gitolite3 v3.2-19-gb9bbb78, git 1.7.2.5, and git-annex 3.20120629~bpo60+2
-
-
-## What steps will reproduce the problem? What is the expected output? What do you see instead?
-
-Create or clone a repo onto an NTFS volume.  
-Make sure `git annex` is initialized.  
-Run some regular git operations.  These always seem to work.  
-Try git-annex operations.  
-
-Some operations work despite the error messages:
-
-    $ git annex sync
-    Control socket connect(/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com): Connection refused
-    Failed to connect to new control master
-    Command ssh ["-S","/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@example.com","git-annex-shell 'configlist' '/~/the-repo.git'"] failed; exit code 255
-    Control socket connect(/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com): Connection refused
-    Failed to connect to new control master
-    Command ssh ["-S","/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@example.com","git-annex-shell 'configlist' '/~/the-repo'"] failed; exit code 255
-    commit  
-    # On branch master
-    nothing to commit (working directory clean)
-    ok
-    pull the-remote 
-    ok
-    pull origin 
-    ok
-
-Other operations fail:
-
-    $ git annex copy -t the-remote the-file.jpg
-    Control socket connect(/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com): Connection refused
-    Failed to connect to new control master
-    Command ssh ["-S","/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@example.com","git-annex-shell 'configlist' '/~/the-repo.git'"] failed; exit code 255
-    Control socket connect(/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com): Connection refused
-    Failed to connect to new control master
-    Command ssh ["-S","/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com","-o","ControlMaster=auto","-o","ControlPersist=yes","git@example.com","git-annex-shell 'configlist' '/~/the-repo'"] failed; exit code 255
-    copy the-file.jpg (checking the-remote...) Control socket connect(/media/NTFSVOL/the-repo/.git/annex/ssh/git@example.com): Connection refused
-    Failed to connect to new control master
-    (unable to check the-remote) failed
-    git-annex: copy: 1 failed
-
-Some googling revealed the errors to be stale socket files.  
-- [Three SSH Tips](http://shallowsky.com/blog/tags/ssh/)  
-- [Improving SSH (OpenSSH) connection speed with shared connections](http://protempore.net/~calvins/howto/ssh-connection-sharing/#section-03)  
-
-It appears that SSH connection caching was implemented in response to this wishlist item:  
-[wishlist: Prevent repeated password prompts for one command](http://git-annex.branchable.com/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command/)
-
-However ssh connection caching breaks things on NTFS volumes.  If I turn off connection caching, it seems to work fine
-
-    $ git config annex.sshcaching false
-
-but it would be nifty if git-annex could detect the filesystem type and do The Right Thing.
-
-Thanks for all the work on git-annex -- it's an awesome project!
-
-> [[done]], `git annex init` now probes for fifo support and disables ssh
-> connection caching if it cannot make one. --[[Joey]] 
diff --git a/doc/bugs/standalone_tarball_symlink_to_PATH_broken.mdwn b/doc/bugs/standalone_tarball_symlink_to_PATH_broken.mdwn
deleted file mode 100644
--- a/doc/bugs/standalone_tarball_symlink_to_PATH_broken.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Using the standalone build, on Linux, ln -s git-annex.linux/git-annex
-/usr/local/bin doesn't work, it looks at $0 and sees /usr/local/bin and
-does not find git-annex there. 
-
-I think that there is documentation or at least past advice of symlinking
-this way to install it into PATH. So need to do something about this.
-Perhaps have an installation script? --[[Joey]]
diff --git a/doc/bugs/submodule_path_problem.mdwn b/doc/bugs/submodule_path_problem.mdwn
deleted file mode 100644
--- a/doc/bugs/submodule_path_problem.mdwn
+++ /dev/null
@@ -1,56 +0,0 @@
-If a submodule isn't toplevel, git-annex breaks
-
-**What steps will reproduce the problem?**
-
-Make two non-empty repositories:
-
-    mkdir submod
-    cd submod
-    git init
-    touch README && git add README
-    git commit -a -m "first import of submodule"
-    cd ..
-
-    mkdir test
-    cd test
-    git init
-    touch README && git add README
-    git commit -a -m "first import of master"
-
-Add first repository as a non-toplevel submodule:
-
-    git submodule add ../submod lib/submod
-    
-Setup git-annex for the submodule inside the other repository:
-
-    cd lib/submod
-    git annex init
-
-**What is the expected output? What do you see instead?**
-
-Expected:
-
-    init  ok
-    (Recording state in git...)
-
-Got:
-
-    init  fatal: Could not switch to '../../../../lib': No such file or directory
-    git-annex: git config [Param "annex.uuid",Param "55D974D1-73E8-489E-B454-03D164664C82"] failed
-
-
-**What version of git-annex are you using? On what operating system?**
-
-3.20121011 compiled from git on Mac OS X 10.8
-
-
-**Please provide any additional information below.**
-
-* git-annex read the path from the "worktree" variable in the git config.
-* The git config for a submodule is storen in the main repository, e.g. "../../.git/modules/lib/submod/config"
-* The path in that config is relative to the config file: "worktree = ../../../../lib/submod"
-* Git-annex expect the path to be relative to the current directory, which is why it fails.
-
-> Impressive analysis, thanks. I've fixed handling of relative
-> core.worktree. [[done]] --[[Joey]]
-
diff --git a/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn b/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn
deleted file mode 100644
--- a/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-### Please describe the problem.
-
-
-### What steps will reproduce the problem?
-
-git annex sync --content
-
-
-### What version of git-annex are you using? On what operating system?
-
-Mac OSX Maverics
-
-git-annex version: 5.20140127
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-
-### Please provide any additional information below.
-
-[[!format sh """
-copy Books/Paperless - Agile Bits Edition/Paperless Video/5-4 PDFpen for iPad.m4v (to origin...)
-FATAL: suspicious characters loitering about 'git-annex-shell 'recvkey' '/~/users/akraut/annex-home' 'SHA256E-s98445427--5fb5fd6e082eec4a805261764ef982aa8f12d76e07e86a6abb05e7675762ac49.m4v' '--' 'remoteuuid=03ac7aa9-d14c-4b60-adae-02e4a5ec0fa8' 'direct=' 'associatedfile=Books/Paperless - Agile Bits Edition/Paperless Video/5-4 PDFpen for iPad.m4v' '--' dummy rsync --server -v --inplace .'
-rsync: connection unexpectedly closed (0 bytes received so far) [sender]
-rsync error: the --max-delete limit stopped deletions (code 25) at /SourceCache/rsync/rsync-42/rsync/io.c(452) [sender=2.6.9]
-
-  rsync failed -- run git annex again to resume file transfer
-failed
-"""]]
-
-> From the error message, I can see that your origin repository
-> has an annex.uuid set (to "03ac7aa9-d14c-4b60-adae-02e4a5ec0fa8").
-> So, I assume that, if you don't want git-annex sync to use it,
-> you must have remote.origin.annex-ignore set to true. So, I think I fixed
-> this a day or two ago when I made sync --content honor the annex-ignore
-> setting. [[done]] --[[Joey]] 
diff --git a/doc/bugs/test_suite_failure_on_samba_mount.mdwn b/doc/bugs/test_suite_failure_on_samba_mount.mdwn
deleted file mode 100644
--- a/doc/bugs/test_suite_failure_on_samba_mount.mdwn
+++ /dev/null
@@ -1,278 +0,0 @@
-### Please describe the problem.
-
-`git annex test` show multiple failures on a samba mounted partition.
-
-### What steps will reproduce the problem?
-
-just run `git annex test` (in the mounted dir)
-
-### What version of git-annex are you using? On what operating system?
-
-4.20130521, built for architecture `armhf` by the Raspbian maintainers ("jessie" suite at the time of writing)
-
-### Please provide any additional information below.
-
-Here are the last lines of `git annex test` output; AFAICT they are the only lines mentioning failures. Before them the output mentions `+++ OK, passed 100 tests.`.
-
-[[!format text """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-Cases: 1  Tried: 0  Errors: 0  Failures: 0----------------------------------------------------------------------
-Now, some broader checks ...
-  (Do not be alarmed by odd output here; it's normal.
-   wait for the last line to see how it went.)
-----------------------------------------------------------------------
-init
-  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-                                          Cases: 1  Tried: 1  Errors: 0  Failures: 0
-Cases: 3  Tried: 0  Errors: 0  Failures: 0Cases: 3  Tried: 1  Errors: 0  Failures: 0----------------------------------------------------------------------
-add
-  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-Cases: 3  Tried: 2  Errors: 0  Failures: 0  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-error: unable to create temporary sha1 filename : No such file or directory
-
-git-annex: user error (git ["--git-dir=/media/freebox/.t/tmprepo0/.git","--work-tree=/media/freebox/.t/tmprepo0","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 1)
-                                          ### Failure in: git-annex add:2
-git annex init failed
-Cases: 3  Tried: 3  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0----------------------------------------------------------------------
-reinject
-  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-  Detected a crippled filesystem.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-                                          Cases: 1  Tried: 1  Errors: 0  Failures: 0
-Cases: 2  Tried: 0  Errors: 0  Failures: 0not supported in direct mode; skipping
-----------------------------------------------------------------------
-unannex
-  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-error: unable to create temporary sha1 filename : No such file or directory
-
-git-annex: user error (git ["--git-dir=/media/freebox/.t/tmprepo1/.git","--work-tree=/media/freebox/.t/tmprepo1","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 1)
-                                          ### Failure in: git-annex unannex:0:no content
-git annex init failed
-Cases: 2  Tried: 1  Errors: 0  Failures: 1  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-  Detected a crippled filesystem.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-                                          Cases: 2  Tried: 2  Errors: 0  Failures: 1
-Cases: 3  Tried: 0  Errors: 0  Failures: 0not supported in direct mode; skipping
-----------------------------------------------------------------------
-drop
-  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-error: unable to create temporary sha1 filename : No such file or directory
-
-git-annex: user error (git ["--git-dir=/media/freebox/.t/tmprepo2/.git","--work-tree=/media/freebox/.t/tmprepo2","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 1)
-                                          ### Failure in: git-annex drop:0:no remotes
-git annex init failed
-Cases: 3  Tried: 1  Errors: 0  Failures: 1  Detected a crippled filesystem.
-  Enabling direct mode.
-  Detected a filesystem without fifo support.
-  Disabling ssh connection caching.
-Cases: 3  Tried: 2  Errors: 0  Failures: 1/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex drop:2:untrusted remote
-git clone failed
-Cases: 3  Tried: 3  Errors: 0  Failures: 2
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex get
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex move
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex copy
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex unlock/lock
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 2  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex edit/commit:0
-git clone failed
-Cases: 2  Tried: 1  Errors: 0  Failures: 1/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex edit/commit:1
-git clone failed
-Cases: 2  Tried: 2  Errors: 0  Failures: 2
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex fix
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex trust/untrust/semitrust/dead
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 4  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex fsck:0
-git clone failed
-Cases: 4  Tried: 1  Errors: 0  Failures: 1/media/freebox/.t/tmprepo3/refs: No such file or directory
-                                          ### Failure in: git-annex fsck:1
-git clone failed
-Cases: 4  Tried: 2  Errors: 0  Failures: 2/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex fsck:2
-git clone failed
-Cases: 4  Tried: 3  Errors: 0  Failures: 3/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex fsck:3
-git clone failed
-Cases: 4  Tried: 4  Errors: 0  Failures: 4
-Cases: 2  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex migrate:0
-git clone failed
-Cases: 2  Tried: 1  Errors: 0  Failures: 1/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex migrate:1
-git clone failed
-Cases: 2  Tried: 2  Errors: 0  Failures: 2
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex unused/dropunused
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex describe
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex find
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex merge
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex status
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex version
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex sync
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: union merge regression
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: automatic conflict resolution
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex map
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex uninit
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex upgrade
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex whereis
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex hook remote
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex directory remote
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex rsync remote
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex bup remote
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-Cases: 1  Tried: 0  Errors: 0  Failures: 0/media/freebox/.t/tmprepo3/.git: No such file or directory
-                                          ### Failure in: git-annex crypto
-git clone failed
-Cases: 1  Tried: 1  Errors: 0  Failures: 1
-----------------------------------------------------------------------
-get
-----------------------------------------------------------------------
-move
-----------------------------------------------------------------------
-copy
-----------------------------------------------------------------------
-lock
-----------------------------------------------------------------------
-edit
-----------------------------------------------------------------------
-fix
-----------------------------------------------------------------------
-trust
-----------------------------------------------------------------------
-fsck
-----------------------------------------------------------------------
-migrate
-----------------------------------------------------------------------
- unused
-----------------------------------------------------------------------
-describe
-----------------------------------------------------------------------
-find
-----------------------------------------------------------------------
-merge
-----------------------------------------------------------------------
-status
-----------------------------------------------------------------------
-version
-----------------------------------------------------------------------
-sync
-----------------------------------------------------------------------
-union merge regression
-----------------------------------------------------------------------
-conflict resolution
-----------------------------------------------------------------------
-map
-----------------------------------------------------------------------
-uninit
-----------------------------------------------------------------------
-upgrade
-----------------------------------------------------------------------
-whereis
-----------------------------------------------------------------------
-hook remote
-----------------------------------------------------------------------
-directory remote
-----------------------------------------------------------------------
-rsync remote
-----------------------------------------------------------------------
-bup remote
-----------------------------------------------------------------------
-crypto
-git-annex: .t/repo/.git/annex: removeDirectory: unsatisified constraints (Directory not empty)
-
-# End of transcript or log.
-"""]]
diff --git a/doc/bugs/test_suite_shouldn__39__t_fail_silently.mdwn b/doc/bugs/test_suite_shouldn__39__t_fail_silently.mdwn
deleted file mode 100644
--- a/doc/bugs/test_suite_shouldn__39__t_fail_silently.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-When the test suite cannot be compiled, the build just fails silenty. This means that in automated builds there is no easy way to ensure that the generated binaries have passed the test suite, because it may not even have been run! IMHO, "make test" should fail (i.e. return a non-zero exit code) when it can't succeeed.
-
-> Ok, fixed. --[[Joey]] [[done]]
diff --git a/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn b/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn
deleted file mode 100644
--- a/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn
+++ /dev/null
@@ -1,50 +0,0 @@
-Make test fails when git doesn't know what identity to give to commits
-
-<pre>
-
-Testing 1:blackbox:0:git-annex init
-Cases: 30  Tried: 7  Errors: 0  Failures: 0
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident  <jtang@lenny.localdomain> not allowed
-### Failure in: 1:blackbox:0:git-annex init
-init failed
-Testing 1:blackbox:1:git-annex add:0
-Cases: 30  Tried: 8  Errors: 0  Failures: 1
-*** Please tell me who you are.
-</pre>
-
-I guess most users testing git-annex probably have a .gitconfig sitting in their home directories already so the above never cropped up. This failure was initially found in a clean and fresh install of a virtual machine with archlinux and repeated again on my archlinux laptop.
-
-Update: I pulled the master on my rhel5 test machine and moved my .gitconfig out of the way, the tests passes and continues but I still get a "warning message" from git. 
-
-<pre>
-Testing 1:blackbox:3:git-annex unannex:1:with content                         
-Cases: 30  Tried: 12  Errors: 0  Failures: 0[master fce0cde] content removed from git annex
- Committer: Jimmy Tang <jtang@removed.removed.tcd.ie>
-Your name and email address were configured automatically based
-on your username and hostname. Please check that they are accurate.
-You can suppress this message by setting them explicitly:
-
-    git config --global user.name "Your Name"
-    git config --global user.email you@example.com
-
-After doing this, you may fix the identity used for this commit with:
-
-    git commit --amend --reset-author
-
- 2 files changed, 1 insertions(+), 2 deletions(-)
- delete mode 120000 foo
-</pre>
-
-I guess it also depends a bit on how git figures out who it is is committing and how the machine in question is configured with hostnames and domain names.
-
-> Fixed that. [[done]] --[[Joey]] 
diff --git a/doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform.mdwn b/doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform.mdwn
deleted file mode 100644
--- a/doc/bugs/tests_failed_to_build_-_after_an_update_of_haskell_platform.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-I updated haskell platform, and now
-
-<pre>
-[jtang@x00 git-annex (master)]$ make test
-
-Assistant/Threads/NetWatcher.hs:26:2:
-     warning: #warning Building without dbus support; will poll for network connection changes [-Wcpp]
-
-Assistant/Threads/MountWatcher.hs:33:2:
-     warning: #warning Building without dbus support; will use mtab polling [-Wcpp]
-
-test.hs:11:8:
-    Could not find module `Test.HUnit.Tools'
-    Perhaps you meant Test.HUnit.Text (from HUnit-1.2.5.1)
-    Use -v to see a list of the files searched for.
-** failed to build the test suite
-make: *** [test] Error 1
-</pre>
-
-Looks like a missing dep somewhere with testpack or quickcheck... I haven't had time to figure it out yet, its not git-annex specific but I thought I might log it as a reminder for myself just in case if the osxapp is more borked than usual, I probably need to flush my .cabal directory of installed userland dependancies.
-
-> The testpack library has been broken by some other library changes. I
-> made changes in git yesterday to avoid using it. [[done]] --[[Joey]]
diff --git a/doc/bugs/three_character_directories_created.mdwn b/doc/bugs/three_character_directories_created.mdwn
deleted file mode 100644
--- a/doc/bugs/three_character_directories_created.mdwn
+++ /dev/null
@@ -1,56 +0,0 @@
-What steps will reproduce the problem?
-
-I don't know how, but this happened already a second time, I don't know how to reproduce this yet.
-
-What is the expected output? What do you see instead?
-
-There are many three character name directories created that look like the parts of a hash - and each contains a logfile.
-
-    % ls
-    027
-    1d1
-    1e3
-    232
-    36e
-    583
-    5f6
-    69c
-    9ea
-    bd7
-    c46
-    d20
-    d48
-    f31
-    f88
-    uuid.log
-    [+the intended data directories]
-
-    % find 027/
-    027/
-    027//b73
-    027//b73/SHA256-s10108928--3c3766aed8b66de9d0ef37820e0ddfba25f9463b37f30e25ceb5ce3cdf12db36.log
-
-     % cat f88/7c3/SHA256-s4100608--903530747dfdc7bc9d487d7cbd8ab09ddc1ffad52c08849d049c8a5ff5cfb854.log
-    1351711677.187589s 1 2efd46d2-0e32-11e2-95fe-f73f09c6615e
-    1351971337.667243s 1 ab50cd8a-11c0-11e2-934c-87e45f64e5c6
-
-What version of git-annex are you using? On what operating system?
-
-% git-annex version
-git-annex version: 3.20121017
-local repository version: 3
-default repository version: 3
-supported repository versions: 3
-upgrade supported from repository versions: 0 1 2
-
-OS X 10.6.8
-
-Please provide any additional information below.
-
-I use a symlink to the repository to change into it.
-
-> Closing this bug as user error. If the `git-annex` branch
-> gets merged into master by the user, then that adds all its log files
-> to master, and so they're visible as regular files. Solution: Don't do
-> that, or if you do that, use `git log --stat` to find the commit that
-> adds all those files, and `git revery` the commit. [[done]] --[[Joey]]
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn b/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn
deleted file mode 100644
--- a/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn
+++ /dev/null
@@ -1,119 +0,0 @@
-## What steps will reproduce the problem?
-
-I wanted to setup a `~/Desktop/annex` synchronised between three machines, my home desktop (`dagon`), my work desktop (`zakaz`) and my laptop (`hastur`).
-
-I set this up via the annex interface, using my gmail account and Amazon S3.
-
-## What is the expected output? What do you see instead?
-
-I expected that anything dropped into `~/Desktop/annex` on any of the three machines would be synced to the other 2.
-
-I ran:
-<pre>
-    $ echo Created on `hostname` > `hostname`.txt on each of the three machines.
-</pre>
-
-What I ended up with was:
-
-* Home desktop (`dagon`): dagon.txt (ok)
-* Work desktop (`zakaz`): zakaz.txt (ok) and hastur.txt (broken link)
-* Laptop (`hastur`): hastur.txt (ok) and zakaz.txt (broken link)
-
-In each case the local file had been detected and annexed -- "(ok)" means it is a symlink to the annex.
-
-Manually running `git annex sync` on any of the machines didn't change anything. Running `git annex copy --auto --from=DesktopAnnex` on the Work desktop synced the broken hastur.txt but dagon.txt didn't appear. Running the same on my laptop did nothing. Likewise on my home desktop it did nothing. (I'm not sure if running stuff from the CLI is valid when the assistant is running, but I couldn't see a "force refresh" option in the UI)
-
-In the `git log --oneline` my laptop and Work machines both have:
-<pre>
-3f541e5 Merge commit 'refs/synced/552d29fe-4a86-11e2-819a-9f61585ee7a2/master'
-cbee12b 
-dddc4f0 
-d8854e7 Merge commit 'refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/master'
-</pre>
-
-While my home desktop has:
-<pre>
-43a80d5 git-annex automatic sync
-46328db 
-d8854e7 Merge commit 'refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/master'
-</pre>
-
-There are other commits prior to d8854e7 which appear to be the same on all hosts. d8854e7 was committed in December when I first played with this stuff. All the commits after that were made today as part of the experiment above, with the exception of 43a80d5 on my home desktop with was the removal of a "Test.txt" created last year. This removal also didn't sync to the other two machines.
-
-git-annex status on my home desktop (dagon) shows:
-<pre>
-semitrusted repositories: 5
-	00000000-0000-0000-0000-000000000001 -- web
- 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- annex on hastur
- 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- here (annex on dagon)
- 	552d29fe-4a86-11e2-819a-9f61585ee7a2 -- ian.james.campbell (annex on zakaz)
- 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
-</pre>
-(DesktopAnnex is the S3 remote, ian.james.campbell is my gmail username)
-
-However the webapp only shows 3 repos:
-<pre>
-	here (annex on dagon)
-	ian.james.campbell (annex on zakaz)
-	DesktopAnnex
-</pre>
-
-git-annex status on my laptop (hastur) shows only:
-<pre>
-	00000000-0000-0000-0000-000000000001 -- web
- 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- here (ijc@hastur:~/Desktop/annex)
- 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- ian.james.campbell (ijc@dagon:~/Desktop/annex)
- 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
-</pre>
-
-while the webapp shows:
-<pre>
-	here (ijc@hastur:~/Desktop/annex)
-	ian.james.campbell (ijc@dagon:~/Desktop/annex)
-	DesktopAnnex
-</pre>
-
-Lastly on my work desktop (zakaz) annex status shows:
-<pre>
-	00000000-0000-0000-0000-000000000001 -- web
- 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- annex on hastur
- 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- ian.james.campbell (annex on dagon)
- 	552d29fe-4a86-11e2-819a-9f61585ee7a2 -- here (annex on zakaz)
- 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
-</pre>
-
-The webapp shows:
-<pre>
- 	here (annex on zakaz)
- 	ian.james.campbell (annex on dagon)
- 	DesktopAnnex 
-</pre>
-
-git-annex sync on any of them shows:
-<pre>
-$ git annex sync
-commit  
-# On branch master
-nothing to commit (working directory clean)
-ok
-pull ian.james.campbell 
-fatal: Unable to find remote helper for 'xmpp'
-failed
-push ian.james.campbell 
-fatal: Unable to find remote helper for 'xmpp'
-failed
-git-annex: sync: 2 failed
-</pre>
-
-## What version of git-annex are you using? On what operating system?
-
-3.20121211 on Debian Sid. All machines are amd64
-
-## Please provide any additional information below.
-
-I'm not 100% sure this sort of multiway synching is supposed to work, so maybe this is just as expected. If this isn't a bug you could consider it a feature request though ;-)
-
-This issue also made me wonder about how one would go about syncing multiple unrelated annexes via XMPP. Would you need a different gmail account for each? Maybe there is a trick similar to the email local+foo@ thing?
-
-> [[done]], turned out I left XMPP git push working,
-> but had not done all the stuff around it to get reliable syncing. Now have. --[[Joey]]
diff --git a/doc/bugs/tmp_file_handling.mdwn b/doc/bugs/tmp_file_handling.mdwn
deleted file mode 100644
--- a/doc/bugs/tmp_file_handling.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-git-annex deletes all tmp files on shutdown, if everything succeeded.
-This presents 2 problems:
-
-1. If git-annex is rsyncing something and another one is run, it will
-   delete the running instance's tmp files.
-2. If a long-running rsync transfer is interrupted partway through, the
-   tmp file was expensive to obtain, and one needs to avoid running
-   git-annex to do anything else until that transfer can be resumed and
-   finished.
-
---[[Joey]] 
-
-[[done]]
diff --git a/doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn b/doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn
--- a/doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn
+++ b/doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn
@@ -17,3 +17,4 @@
 I dug around the OSX documentation and fcntl.h header file and it seems that UTIME_OMIT, UTIME_NOW, AT_FDCWD and AT_SYMLINK_NOFOLLOW aren't defined (at least on OSX). I suspect the BSD's in general will have problems compiling git-annex.
 
 [[!meta title="annexed symlink mtime matching code is disabled on non-linux systems; needs testing"]]
+[[!tag confirmed]]
diff --git a/doc/bugs/transferkey_fails_due_to_gpg.mdwn b/doc/bugs/transferkey_fails_due_to_gpg.mdwn
deleted file mode 100644
--- a/doc/bugs/transferkey_fails_due_to_gpg.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-What steps will reproduce the problem?
-Create a new annex, add a new repository:
-
-  git annex initremote vserver2 type=rsync rsyncurl=vserver.dbruhn.de:/annex encryption=dominik@dbruhn.de
-
-Add some files, add them to annex, try to transfer them:
-  git annex transferkey SHA256-s6486446--df84b11a0e9543134224d0ac1e0f2567bcd79d86605117c5af008a1b133cee3a --to vserver2 --file MKBD/OB.mp3 --debug
-
-What is the expected output? What do you see instead?
-
-I expect the file to be transfered to my remote server. Instead I see a 'gpg>' prompt with nothing happening. When pressing CTRL+C, the following mesage is shown:
-
-gpg: Interrupt caught ... exiting
-
-There must be some faults when interfacing gpg. The other console-output is:
-
------
-    [2012-09-08 18:50:12 CEST] read: git ["--git-dir=/home/dominik/Annex/.git","--work-tree=/home/dominik/Annex","show-ref","git-annex"] 
-    [2012-09-08 18:50:12 CEST] read: git ["--git-dir=/home/dominik/Annex/.git","--work-tree=/home/dominik/Annex","show-ref","--hash","refs/heads/git-annex"] 
-    [2012-09-08 18:50:12 CEST] read: git ["--git-dir=/home/dominik/Annex/.git","--work-tree=/home/dominik/Annex","log","refs/heads/gitannex..245fa80db6733dbbeff6c40d46bd65ed00811548","--oneline","-n1"] 
-    [2012-09-08 18:50:12 CEST] chat: git ["--git-dir=/home/dominik/Annex/.git","--work-tree=/home/dominik/Annex","cat-file","--batch"] 
-    (gpg) [2012-09-08 18:50:12 CEST] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--decrypt"] 
-    [2012-09-08 18:50:12 CEST] chat: gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--passphrase-fd","8","--symmetric","--force-mdc"] 
-    sdgdg
-    dsgdgs
-    ^C
-    gpg: Interrupt caught ... exiting
------
-
-What version of git-annex are you using? On what operating system?
-git-annex version: 3.20120826
-Ubuntu 12.04, GHC 7.4.1
-gpg is 'gpg (GnuPG) 1.4.11'
-
-Please provide any additional information below.
-
-The key which is used for the remote is password protected. The GnuPG Agent asks me for the password, so this seems to work. I do not know what content the gpg expects but does not recieve. The .git/config entry for the remote looks reasonable:
-
-    [remote "vserver2"]
-        annex-rsyncurl = vserver.dbruhn.de:/annex
-        annex-uuid = ea3d6acc-716c-48e8-9b6b-993b90dcc1db
-
-When adding a new rsync-remote with encryption set to 'none' (therefore disabled), everything works, so it really seems a gpg issue.
-
-How can I help debugging?
-
-> Thanks, I reproduced a deadlock in the gpg code, which was introduced
-> with some of my earlier changes to use threading. No released version of
-> git-annex was affected, and I have developed a fix, which works for me
-> and is now committed to master. Marking this [[done]]; please do check
-> that my fix works for you! --[[Joey]]
diff --git a/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn b/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn
deleted file mode 100644
--- a/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn
+++ /dev/null
@@ -1,80 +0,0 @@
-### Please describe the problem.
-
-I found the discussion in [directory](/special_remotes/directory) quite confusing until I looked at it the right way. Some tweaking of the documentation might help.
-
-### What steps will reproduce the problem?
-
-Possible method - get a newbie to read the page.
-
-### What version of git-annex are you using? On what operating system?
-
-n/a
-
-### Please provide any additional information below.
-
-Below is an untested patch that I think would make the documentation more helpful to me on a first reading.
-
-      Tweaks to doc/special_remotes/directory.mdwn
-      
-        * document the 'directory' option (!)
-        * try to make it clearer what is different about this remote,
-          including giving an example of how the directory structure looks.
-        * grammar fix in opening paragraph
-      
-      ---
-       doc/special_remotes/directory.mdwn | 16 +++++++++++++++-
-       1 file changed, 15 insertions(+), 1 deletion(-)
-      
-      diff --git a/doc/special_remotes/directory.mdwn b/doc/special_remotes/directory.mdwn
-      index 4d72e8b..7f076b3 100644
-      --- a/doc/special_remotes/directory.mdwn
-      +++ b/doc/special_remotes/directory.mdwn
-      @@ -1,10 +1,12 @@
-       This special remote type stores file contents in directory.
-       
-       One use case for this would be if you have a removable drive that
-      -you want to use it to sneakernet files between systems (possibly with
-      +you want to use to sneakernet files between systems (possibly with
-       \[[encrypted|encryption]] contents). Just set up both systems to use
-       the drive's mountpoint as a directory remote.
-       
-      +Note that directory remotes have a special directory structure
-      +(by design, the same as the \[[rsync|rsync]] remote).
-       If you just want two copies of your repository with the files "visible"
-       in the tree in both, the directory special remote is not what you want.
-       Instead, you should use a regular `git clone` of your git-annex repository.
-      @@ -14,6 +16,8 @@ Instead, you should use a regular `git clone` of your git-annex repository.
-       These parameters can be passed to `git annex initremote` to configure the
-       remote:
-       
-      +* `directory` - The path to directory in which the remote resides
-      +
-       * `encryption` - One of "none", "hybrid", "shared", or "pubkey".
-         See \[[encryption]].
-       
-      @@ -31,3 +35,13 @@ Setup example:
-       
-        # git annex initremote usbdrive type=directory directory=/media/usbdrive/ encryption=none
-        # git annex describe usbdrive "usb drive on /media/usbdrive/"
-      +
-      +Usage example:
-      + # git annex copy mycoolfile.mp4 --to usbdrive
-      + # ls -aF /media/usbdrive
-      +        ./  ../  42b/  .git/  tmp/
-      + # git annex whereis mycoolfile.mp4
-      + whereis mycoolfile.mp4 (2 copies)
-      +         320053d5-892f-46d2-89f0-d6e9d09e6398 -- here
-      +         6747a48b-fad2-41a7-9033-8d8daa35c5f8 -- usbdrive
-      + ok
-      -- 
-      1.8.5.2
-
-
-
-# End of transcript or log.
-
-> Largely applied (except example at the end). I agree these
-> changes make it much clearer, especially adding the missing documentation
-> of the directory parameter. So, [[done]]. Note that this website is a
-> wiki and users like you are welcome to edit pages directly to improve the
-> documentation. --[[Joey]]
diff --git a/doc/bugs/typo_in___34__ready_to_add_remote_server__34___message.mdwn b/doc/bugs/typo_in___34__ready_to_add_remote_server__34___message.mdwn
deleted file mode 100644
--- a/doc/bugs/typo_in___34__ready_to_add_remote_server__34___message.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-What steps will reproduce the problem?
-Add a ssh remote to an existing git annex repository. The word "sensitive" is misspelled.
-
-What is the expected output? What do you see instead?
-I expect to see:
-"The contents of your files will be stored, fully encrypted, on the server. The server will not store other information about your git repository. This is the best choice if you don't run the server yourself, or have sensitive data."
-
-But instead I see:
-"The contents of your files will be stored, fully encrypted, on the server. The server will not store other information about your git repository. This is the best choice if you don't run the server yourself, or have sensative data."
-
-What version of git-annex are you using? On what operating system?
-3.20130102, Fedora 17 x86_64
-
-Please provide any additional information below.
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/unannex_and_uninit_do_not_work_when_git_index_is_broken.mdwn b/doc/bugs/unannex_and_uninit_do_not_work_when_git_index_is_broken.mdwn
deleted file mode 100644
--- a/doc/bugs/unannex_and_uninit_do_not_work_when_git_index_is_broken.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-git's index broke and I was unable to restore it. While this is not git-annex' problem, it should still be possible to get my data in an un-annexed state.
-
-    % git status
-    fatal: index file smaller than expected
-    % git annex unannex foo
-    fatal: index file smaller than expected
-    % git annex uninit
-    fatal: index file smaller than expected
-    uninit  
-      pre-commit hook (/path/to/git-annex/.git/hooks/pre-commit) contents modified; not deleting. Edit it to remove call to git annex.
-    ok
-    %
-
-Ttbomk, the softlinks and objects are enough to un-annex the files; side-stepping git's index if necessary.
-
-> `git annex repair` can now repair broken index files and other
-> git repository corruption. [[done]] --[[Joey]]
diff --git a/doc/bugs/unannex_command_doesn__39__t_all_files.mdwn b/doc/bugs/unannex_command_doesn__39__t_all_files.mdwn
deleted file mode 100644
--- a/doc/bugs/unannex_command_doesn__39__t_all_files.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-    $ git init ; git annex init test ; dd if=/dev/urandom of=file1 count=128 ; cp file1 file2 ; git annex add --backend=SHA1 file? ; git commit -m init ; git annex unannex ; ls -l
-    Initialized empty Git repository in /tmp/annex/.git/
-    init test ok
-    128+0 records in
-    128+0 records out
-    65536 bytes (66 kB) copied, 0.007173 s, 9.1 MB/s
-    add file1 (checksum...) ok
-    add file2 (checksum...) ok
-    (Recording state in git...)
-    [master (root-commit) 2177b10] init
-     2 files changed, 2 insertions(+), 0 deletions(-)
-     create mode 120000 file1
-     create mode 120000 file2
-    unannex file1 ok
-    (Recording state in git...)
-    [master bef78b1] content removed from git annex
-     1 files changed, 0 insertions(+), 1 deletions(-)
-     delete mode 120000 file1
-    total 72
-    -rw-r--r-- 1 simons users 65536 Jul 15 17:29 file1
-    lrwxrwxrwx 1 simons users   132 Jul 15 17:29 file2 -> .git/annex/objects/jp/Fk/SHA1-s65536--795b58cc4e5190b02e7026fd9e94a10c98c6475f/SHA1-s65536--795b58cc4e5190b02e7026fd9e94a10c98c6475f
-
-> This was recently discussed in
-> [[annex_unannex__47__uninit_should_handle_copies]] and `unannex --fast`
-> added to leave contents behind in the annex, which allows handling
-> copies. But needs manual cleanup later with dropunused. --[[Joey]] 
-
-> This is basically a dup of [[Large unannex operations result in stale symlinks and data loss]],
-> or at least the ideas in there will also deal with this. Closing as dupe.
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/unannex_removes_object_even_if_referred_to_by_others.mdwn b/doc/bugs/unannex_removes_object_even_if_referred_to_by_others.mdwn
deleted file mode 100644
--- a/doc/bugs/unannex_removes_object_even_if_referred_to_by_others.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-##What steps will reproduce the problem?
-
-    echo text > foo
-    echo text > bar
-    git annex add foo bar
-    git annex unannex foo
-
-##What is the expected output? What do you see instead?
-
-I would expect that the object behind 'bar' remained intact, what happens is that the object is moved out of the annex and 'bar' is left as a dangling symlink, if you are unlucky and don't spot this, it could be potentially dangerous, since you can easily lose data.
-
-##What version of git-annex are you using? On what operating system?
-
-git-annex built from git on Tue Mar 12 15:58:36 2013 -0400
-
-From commit: 70b7555eaf9ac5f88bb137985d93bed8d5a434e8
-
-On Debian Sid
-
-> [[done]]; duplicate bug report
diff --git a/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn b/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
deleted file mode 100644
--- a/doc/bugs/unannex_vs_unlock_hook_confusion.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-See [[forum/unannex_alternatives]] for problem description.
-
-If an unannex is followed by a "git add; git commit", git-annex's hook thinks
-that you have used git annex unlock on the file and are
-now committing a changed version, and the right thing to do there is to add the
-new content to the annex and update the symlink accordingly.
-
-Can we tell the difference between an unannexed file that has yet to be committed
-and has been re-added as a normal file, vs an unlocked file? --[[Joey||
-
-> Hmm, not really. An unannexed file's content will have been dropped from
-> the backend, but that's about the only difference. Perhaps unannex should
-> just commit the removal of the file itself? --[[Joey]]
-
-> [[done]], staged changes committed at end.
diff --git a/doc/bugs/unconfirmed.mdwn b/doc/bugs/unconfirmed.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/bugs/unconfirmed.mdwn
@@ -0,0 +1,7 @@
+These bug reports have not yet been [[confirmed]] by the git-annex developers
+to be actually bugs in git-annex, rather than some other problem.
+
+See also: [[moreinfo]]
+
+[[!inline pages="./* and !link(./confirmed) and !link(./moreinfo) and !link(./done) and !./done and !./confirmed" show=0
+archive=yes]]
diff --git a/doc/bugs/unfinished_repos_in_webapp.mdwn b/doc/bugs/unfinished_repos_in_webapp.mdwn
deleted file mode 100644
--- a/doc/bugs/unfinished_repos_in_webapp.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-### Please describe the problem.
-
-Hi,  all excited that the new release fixes the unknown UUID issue in the Webapp I hurridly installed the latest versions.  
-
-Some progress in that the webapp now reports my missing/non-existent repo as an "unfinished repository" in the process of being setup.  I see a check status box that when clicked says "in progress please be patient".  Also I see the ssh config has changed to use IdentitiesOnly option.
-
-I had a go a deleting details via git-annex vicfg and directly editing the git-annex branch log files as detailed [here](http://git-annex.branchable.com/forum/Reappearing_repos_in_webapp_and_vicfg/).  But still no joy.  
-
-Any hints on what to do?  Nothing in the log seems to help...
-
-### What steps will reproduce the problem?
-
-Not sure anymore.
-
-### What version of git-annex are you using? On what operating system?
-
-Latest.
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> This seems to be [[done]], at least the bug reporter didn't feel the need
-> to follow up with the info I asked for and says the problem does not
-> affect him. --[[Joey]]
diff --git a/doc/bugs/unhappy_without_UTF8_locale.mdwn b/doc/bugs/unhappy_without_UTF8_locale.mdwn
deleted file mode 100644
--- a/doc/bugs/unhappy_without_UTF8_locale.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-Try unsetting LANG and passing git-annex unicode filenames.
-
-	joey@gnu:~/tmp/aa>git annex add ./Üa
-	add add add add git-annex: <stdout>: commitAndReleaseBuffer: invalid
-	argument (Invalid or incomplete multibyte or wide character)
-
-> Interestingly, I can get the same crash in the de_DE.UTF-8 locale
-> with certian input filenames, while in en_US.UTF-8, it's ok.
-> The workaround below avoided the problem in de_DE.UTF-8. --[[Joey]]
-
-> Put in the utf-8 forcing workaround for now. [[done]] --[[Joey]] 
-
-## underlying haskell problem and workaround
-
-The same problem can be seen with a simple haskell program:
-
-	import System.Environment
-	import Codec.Binary.UTF8.String
-	main = do
-	        args <- getArgs
-	        putStrLn $ decodeString $ args !! 0
-
-	joey@gnu:~/src/git-annex>LANG= runghc ~/foo.hs Ü
-	foo.hs: <stdout>: hPutChar: invalid argument (Invalid or incomplete multibyte or wide character)
-
-(The call to `decodeString` is necessary to make the input
-unicode string be displayed properly in a utf8 locale, but
-does not contribute to this problem.)
-
-I guess that haskell is setting the IO encoding to latin1, which
-is [documented](http://haskell.org/ghc/docs/latest/html/libraries/base/System-IO.html#v:latin1)
-to error out on characters > 255. 
-
-So this program doesn't have the problem -- but may output garbage
-on non-utf-8 capable terminals:
-
-	import System.IO
-	main = do
- 		hSetEncoding stdout utf8
-	        args <- getArgs
-	        putStrLn $ decodeString $ args !! 0
diff --git a/doc/bugs/uninit_and_indirect_don__39__t_work_on_android.mdwn b/doc/bugs/uninit_and_indirect_don__39__t_work_on_android.mdwn
deleted file mode 100644
--- a/doc/bugs/uninit_and_indirect_don__39__t_work_on_android.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-### Please describe the problem.
-I am unable to restore a git-annex dir to its pre init state.
-
-### What steps will reproduce the problem?
-init a git-annex dir on android with a file system with out symlinks.
-use for a while.
-Run: "git-annex uninit" -> You cannot run this command in a direct mode repository.
-Run: "git-annex indirect" -> Git is configured to not use symlinks, so you must use direct mode.
-
-### What version of git-annex are you using? On what operating system?
-git-annex version: 4.20130601-g7483ca4
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; added support for direct mode --[[Joey]] 
diff --git a/doc/bugs/uninit_does_not_abort_when_hard_link_creation_fails.mdwn b/doc/bugs/uninit_does_not_abort_when_hard_link_creation_fails.mdwn
deleted file mode 100644
--- a/doc/bugs/uninit_does_not_abort_when_hard_link_creation_fails.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-> What steps will reproduce the problem?
-
-Issue the following commands on a file system where hard links are disabled:
-
-    $ touch foo
-    
-    $ ln foo bar # just to check that hard links are disabled
-    ln: failed to create hard link `bar' => `foo': Operation not permitted
-    
-    $ git init && git annex init
-    
-    $ git annex add .
-    
-    $ git annex uninit
-    unannex foo 
-    git-annex: [...]: createLink: permission denied (Operation not permitted)
-    failed
-    Deleted branch git-annex [...].
-
-    $ echo $? # exit status of last command
-    0
-    
-    $ ls foo
-    ls: cannot access foo: No such file or directory
-
-
-> What is the expected output? What do you see instead?
-
-`git annex uninit` should abort and exit with a non-`0` return code. Instead, `git annex uninit` cleans up git-annex objects and exits with return code `0`.
-
-
-> What version of git-annex are you using? On what operating system?
-
-3.20120406 on Ubuntu 12.04.1.
-
-
-> Please provide any additional information below.
-
-git-annex should probably not be used on a file system where hard links are disabled.
-
-However, if the user is not aware that he's using git-annex on such a filesystem, he will accidently delete his annexed files by issuing a `git annex uninit` command.
-
-> git-annex needs a POSIX filesystem, which includes the ability to create
-> hard links. The `git annex add` in the example above will fail
-> trying to create a hard link with current versions.
-> 
-> I've made uninit fall back to a non-hard link mode. [[done]] --[[Joey]]
diff --git a/doc/bugs/uninit_does_not_work_in_old_repos.mdwn b/doc/bugs/uninit_does_not_work_in_old_repos.mdwn
deleted file mode 100644
--- a/doc/bugs/uninit_does_not_work_in_old_repos.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-As uninit does not need to actually write out any data, just remove it, it should be possible to uninit in old stores.
-
-    % git annex uninit
-    git-annex: Repository version 2 is not supported. Upgrade this repository: git-annex upgrade
-
-If the repo happens to be broken, this essentially locks in data.
-
-> No, because you can always check out the version of git-annex you need
-> for that repository.
-> 
-> uninit, as implemented, runs unannex on every file and then does some
-> cleanup. The cleanup does not need to write state, but the unannex does.
-> And it depends on the object directory layout, which has changed between
-> versions. So supporting old versions in this code would complicate it
-> quite a lot. I don't want to go there. --[[Joey]]
-
->>Requiring a version upgrade for unannex is fine. Yet, I see a problem when a git repo is broken; you are stuck without being able to uninit. In this case an uninit that does nothing but undo the symlinking would be useful. -- Richard
-
->>> As I said, version 2 of git-annex is still there for people who need
->>> it for whatever reason. [[done]] --[[Joey]]
diff --git a/doc/bugs/uninit_loses_data_if_git-annex_add_didn__39__t_complete.mdwn b/doc/bugs/uninit_loses_data_if_git-annex_add_didn__39__t_complete.mdwn
deleted file mode 100644
--- a/doc/bugs/uninit_loses_data_if_git-annex_add_didn__39__t_complete.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-* Create a git-annex repo where a lot of files live.
-* Start an annex add.
-* Kill it.
-* git-annex uninit
-
-Now, whatever files were annexed (ie: moved to .git/annex/objects/) but not committed are lost as the .git/annex directory was deleted.
-
-I know there are two conflicting issues here:
-
-1. if there is legitimately unused data in .git/annex then that shouldn't be unannexed
-2. the above case where some files were annexed but not committed should be unannexed
-
-Maybe uninit could check to see if all symlinks currently in the repo pointing to something under .git/annex/objects are committed. If not, commit them then uninit, or just de-annex them.
-
-> Added a check for this, [[done]] --[[Joey]] 
diff --git a/doc/bugs/uninit_should_not_run_when_branch_git-annex_is_checked_out.mdwn b/doc/bugs/uninit_should_not_run_when_branch_git-annex_is_checked_out.mdwn
deleted file mode 100644
--- a/doc/bugs/uninit_should_not_run_when_branch_git-annex_is_checked_out.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-Running `git annex uninit` in a repo which has branch git-annex checked out will result in:
-
-    error: Cannot delete the branch 'git-annex' which you are currently on.
-    git-annex: git [Param "-D",Param "git-annex"] failed
-
-and trying to checkout branch master afterwards results in:
-
-    error: The following untracked working tree files would be overwritten by checkout:
-
-Both of which is logical. The best thing would be if git-annex refused to run uninit while in branch git-annex.
-
-
-Richard
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/unlock_fails_silently_with_directory_symlinks.mdwn b/doc/bugs/unlock_fails_silently_with_directory_symlinks.mdwn
deleted file mode 100644
--- a/doc/bugs/unlock_fails_silently_with_directory_symlinks.mdwn
+++ /dev/null
@@ -1,53 +0,0 @@
-What steps will reproduce the problem?
-
-+    ```~/``` is tracked by git and git annex
-+    ```~/text/books/foo``` is annexed
-+    ```~/books``` is a symlink to ```text/books```
-+    from ```~/``` execute: ```git annex unlock books/foo```
-+    which returns immediately with zero exit code and does not unlock foo.
-
-What is the expected output? What do you see instead?
-
-+    I expect ```~/text/books/foo`` to be unlocked
-
-+    I think ```git annex unlock``` should resolve the symlinks and realize that this is a tracked file.
-
-What version of git-annex are you using? On what operating system?
-
-+    3.20121112 in debian unstable
-
-Please provide any additional information below.
-
-+    I can unlock foo if I provide the full path, eg:
-from ```~/``` execute: ```git annex unlock text/books/foo```
-
-+    Interestingly, the following _does_ successfully unlock the file: ```cd ~/books && git annex unlock foo```
-
-     So it seems that symlinks in $PWD are being resolved, but not those in file paths passed as arguments.
-
-Thank you, thank you!
-
-      - Jason
-
-jason@jasonwoof.com
-
-> I'm afraid this is not a bug. Here's why: If you run "git mv books/foo
-> books/bar", git will complain:
->
->> fatal: not under version control, source=books/foo, destination=books/bar
->
-> So git-annex is just following git's lead (indeed, it's just running
-> `git ls-files` to find files to act on), and git doesn't
-> recognise this path as a file that's in git. --[[Joey]] 
-
-+    Also, I think ```git annex unlock``` should emit an error message if a file explicitly addressed on the commandline can not be acted upon.
-
-> I'm beginning to think perhaps it should. Users seem to find the current
-> behavior to be sometimes confusing.
-> 
-> However, it's actually a very difficult change to make. Several commands
-> have multiple seek stages that act on different types of files, so
-> any warning printed by an earlier stage may be premature if a later
-> stage comes along and deals with a file. --[[Joey]]
-
->> Figured out a non-invasive way to add that warning. [[done]] --[[Joey]] 
diff --git a/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn b/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn
deleted file mode 100644
--- a/doc/bugs/unlock_then_lock_of_uncommitted_file_loses_it.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Add a file (do not commit), then unlock it, and then lock it.
-There is an error and the symlink gets deleted.
-
-The file will still be staged in the index, and the file content is still
-in the annex. --[[Joey]] 
-
-[[done]]
diff --git a/doc/bugs/using_old_remote_format_generates_irritating_output.mdwn b/doc/bugs/using_old_remote_format_generates_irritating_output.mdwn
--- a/doc/bugs/using_old_remote_format_generates_irritating_output.mdwn
+++ b/doc/bugs/using_old_remote_format_generates_irritating_output.mdwn
@@ -26,3 +26,5 @@
 
 * silence the "not found" error when the file is found in another location
 * a way to rename the files in the remote (i guess the aaa/bbb part can be derived from the file name; in that case, that could even be done w/o network interaction).
+
+[[!tag confirmed]]
diff --git a/doc/bugs/utf8.mdwn b/doc/bugs/utf8.mdwn
deleted file mode 100644
--- a/doc/bugs/utf8.mdwn
+++ /dev/null
@@ -1,192 +0,0 @@
-### Please describe the problem.
-
-Git Annex stumbles and does not transfer files with special characters...
-
-
-### What steps will reproduce the problem?
-
-Added the file "Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3" to Git Annex on my Galaxy Nexus (Android), which was committed successfully but not gettable.
-
-
-### What version of git-annex are you using? On what operating system?
-
-Phone: 4.20130709-g339d1eo
-Transfer Server: 3.20120406 (which it did not get to)
-Desktop: 3.20120629
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-fozz@cobol:~/Phone $ git annex get
-get Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (not available) 
-  Try making some of these repositories available:
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-failed
-get Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueño_(Monsterrat's_Live_Takes).mp3 (not available) 
-  Try making some of these repositories available:
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-failed
-get Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (not available) 
-  Try making some of these repositories available:
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-failed
-get Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (not available) 
-  Try making some of these repositories available:
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-failed
-git-annex: get: 4 failed
-
-===============
-
-fozz@cobol:~/Phone $ git annex whereis Freddie_Mercury/
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (1 copy) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueño_(Monsterrat's_Live_Takes).mp3 (1 copy) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (1 copy) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (1 copy) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-whereis Freddie_Mercury/Barcelona_[+video]/B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3 (3 copies) 
-  	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-   	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-   	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-ok
-
-
-# End of transcript or log.
-"""]]
-
-> We seem to have reached a point of confusion, lack of information,
-> and/or diminishing returns with this bug report. I have fixed
-> it as best I can. If you have any problems, please file a new bug report
-> with as complete information as possible. [[done]] --[[Joey]]
diff --git a/doc/bugs/utf8/comment_10_f298b8b480d3ab2dd9c279589afcd0ea._comment b/doc/bugs/utf8/comment_10_f298b8b480d3ab2dd9c279589afcd0ea._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_10_f298b8b480d3ab2dd9c279589afcd0ea._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Ooops"
- date="2013-07-26T21:28:46Z"
- content="""
-Hi Joey,
-
-I started replicating it today but managed to make annex a directory structure I did not mean to through my own silly fault and it's taking ages to unannex, I'll have another go over the weekend, this time with not so fat fingers!
-"""]]
diff --git a/doc/bugs/utf8/comment_11_a8864a46f8154680beeea27449ac6f09._comment b/doc/bugs/utf8/comment_11_a8864a46f8154680beeea27449ac6f09._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_11_a8864a46f8154680beeea27449ac6f09._comment
+++ /dev/null
@@ -1,142 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Replicated, I think"
- date="2013-07-27T10:02:32Z"
- content="""
-I think I have it replicated, I did not do _exactly_ the same thing, no renaming of the tilde-n file but I still got the ControlPath error.
-
-    # On phone - Copy folder into Git Annex... wait till done
-    # On Server with new Git Annex: git annex sync
-    fozz@markdown:~/tmp/zzz$ git annex get .
-    get Freddie_Mercury/Barcelona_[+video]/B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (not available)
-      Try making some of these repositories available:
-            bc0525c4-cf9e-45da-a8e1-19003dee1dcb -- u0_a84@localhost:/sdcard/annex
-    failed
-    get Freddie_Mercury/Barcelona_[+video]/B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 ^[[A^[[A^[[A^[[A^[[A^[[A(from origin...) ^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[A^[[Aok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3 ^[[A^[[A^[[A^[[A^[[A^[[A(from origin...) ^[[A^[[A^[[A^[[A^[[A^[[Aok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 ^C
-    fozz@markdown:~/tmp/zzz$ git annex get .
-    get Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueño_(New_Orchestrated_Version).mp3 (not available)
-      Try making some of these repositories available:
-            bc0525c4-cf9e-45da-a8e1-19003dee1dcb -- u0_a84@localhost:/sdcard/annex
-    failed
-    get Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueño_(Monsterrat's_Live_Takes).mp3 (not available)
-      Try making some of these repositories available:
-            bc0525c4-cf9e-45da-a8e1-19003dee1dcb -- u0_a84@localhost:/sdcard/annex
-    failed
-    get Freddie_Mercury/Barcelona_[+video]/B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (not available)
-      Try making some of these repositories available:
-            bc0525c4-cf9e-45da-a8e1-19003dee1dcb -- u0_a84@localhost:/sdcard/annex
-    failed
-    get Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3 (from origin...) ok
-    get Freddie_Mercury/Barcelona_[+video]/B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3 (from origin...) ok
-    (Recording state in git...)
-    git-annex: get: 3 failed
-    
-    fozz@markdown:~/tmp/zzz$ git annex whereis Freddie_Mercury/Barcelona_\[+video\]/B00921KMYW_\(disc_3\)_04_-_Ensueño_\(Orchestral_Version\).mp3 
-    whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueño_(Orchestral_Version).mp3 (1 copy) 
-            bc0525c4-cf9e-45da-a8e1-19003dee1dcb -- u0_a84@localhost:/sdcard/annex
-    		ok
-    
-    # On phone
-    Falling back to hardcoded app location; cannot find expected files in /data/app-lib
-    git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ git annex webapp
-    
-      Detected a crippled filesystem.
-    
-      Enabling direct mode.
-    fozz@markdown.lang.speechmarks.com's password:
-    fozz@markdown.lang.speechmarks.com's password:
-    ^Z[1] + Stopped              git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ bg
-    [1] git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ cd ../annex/
-    u0_a84@android:/sdcard/annex $ ls
-    Freddie_Mercury
-    u0_a84@android:/sdcard/annex $ git remote -v
-    markdown.lang.speechmarks.com_phoneannex        ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex/ (fetch)
-    markdown.lang.speechmarks.com_phoneannex        ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex/ (push)
-    u0_a84@android:/sdcard/annex $ git annex copy . --to markdown.lang.speechmarks.com_phoneannex
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.WisPICyIHiMGEO3k\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.hYyDKddvBHgjW4AI\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueo_(New_Orchestrated_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.PR2s7Btep0Vklpr1\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.GuiE6O9sVgvAsPjv\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.MNE7Nrd4rTe59BpR\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.MtXCKPHds4ma0iPl\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.6iovvzKR6HE4nZwz\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.wZy825TDcYvHhDUx\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.RQLLAcX2MGpLvJC5\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.kiQQXvKBLNSP3cRO\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.CIdY4uFDFCIboOpG\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.sza5nEOnJ4qnh6op\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.PXT6QfTHojjPvlBM\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueo_(Monsterrat's_Live_Takes).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.LaHS26WonwTUqBDO\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.rw9hP3fjehIAJc1P\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.aJOWNwtRBDG6pecN\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.fOFCaugrRAzzHAMZ\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.onG8CR4YP9x5c3ZK\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.KgOqB8Rg1ZZI1fzP\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.xN1FqoX79hSxwQS7\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.YpZgAo1LVawkOIBd\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueo_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.TDvJl5gPqOFTbqgF\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.CYBfRJuMZTYUgTnN\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.VjyVTH1bRjeRl7fE\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.SfA8ZMsoaea1JqZm\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.uYsVLhxvYZl1F7Dj\" too long for Unix domain socket
-    ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ControlPath \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.NRAFY6O124W6tAdG\" too long for Unix domain socket
-    ok
-    (Recording state in git...)
-    u0_a84@android:/sdcard/annex $
-
-"""]]
diff --git a/doc/bugs/utf8/comment_12_2202c3479d19d306f31aac5a47b55e7d._comment b/doc/bugs/utf8/comment_12_2202c3479d19d306f31aac5a47b55e7d._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_12_2202c3479d19d306f31aac5a47b55e7d._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.246.110"
- subject="comment 12"
- date="2013-07-27T17:46:11Z"
- content="""
-Ok, I think if you upgrade to the current build for Android, you'll find that the problem goes away. I put in a fix several days ago that makes it use much shorter controlpaths.
-
-The question remains why it ever used a path of \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\". This is 110 bytes; the code checks for a path of longer than 99 bytes. It should have disabled ssh connection caching when it was unable to construct a short enough path.
-"""]]
diff --git a/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment b/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment
+++ /dev/null
@@ -1,41 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.246.110"
- subject="comment 13"
- date="2013-07-27T20:46:01Z"
- content="""
-I've verified that the (old) code correctly returned no path when it's too long:
-
-<pre>
-*Annex.Ssh System.Directory System.Posix.Directory Annex Git.Construct Git.Config System.Posix.Env Utility.Env>  eval (newState r') $ changeGitConfig (\c -> c  { annexCrippledFileSystem = True  }) >> sshInfo (\"fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\", Nothing)
-(Nothing,[])
-</pre>
-
-In case the problem was somehow related to calculating the length on Android (ie, Data.Bits.Utils broken), I built a small program that calculated the length of the string the same way
-
-[[!format haskell \"\"\"
-import Utility.FileSystemEncoding
-
-main = do
-	let s = \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\"
-	let ws = decodeW8 s
-	print (length ws)
-\"\"\"]]
-
-Outputs 110 on Android as expected.
-
-Finally, using git-annex 4.20130721-g002de3e on Android (a newer version than the bug reporter's but with no changes to Annex.Ssh), I manually set up a repository using the same hostname:
-
-<pre>
-[remote \"foo\"]
-	url = ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq
-	fetch = +refs/heads/*:refs/remotes/foo/*
-	annex-uuid = dummy
-</pre>
-
-And still cannot replicate the bug; as expected it does not use the socket since it's too long:
-
-copy foo (checking foo...) [2013-07-27 16:40:42 EDT] call: ssh [\"-T\",\"fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\",\"git-annex-shell 'inannex' '' 'SHA256E-s29--093429efb0d1427753d1f038f5279ec4df66785a1b2429b3fa5e3a01bcb75bd8' --uuid 111\"]
-
-So, I don't understand how this could have happened. Although my recent changes mean it'll use a 62 byte path max on Android now, which certainly should avoid the problem, even if there's some actual bug here that I cannot reproduce.
-"""]]
diff --git a/doc/bugs/utf8/comment_14_656b3caa16ae93b092fb5804fa575a3b._comment b/doc/bugs/utf8/comment_14_656b3caa16ae93b092fb5804fa575a3b._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_14_656b3caa16ae93b092fb5804fa575a3b._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Will give the new version a got tomorrow..."
- date="2013-07-27T21:45:29Z"
- content="""
-But do you have any idea why it didn't transfer the filename with the ~ above the n?
-"""]]
diff --git a/doc/bugs/utf8/comment_15_25b3d4c47c45b72129b17b171a45c5f9._comment b/doc/bugs/utf8/comment_15_25b3d4c47c45b72129b17b171a45c5f9._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_15_25b3d4c47c45b72129b17b171a45c5f9._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.246.110"
- subject="comment 15"
- date="2013-07-27T21:50:32Z"
- content="""
-AFAICS it was failing to transfer every file, no matter what the name, due to the socket length too long problem.
-"""]]
diff --git a/doc/bugs/utf8/comment_16_2aaab9253bbc75012292c7b5a7d55696._comment b/doc/bugs/utf8/comment_16_2aaab9253bbc75012292c7b5a7d55696._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_16_2aaab9253bbc75012292c7b5a7d55696._comment
+++ /dev/null
@@ -1,173 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Not completely..."
- date="2013-07-28T11:44:40Z"
- content="""
-So done a bit of testing this morning...
-
-I upgraded the Git Annex on my phone and added a text file called \"mañnequin\" into my Git Annex. The assistant web app did not do anything and it did not appear on my desktop when I sync'd... So I went to my phone manually added it and synced. Which then did make it appear on my desktop when I did a sync.
-
-Phone Log:
-
-    Falling back to hardcoded app location; cannot find expected files in /data/app-lib
-    git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ git annex webapp
-    ^Z[1] + Stopped              git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ bg
-    [1] git annex webapp
-    u0_a84@android:/sdcard/git-annex.home $ cd ../annex/
-    u0_a84@android:/sdcard/annex $ git remote -v
-    markdown.lang.speechmarks.com_phoneannex        ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex/ (fetch)
-    markdown.lang.speechmarks.com_phoneannex        ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex/ (push)
-    u0_a84@android:/sdcard/annex $ git-annex version
-    git-annex version: 4.20130723-ged05a63
-    build flags: Assistant Webapp Testsuite S3 WebDAV Inotify XMPP DNS
-    local repository version: 4
-    default repository version: 3
-    supported repository versions: 3 4
-    upgrade supported from repository versions: 0 1 2
-    u0_a84@android:/sdcard/annex $ git annex copy . --to markdown.lang.speechmarks.com_phoneannex
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHNS_(disc_1)_04_-_Ensueo_(New_Orchestrated_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KKSA_(disc_2)_05_-_Ensueo_(Monsterrat's_Live_Takes).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueo_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    copy Freddie_Mercury/Barcelona_[+video]/B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3 (checking markdown.lang.speechmarks.com_phoneannex...) ok
-    u0_a84@android:/sdcard/annex $ ls
-    Freddie_Mercury
-    u0_a84@android:/sdcard/annex $ ls
-    ls     lsattr lsmod  lsof   lspci  lsusb
-    rcury/Barcelona_\[+video]/B00921K                                                                <
-    B00921KGRK_(disc_1)_01_-_Barcelona_(New_Orchestrated_Version.mp3
-    B00921KH5G_(disc_1)_02_-_La_Japonaise_(New_Orchestrated_Vers.mp3
-    B00921KHD8_(disc_1)_03_-_The_Fallen_Priest_(New_Orchestrated.mp3
-    B00921KHNS_(disc_1)_04_-_Ensueo_(New_Orchestrated_Version).mp3
-    B00921KHY2_(disc_1)_05_-_The_Golden_Boy_(New_Orchestrated_Ve.mp3
-    B00921KI9G_(disc_1)_06_-_Guide_Me_Home_(New_Orchestrated_Ver.mp3
-    B00921KIIW_(disc_1)_07_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3
-    B00921KITG_(disc_1)_08_-_Exercises_In_Free_Love_(New_Orchest.mp3
-    B00921KJ22_(disc_1)_09_-_Overture_Piccante_(New_Orchestrated.mp3
-    B00921KJB8_(disc_1)_10_-_How_Can_I_Go_On_(New_Orchestrated_V.mp3
-    B00921KJMW_(disc_2)_01_-_Exercises_In_Free_Love_(1987_B-Side.mp3
-    B00921KJVI_(disc_2)_02_-_Barcelona_(Early_Version__Freddie's.mp3
-    B00921KK5I_(disc_2)_03_-_La_Japonaise_(Early_Version__Freddi.mp3
-    B00921KKHQ_(disc_2)_04_-_Rachmaninov's_Revenge_(The_Fallen_P.mp3
-    B00921KKSA_(disc_2)_05_-_Ensueo_(Monsterrat's_Live_Takes).mp3
-    B00921KL2U_(disc_2)_06_-_The_Golden_Boy_(Early_Version__Fred.mp3
-    B00921KLBQ_(disc_2)_07_-_Guide_Me_Home_(Alternative_Version).mp3
-    B00921KLJI_(disc_2)_08_-_How_Can_I_Go_On_(Alternative_Versio.mp3
-    B00921KLUC_(disc_2)_09_-_How_Can_I_Go_On_(Alternative_Piano_.mp3
-    B00921KM3I_(disc_3)_01_-_Barcelona_(Orchestral_Version).mp3
-    B00921KMBU_(disc_3)_02_-_La_Japonaise_(Orchestral_Version).mp3
-    B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3
-    B00921KMYW_(disc_3)_04_-_Ensueo_(Orchestral_Version).mp3
-    B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3
-    B00921KNUA_(disc_3)_06_-_Guide_Me_Home_(Orchestral_Version).mp3
-    B00921KOVI_(disc_3)_07_-_How_Can_I_Go_On_(Orchestral_Version.mp3
-    B00921KPP8_(disc_3)_08_-_Exercises_In_Free_Love_(Orchestral_.mp3
-    B00921KQJ8_(disc_3)_09_-_Overture_Piccante_(Orchestral_Versi.mp3
-    rcury/Barcelona_\[+video]/B00921K                                                                <
-    ls: Freddie_Mercury/Barcelona_[+video]/B00921K: No such file or directory
-    1|u0_a84@android:/sdcard/annex $
-    1|u0_a84@android:/sdcard/annex $
-    1|u0_a84@android:/sdcard/annex $
-    1|u0_a84@android:/sdcard/annex $
-    1|u0_a84@android:/sdcard/annex $
-    1|u0_a84@android:/sdcard/annex $ fg
-    git annex webapp
-    bg
-    ^Z[1] + Stopped              git annex webapp
-    u0_a84@android:/sdcard/annex $ bg
-    [1] git annex webapp
-    u0_a84@android:/sdcard/annex $ ls
-    Freddie_Mercury  ma??nequin
-    u0_a84@android:/sdcard/annex $ git annex add manequin
-    Freddie_Mercury/   manequin
-    u0_a84@android:/sdcard/annex $ git annex add manequin
-    add manequin (checksum...) ok
-    (Recording state in git...)
-    u0_a84@android:/sdcard/annex $ git annex sync
-    commit
-    ok
-    pull markdown.lang.speechmarks.com_phoneannex
-    remote: Counting objects: 12, done.
-    remote: Compressing objects: 100% (6/6), done.
-    remote: Total 8 (delta 4), reused 0 (delta 0)
-    Unpacking objects: 100% (8/8), done.
-    From ssh://git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex
-       c709e47..d2678a5  synced/git-annex -> markdown.lang.speechmarks.com_phoneannex/synced/git-annex
-    ok
-    (merging markdown.lang.speechmarks.com_phoneannex/synced/git-annex into git-annex...)
-    (Recording state in git...)
-    (Recording state in git...)
-    push markdown.lang.speechmarks.com_phoneannex
-    warning: no threads support, ignoring --threads
-    Counting objects: 15, done.
-    Compressing objects: 100% (11/11), done.
-    Writing objects: 100% (12/12), 1.19 KiB, done.
-    Total 12 (delta 4), reused 0 (delta 0)
-    To ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex/~/phone-annex/
-       d2678a5..577fa92  git-annex -> synced/git-annex
-       c829a0a..2aa892f  master -> synced/master
-    ok
-    u0_a84@android:/sdcard/annex $
-
-I have no idea in this log why it is wrote \"manequin\" not \"mañnequin\" but this is what the command completion gave me ( I don't know how to type that letter ), but as you can see later it came over correctly later.
-
-Desktop:
-
-    fozz@cobol:~/phone-annex $ git annex sync
-    commit
-    # On branch master
-    nothing to commit, working directory clean
-    ok
-    pull origin
-    remote: Counting objects: 15, done.
-    remote: Compressing objects: 100% (11/11), done.
-    remote: Total 12 (delta 4), reused 0 (delta 0)
-    Unpacking objects: 100% (12/12), done.
-    From ssh://markdown.lang.speechmarks.com/home/fozz/phone-annex
-       c829a0a..2aa892f  master     -> origin/master
-       d2678a5..577fa92  synced/git-annex -> origin/synced/git-annex
-       c829a0a..2aa892f  synced/master -> origin/synced/master
-    
-    Updating c829a0a..2aa892f
-    Fast-forward
-     \"ma\303\261nequin\" | 1 +
-     1 file changed, 1 insertion(+)
-     create mode 120000 \"ma\303\261nequin\"
-    
-    Already up-to-date.
-    ok
-    (merging origin/synced/git-annex into git-annex...)
-    push origin
-    Everything up-to-date
-    ok
-
-I have since gone through and replicated this with \"mañnequin.txt\" from scratch with a completely empty repository and it did an identical thing again. I then added a backup of my KeePass.kdb database and it went over fine. So it seems that git-annex has no problem with the \"ñ\" file now, but the assistant does not see it at all.
-
-I have left the repository on my phone / desktop / server in this state so if you want further output please let me know.
-"""]]
diff --git a/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment b/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_1_416ad6fb5f7379732129dc5283a7e550._comment
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Renaming files"
- date="2013-07-21T10:08:16Z"
- content="""
-Renaming the files does not fix it, Git annex on all computers knows that those files are only in my phone, but the assistant is refusing to transfer the contents, it does not seem to know that it needs to...
-
-    whereis Freddie_Mercury/Barcelona_[+video]/B00921KMM4_(disc_3)_03_-_The_Fallen_Priest_(Orchestral_Versi.mp3 (3 copies) 
-      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-       	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-       	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-    ok
-    whereis Freddie_Mercury/Barcelona_[+video]/B00921KMYW_(disc_3)_04_-_Ensueno_(Orchestral_Version).mp3 (1 copy) 
-      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-    ok
-    whereis Freddie_Mercury/Barcelona_[+video]/B00921KNAK_(disc_3)_05_-_The_Golden_Boy_(Orchestral_Version).mp3 (3 copies) 
-      	1f368162-f02f-4794-af0c-1b5489e099b3 -- u0_a84@localhost:/sdcard/annex
-       	53f03d06-f1e3-11e2-8519-1b41c09abecd -- here (Cobol: Phone)
-       	cb6240e0-f1df-11e2-836a-7f4323e50c49 -- origin (Markdown: Phone)
-    ok
-
-"""]]
diff --git a/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment b/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_2_cd55f6bbeb145fd554f331dcff64f5e1._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="git annex copy --to won't get them across either..."
- date="2013-07-21T10:12:03Z"
- content="""
-git annex copy . --to markdown.DOMAIN_phoneannex responds with
-
-    ControlPath \"/data/data/ga.androidterm/tmp/fozz@...somethingthatlookslikeahash\" too long for Unix domain socket
-"""]]
diff --git a/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment b/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_3_bb583a419d6fa4e33e5364c4468b35c6._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.154.0.140"
- subject="seems to not involve utf8 at all.."
- date="2013-07-21T18:17:00Z"
- content="""
-Can you please show me the actual filename, that you obfuscated as \"/data/data/ga.androidterm/tmp/fozz@...somethingthatlookslikeahash\" ?
-"""]]
diff --git a/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment b/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_4_cd8a22cfb70d9d21f0a5339ccc52ee93._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- username="GLITTAH"
- ip="37.130.227.133"
- subject="comment 4"
- date="2013-07-21T19:36:16Z"
- content="""
-This sounds like a bug I ran into a while ago that got fixed.
-
->What version of git-annex are you using? On what operating system?
->
->Phone: 4.20130709-g339d1eo Transfer Server: 3.20120406 (which it did not get to) Desktop: 3.20120629
-
-Maybe try upgrading your server and desktop versions?  Those look old enough to still have the utf-8 bug.
-"""]]
diff --git a/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment b/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_5_14eefd4bee283802e9c462fa20b7835c._comment
+++ /dev/null
@@ -1,19 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="Darn it..."
- date="2013-07-21T20:29:33Z"
- content="""
-Hi,
-
-Sorry, it was on my phone and very long and I didn't think it'd be important... Sheesh Users eh!
-
-I think the error happened for every file or at least lots, not just the one with the strange tilde above the \"n\".
-Eventually, it might have been after a phone reboot, it sorted itself and continued.
-
-I can try and recreate it if it'll help, though it won't be till Wednesday / Thursday as I'm going away for a few days and I still need to pack.
-
-Sorry for the bad bug report, I know how annoying they are.
-
-It's not so easy for me to upgrade because one's an Ubuntu LTS and one is a Mint Debian Edition, both are the repository versions.
-"""]]
diff --git a/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment b/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_6_58d8b5bdb9f11e8c344e86a675a075dd._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
- nickname="develop"
- subject="comment 6"
- date="2013-07-21T20:31:50Z"
- content="""
-As much i myself personally would hate it. You really should go with the standalone builds provided on this site then.
-
-Just download the zip, extract on both machines. Make sure the PATH is correct, and it should Just Work(TM)
-
-"""]]
diff --git a/doc/bugs/utf8/comment_7_00fa9672ce55b6bfa885b8a13287ac25._comment b/doc/bugs/utf8/comment_7_00fa9672ce55b6bfa885b8a13287ac25._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_7_00fa9672ce55b6bfa885b8a13287ac25._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.154.1.10"
- subject="comment 7"
- date="2013-07-22T18:34:55Z"
- content="""
-The only version of git-annex that matters is the one installed on the Android device. Which is fine.
-
-I reiterate my request for the actual thing that got obfuscated as \"/data/data/ga.androidterm/tmp/fozz@...somethingthatlookslikeahash\". Once I have that peice of information I should be able to fix this bug in short order. I understand exactly what's going on, except I don't know what the actual length of the filename that is causing the problem is.
-"""]]
diff --git a/doc/bugs/utf8/comment_8_a01e26fa0fafbc291020f53dbfdf6443._comment b/doc/bugs/utf8/comment_8_a01e26fa0fafbc291020f53dbfdf6443._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_8_a01e26fa0fafbc291020f53dbfdf6443._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS0"
- nickname="Matthew"
- subject="I will give recreating the bug a go in about 3 days time..."
- date="2013-07-22T19:26:44Z"
- content="""
-I will give recreating the bug a go in about 3 days time when I get back off holiday.
-
-Thanks
-"""]]
diff --git a/doc/bugs/utf8/comment_9_b7c084be01ce985be51e48503fcba468._comment b/doc/bugs/utf8/comment_9_b7c084be01ce985be51e48503fcba468._comment
deleted file mode 100644
--- a/doc/bugs/utf8/comment_9_b7c084be01ce985be51e48503fcba468._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.152.246.110"
- subject="comment 9"
- date="2013-07-26T21:09:36Z"
- content="""
-Any luck reproducing this bug and getting the info I need to know exactly what's going on?
-"""]]
diff --git a/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn b/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn
deleted file mode 100644
--- a/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-Since uuid.log, trust.log and remote.log are union merged, it's possible
-for any given item in them to have multiple values after a merge.
-This would happen, for example, if the value was changed in different ways
-in two repos which were then merged. git-annex will use an arbitrary
-one of the multiple values.
-
-A workaround if this should happen to you is to use `git annex describe`
-or other commands to re-set the value you want. The process of setting
-the value will remove the multiple lines.
-
-To fix this the file format needs to be changed to include a timestamp
-as is done with the other log files, then git-annex can consistently
-pick the newest value -- which is as close to the "right" value as can be
-determined in this situation.
-
-----
-
-File format backwards-compatability is the issue. Ideally, old git-annex
-would keep working, ignoring the timestamp.
-
-- uuid.log: "uuid description timestamp" would work; old git-annex 
-  would just treat the timestamp as part of the description which would be
-  ok
-  > update: converted! --[[Joey]] 
-- trust.log: "uuid trustlevel timestamp" would work; old git-annex
-  ignores trailing words
-  > update: converted! --[[Joey]] 
-- remote.log: "uuid key=value ... timestamp" is on the edge but does work
-  (old git-annex will include the timestamp in the key/value map it builds,
-  but that should not break anything really)
-  > update: converted! --[[Joey]] 
-
-Appending "timestamp=xxxxx" would be good for clarity, and make
-it easier to parse the timestamp out from lines that have it.
-
-> [[done]] --[[Joey]] 
diff --git a/doc/bugs/watch_command_on_OSX_--_hangs_with_a_small_repo.mdwn b/doc/bugs/watch_command_on_OSX_--_hangs_with_a_small_repo.mdwn
deleted file mode 100644
--- a/doc/bugs/watch_command_on_OSX_--_hangs_with_a_small_repo.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-I had started a fresh repo to test out the watch command again on OSX and noticed that it's borked, I'm not sure when it was broken.
-
-The snippet of the log message and command is
-
-<pre>
-$ git annex watch --foreground -d -v
-watch . read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","show-ref","git-annex"] 
-read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","show-ref","--hash","refs/heads/git-annex"] 
-read: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","log","refs/heads/git-annex..6702e5361146450800ae5af0b63e97bd9c55d70b","--oneline","-n1"] 
-chat: git ["--git-dir=/Users/jtang/sandbox/atest/.git","--work-tree=/Users/jtang/sandbox/atest","cat-file","--batch"] 
-(scanning...) call: git ["--git-dir=/Users/jtan
-</pre>
-
-I had run git-annex with a new repo with just doing a git init and git annex init, I just threw in one or two small text files to see if it was working. It just hangs and does nothing. I had also tried it out on one of my bigger repos and it does the same thing it just hangs at _(scanning...)_ There isn't much to go on, I wonder if it's hitting the [[Issue on OSX with some system limits]] or if its just a thread/fork issue on OSX.
-
-It still hangs on the small repo even if I do
-
-    $ sudo sysctl -w kern.maxfilesperproc=400000
-    $ ulimit -n 2000
-
-Also, just in case if you need it still (on a clean OSX 10.7 system)
-
-<pre>
-$ ulimit -a
-core file size          (blocks, -c) 0
-data seg size           (kbytes, -d) unlimited
-file size               (blocks, -f) unlimited
-max locked memory       (kbytes, -l) unlimited
-max memory size         (kbytes, -m) unlimited
-open files                      (-n) 256
-pipe size            (512 bytes, -p) 1
-stack size              (kbytes, -s) 8192
-cpu time               (seconds, -t) unlimited
-max user processes              (-u) 709
-virtual memory          (kbytes, -v) unlimited
-</pre>
-
-Please close or merge this report if it's a duplicate.
-
-> I've fixed this, it works in my (so far limited) tests. [[done]]
-> --[[Joey]] 
diff --git a/doc/bugs/watch_command_on_OSX_10.7.mdwn b/doc/bugs/watch_command_on_OSX_10.7.mdwn
deleted file mode 100644
--- a/doc/bugs/watch_command_on_OSX_10.7.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-Running the tip of the watch branch on OSX in an annex'ed directory.
-
-The watch command detects the changes, does _something_, see the output below.
-
-Output from watch command
-
-<pre>
-(Recording state in git...)
-Added "./KeePass2.18.dmg"
-Added "./KeePassX-0.4.3.dmg"
-add ./KeePass2.18.dmg (checksum...) ok
-add ./KeePassX-0.4.3.dmg (checksum...) ok
-</pre>
-
-State of the annex
-
-<pre>
-laplace:annex jtang$ git status
-# On branch master
-# Untracked files:
-#   (use "git add <file>..." to include in what will be committed)
-#
-#	KeePass2.18.dmg
-#	KeePassX-0.4.3.dmg
-nothing added to commit but untracked files present (use "git add" to track)
-</pre>
-
-It seems to not do a git add and commit after the creation of the symlinks, manually doing this makes it all happy again till more files are added.
-
-note: i had posted a comment in the blog post, but posting the issue here is probably more appropriate.
-
-> Yeah, this is the issue I was struggling with last night. 
-> I think it's fixed in 57cf65eb6d811ba7fd19eb62a54e3b83a0c2dfa7,
-> but the kqueue watch still needs a lot of work. --[[Joey]]
-
->> Confirmed this is fixed, but do note the known kqueue bugs in 
->> [[design/assistant/inotify]]! [[done]] --[[Joey]]
diff --git a/doc/bugs/watcher_commits_unlocked_files.mdwn b/doc/bugs/watcher_commits_unlocked_files.mdwn
deleted file mode 100644
--- a/doc/bugs/watcher_commits_unlocked_files.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-When having "git annex watch" running, unlocking files causes the watcher
-to immediately lock/commit them.
-
-----
-
-Possible approaches:
-
-* The watcher could detect unlocked files by checking if newly added files
-  are a typechange of a file already in git. But this would add git overhead
-  to every file add.
-* `git annex unlock` could add some type of flag file, which the assistant
-  could check. This would work fine, for users who want to use `git annex
-  unlock` with the assistant. That's probably not simple enough for most
-  users, though.
-* There could be a UI in the assistant to pick a file and unlock it.
-  The assistant would have its own list of files it knows are unlocked.
-  But I'm trying to avoid mandatory UI to use the assistant.
-* Perhaps instead, have a directory, like "edit". The assistant could notice
-  when files move into this special directory, and automatically unlock them.
-  Then when they're moved out, automatically commit them.
-* Alternatively, files that are moved out of the repository entirely could be
-  automatically unlocked, and then when they're moved back in, it would
-  automatically do the right thing. This may be worth implementing in
-  combination with the "edit" directory, as different use cases would work
-  better with one or the other. However, I don't currently get inotify
-  events when files are moved out of the repository (well, I do, but it
-  just says "file moved", with no forwarding address, so I don't know 
-  how to find the file to unlock it.
-
-[[!meta title="assistant: watcher_commits_unlocked_files"]]
-
-> [[done]]; I just tested and somehow this no longer happens;
-> the watcher/assistant leaves the unlocked file alone, and then
-> as soon as it's modified re-adds it.
-> 
-> Also, of course, there is direct mode, which avoids needing to unlock...
-> --[[Joey]]
diff --git a/doc/bugs/webapp_hang.mdwn b/doc/bugs/webapp_hang.mdwn
deleted file mode 100644
--- a/doc/bugs/webapp_hang.mdwn
+++ /dev/null
@@ -1,144 +0,0 @@
-Occasionally, clicking on a link in the webapp will hang. When this
-happens, which has only been seen in Chromium so far, the tab will spin
-forever, without anything loading. Other tabs can be opened with
-middle-click on links in the webapp, and work fine. Stopping and reloading
-in the tab tends to hang again, although eventually this will clear the
-hang up.
-
--------
-
-My best procedure to replicate this, about 25% of the time:
-
-* have 2 large files and a libreoffice spreadsheet
-* start webapp, make repository
-* open file browser using button in webapp
-* move files into repository
-* make media subdir; move media into it
-* open spreadsheet, modify, save
-* click on New Repository button for the hang
-
-Running recordmydesktop at the same time may also help.. Or giving a
-presentation in Australia. :/
-
--------
-
-Hypotheses:
-
-* Warp's slowloris protection could be triggering. Possibly by the
-  repeated hits to update the alerts? I added a settingsOnException handler
-  that logs all exceptions, and ThreadKilled is happening several times.
-  The only place in Warp that kills threads is due to a timeout installed
-  for that. 
-
-  **Verified** Bug filed upstream:  <https://github.com/yesodweb/wai/issues/146>
-
-  ** workaround in place **
-
-* Something deep in git-annex, such as the inotidy code, could be
-  preventing a web server thread from running. But then why do other
-  tabs and other web browsers work while it's stuck?
-  It would have to affect only 1 thread.
-
--------
-
-I captured a clean protocol dump of this happening. It includes only the
-final, hanging http request and subsequent traffic, not the setup.
-
-We can see the web browser send a request. The server ACKs it at the TCP
-level, but never sends any reply. The web browser continues sending TCP
-keep-alive packets, which are acked by the server. This continued as long
-as the browser tab was left open.
-
-Question: Did the browser send a complete & valid request? The last part
-sent is a cookie and "\r\n\r\n".. So it seems complete. Unless warp is
-expecting a request body?
-
-<pre>
-17:22:30.533079 IP localhost.localdomain.53239 > localhost.localdomain.45836: Flags [P.], seq 4237976899:4237977772, ack 2608808926, win 2048, options [nop,nop,TS val 4895706 ecr 4885760], length 873
-	0x0000:  4500 039d be84 4000 4006 7ad4 7f00 0001  E.....@.@.z.....
-	0x0010:  7f00 0001 cff7 b30c fc9a 6543 9b7f 43de  ..........eC..C.
-	0x0020:  8018 0800 0192 0000 0101 080a 004a b3da  .............J..
-	0x0030:  004a 8d00 4745 5420 2f63 6f6e 6669 672f  .J..GET./config/
-	0x0040:  7265 706f 7369 746f 7279 3f61 7574 683d  repository?auth=
-	0x0050:  6437 6266 3037 3438 6663 3863 3031 3965  d7bf0748fc8c019e
-	0x0060:  6230 3966 3530 3631 6164 6663 3861 3563  b09f5061adfc8a5c
-	0x0070:  3430 3437 3633 6562 3736 6630 6163 3533  404763eb76f0ac53
-	0x0080:  3663 3362 6230 3066 3835 6663 6361 3233  6c3bb00f85fcca23
-	0x0090:  6235 3639 3764 3332 3464 3737 3930 3063  b5697d324d77900c
-	0x00a0:  3739 3532 6430 6165 3235 3166 6331 6337  7952d0ae251fc1c7
-	0x00b0:  3532 3632 6330 3233 6265 3936 3066 3563  5262c023be960f5c
-	0x00c0:  3364 6135 6532 6262 6234 3639 3863 3035  3da5e2bbb4698c05
-	0x00d0:  2048 5454 502f 312e 310d 0a48 6f73 743a  .HTTP/1.1..Host:
-	0x00e0:  2031 3237 2e30 2e30 2e31 3a34 3538 3336  .127.0.0.1:45836
-	0x00f0:  0d0a 436f 6e6e 6563 7469 6f6e 3a20 6b65  ..Connection:.ke
-	0x0100:  6570 2d61 6c69 7665 0d0a 4163 6365 7074  ep-alive..Accept
-	0x0110:  3a20 7465 7874 2f68 746d 6c2c 6170 706c  :.text/html,appl
-	0x0120:  6963 6174 696f 6e2f 7868 746d 6c2b 786d  ication/xhtml+xm
-	0x0130:  6c2c 6170 706c 6963 6174 696f 6e2f 786d  l,application/xm
-	0x0140:  6c3b 713d 302e 392c 2a2f 2a3b 713d 302e  l;q=0.9,*/*;q=0.
-	0x0150:  380d 0a55 7365 722d 4167 656e 743a 204d  8..User-Agent:.M
-	0x0160:  6f7a 696c 6c61 2f35 2e30 2028 5831 313b  ozilla/5.0.(X11;
-	0x0170:  204c 696e 7578 2069 3638 3629 2041 7070  .Linux.i686).App
-	0x0180:  6c65 5765 624b 6974 2f35 3337 2e31 3720  leWebKit/537.17.
-	0x0190:  284b 4854 4d4c 2c20 6c69 6b65 2047 6563  (KHTML,.like.Gec
-	0x01a0:  6b6f 2920 4368 726f 6d65 2f32 342e 302e  ko).Chrome/24.0.
-	0x01b0:  3133 3132 2e36 3820 5361 6661 7269 2f35  1312.68.Safari/5
-	0x01c0:  3337 2e31 370d 0a52 6566 6572 6572 3a20  37.17..Referer:.
-	0x01d0:  6874 7470 3a2f 2f31 3237 2e30 2e30 2e31  http://127.0.0.1
-	0x01e0:  3a34 3538 3336 2f3f 6175 7468 3d64 3762  :45836/?auth=d7b
-	0x01f0:  6630 3734 3866 6338 6330 3139 6562 3039  f0748fc8c019eb09
-	0x0200:  6635 3036 3161 6466 6338 6135 6334 3034  f5061adfc8a5c404
-	0x0210:  3736 3365 6237 3666 3061 6335 3336 6333  763eb76f0ac536c3
-	0x0220:  6262 3030 6638 3566 6363 6132 3362 3536  bb00f85fcca23b56
-	0x0230:  3937 6433 3234 6437 3739 3030 6337 3935  97d324d77900c795
-	0x0240:  3264 3061 6532 3531 6663 3163 3735 3236  2d0ae251fc1c7526
-	0x0250:  3263 3032 3362 6539 3630 6635 6333 6461  2c023be960f5c3da
-	0x0260:  3565 3262 6262 3436 3938 6330 350d 0a41  5e2bbb4698c05..A
-	0x0270:  6363 6570 742d 456e 636f 6469 6e67 3a20  ccept-Encoding:.
-	0x0280:  677a 6970 2c64 6566 6c61 7465 2c73 6463  gzip,deflate,sdc
-	0x0290:  680d 0a41 6363 6570 742d 4c61 6e67 7561  h..Accept-Langua
-	0x02a0:  6765 3a20 656e 2d55 532c 656e 3b71 3d30  ge:.en-US,en;q=0
-	0x02b0:  2e38 0d0a 4163 6365 7074 2d43 6861 7273  .8..Accept-Chars
-	0x02c0:  6574 3a20 4953 4f2d 3838 3539 2d31 2c75  et:.ISO-8859-1,u
-	0x02d0:  7466 2d38 3b71 3d30 2e37 2c2a 3b71 3d30  tf-8;q=0.7,*;q=0
-	0x02e0:  2e33 0d0a 436f 6f6b 6965 3a20 5f53 4553  .3..Cookie:._SES
-	0x02f0:  5349 4f4e 3d45 3363 7455 496c 7341 5451  SION=E3ctUIlsATQ
-	0x0300:  3631 694c 6d54 6954 7131 6f37 6465 7830  61iLmTiTq1o7dex0
-	0x0310:  3361 6f57 3049 4b63 7663 467a 5838 4344  3aoW0IKcvcFzX8CD
-	0x0320:  5432 7666 4b31 6c42 416d 6279 3166 764f  T2vfK1lBAmby1fvO
-	0x0330:  4643 7952 7863 6f5a 6277 5633 6a4b 4971  FCyRxcoZbwV3jKIq
-	0x0340:  6b35 6958 4674 7557 5261 6b48 6944 6132  k5iXFtuWRakHiDa2
-	0x0350:  7769 3075 2f53 6430 5a49 7a75 4464 7947  wi0u/Sd0ZIzuDdyG
-	0x0360:  774f 6a31 7838 3130 356a 772f 5a2b 355a  wOj1x8105jw/Z+5Z
-	0x0370:  6f4b 6f48 396e 6779 6e4b 5366 5839 742f  oKoH9ngynKSfX9t/
-	0x0380:  6862 4b79 435a 6966 7739 4148 3053 6d4b  hbKyCZifw9AH0SmK
-	0x0390:  436e 4c38 5358 513d 3d0d 0a0d 0a         CnL8SXQ==....
-17:22:30.571152 IP localhost.localdomain.45836 > localhost.localdomain.53239: Flags [.], ack 873, win 2048, options [nop,nop,TS val 4895716 ecr 4895706], length 0
-	0x0000:  4500 0034 f15b 4000 4006 4b66 7f00 0001  E..4.[@.@.Kf....
-	0x0010:  7f00 0001 b30c cff7 9b7f 43de fc9a 68ac  ..........C...h.
-	0x0020:  8010 0800 fe28 0000 0101 080a 004a b3e4  .....(.......J..
-	0x0030:  004a b3da                                .J..
-17:22:35.803152 IP localhost.localdomain.53240 > localhost.localdomain.45836: Flags [.], ack 2157632553, win 2048, options [nop,nop,TS val 4897024 ecr 4885760], length 0
-	0x0000:  4500 0034 3a63 4000 4006 025f 7f00 0001  E..4:c@.@.._....
-	0x0010:  7f00 0001 cff8 b30c 7533 e963 809a dc29  ........u3.c...)
-	0x0020:  8010 0800 fe28 0000 0101 080a 004a b900  .....(.......J..
-	0x0030:  004a 8d00                                .J..
-17:22:35.803213 IP localhost.localdomain.45836 > localhost.localdomain.53240: Flags [.], ack 1, win 2048, options [nop,nop,TS val 4897024 ecr 4840696], length 0
-	0x0000:  4500 0034 10e5 4000 4006 2bdd 7f00 0001  E..4..@.@.+.....
-	0x0010:  7f00 0001 b30c cff8 809a dc29 7533 e964  ...........)u3.d
-	0x0020:  8010 0800 fe28 0000 0101 080a 004a b900  .....(.......J..
-	0x0030:  0049 dcf8                                .I..
-17:23:15.611193 IP localhost.localdomain.53239 > localhost.localdomain.45836: Flags [.], ack 1, win 2048, options [nop,nop,TS val 4906976 ecr 4895716], length 0
-	0x0000:  4500 0034 be85 4000 4006 7e3c 7f00 0001  E..4..@.@.~<....
-	0x0010:  7f00 0001 cff7 b30c fc9a 68ab 9b7f 43de  ..........h...C.
-	0x0020:  8010 0800 fe28 0000 0101 080a 004a dfe0  .....(.......J..
-	0x0030:  004a b3e4                                .J..
-17:23:15.611290 IP localhost.localdomain.45836 > localhost.localdomain.53239: Flags [.], ack 873, win 2048, options [nop,nop,TS val 4906976 ecr 4895706], length 0
-	0x0000:  4500 0034 f15c 4000 4006 4b65 7f00 0001  E..4.\@.@.Ke....
-	0x0010:  7f00 0001 b30c cff7 9b7f 43de fc9a 68ac  ..........C...h.
-	0x0020:  8010 0800 fe28 0000 0101 080a 004a dfe0  .....(.......J..
-	0x0030:  004a b3da                                .J..
-</pre>
-
-[[!tag /design/assistant]]
-[[done]]
diff --git a/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment b/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment
deleted file mode 100644
--- a/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://gdr.name/"
- nickname="gdr.name"
- subject="Not only Chrome"
- date="2013-03-09T10:55:57Z"
- content="""
-It happened to me numerous times with Opera. I was never able to repeat it hence no bug report.
-"""]]
diff --git a/doc/bugs/webapp_hang/comment_2_2a21ac5657128a454f9deb77c4d18057._comment b/doc/bugs/webapp_hang/comment_2_2a21ac5657128a454f9deb77c4d18057._comment
deleted file mode 100644
--- a/doc/bugs/webapp_hang/comment_2_2a21ac5657128a454f9deb77c4d18057._comment
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!comment format=mdwn
- username="http://crosstwine.com/dd/"
- ip="88.65.128.43"
- subject="chrome://net-internals/"
- date="2013-03-09T20:10:54Z"
- content="""
-Hi Joey,
-
-I see that you have found the cause and a workaround for this particular
-problem, but would like to point out that `chrome://net-internals/` can be
-very useful for diagnosing such issues.
-
-(I once hit the `SOCKET_POOL_STALLED_MAX_SOCKETS_PER_GROUP` problem
-mentioned in
-<https://code.google.com/p/chromium/issues/detail?id=27324>, which can
-cause Chromium to keep spinning while not issuing any new requests to a
-specific web server.)
-
-Cheers,  
-Damien Diederen
-"""]]
diff --git a/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn b/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
deleted file mode 100644
--- a/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-What steps will reproduce the problem?
-
-> Open Webapp on Mac OSX Mountain Lion
-
-What is the expected output? What do you see instead?
-
-> I expect notification bubbles and transfer progress bars to show and update on the fly, as well as notifications to disappear when I click the X.
-> 
-> Instead, I have to reload the page after clicking an X or to see new bubbles and progress bar updates.
-
-What version of git-annex are you using? On what operating system?
-
->     git-annex version: 3.20130107
->     local repository version: 3
->     default repository version: 3
->     supported repository versions: 3
->     upgrade supported from repository versions: 0 1 2
-> 
-> Mac OS X 10.8.2 Build 12C3006
-> 
-> Chrome Version 23.0.1271.101
-
-Please provide any additional information below.
-
-Javascript console error log says "Syntax error on localhost:5" which is this line:
-
-    <link rel="stylesheet" href="/static/css/bootstrap.css"><link rel="stylesheet" href="/static/css/bootstrap-responsive.css"><style>body{padding-top:60px;padding-bottom:40px}.sidebar-nav{padding:9px 0}</style><script src="/static/jquery.full.js"></script><script src="/static/js/bootstrap-dropdown.js"></script><script src="/static/js/bootstrap-modal.js"></script><script src="/static/js/bootstrap-collapse.js"></script><script src="/static/longpolling.js"></script><script>function longpoll_"sidebar"() {
-
-> And the bug is the quoting inside the function name.
-> 
-> I believe this affects all builds done using shakespeare-js 1.0.0.2.
-> It may be that some browsers manage to run the javascript despite the
-> quoting. Otherwise, I don't know why noone has reported this bug
-> before now.
-> 
-> I've fixed this bug in git. Your testing with tomorrow's
-> autobuild would be appreciated. --[[Joey]]
-
->> There was a second issue as noted. I fixed that last week,
->> and the fix is in the autobuilds if you'd like to test before
->> the next release. [[done]] again --[[Joey]]
diff --git a/doc/bugs/webapp_shows___34__Added_x_files__34___a_bit_ugly.mdwn b/doc/bugs/webapp_shows___34__Added_x_files__34___a_bit_ugly.mdwn
deleted file mode 100644
--- a/doc/bugs/webapp_shows___34__Added_x_files__34___a_bit_ugly.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-### Please describe the problem.
-When adding a folder with some 80.000 files, the sidebar with "Added x files" gets updated in batches. After some time, it shows (also see attached screenshot):
-
-> Added 6496 files 5781 files 8633 files 7363 files 6159 files
-
-This is a bit ugly. There could a newline after "files".
-
-### What steps will reproduce the problem?
-Add a folder with many files and subfolders in it.
-
-### What version of git-annex are you using? On what operating system?
-4.20130627 
-
-> I have improved the display, now it will just show a single ongoing count,
-> and the most recent 10 or so files added. [[done]] --[[Joey]]
diff --git a/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn b/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn
deleted file mode 100644
--- a/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-### Please describe the problem.
-
-I just started git-annex, and I can hear the fan of my CPU. That doesn't happen unless the CPU is maxed, and indeed:
-
-[[!format txt """
-top - 10:09:53 up 2 days, 13:13, 10 users,  load average: 2,49, 2,41, 1,59
-Tasks: 306 total,   3 running, 302 sleeping,   0 stopped,   1 zombie
-%Cpu(s): 57,2 us,  7,9 sy,  1,2 ni, 32,1 id,  1,3 wa,  0,0 hi,  0,3 si,  0,0 st
-KiB Mem:   8162960 total,  7480272 used,   682688 free,  1107616 buffers
-KiB Swap:  4022268 total,    23384 used,  3998884 free,  3469028 cached
-
-  PID USER      PR  NI  VIRT  RES  SHR S  %CPU %MEM    TIME+  COMMAND
-27841 anarcat   20   0  191m  45m  20m S  92,3  0,6   4:32.68 /usr/local/bin/git-annex webapp
-"""]]
-
-### What steps will reproduce the problem?
-
-I am not sure. I just started the webapp, and it seems to be scanning two huge repositories (160GB and 800GB) with lots of files. The larger one is also in the process of being sync'd to the backup drive.
-
-### What version of git-annex are you using? On what operating system?
-
-My usual bastard build from hell:
-
-[[!format txt """
-git-annex version: 5.20131109-gf2cb5b9
-build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash
-key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
-remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
-local repository version: 3
-default repository version: 3
-supported repository versions: 3 5
-upgrade supported from repository versions: 0 1 2 4
-"""]]
-
-### Please provide any additional information below.
-
-Note that I had to close the chromium tab that was displaying the actual webapp UI, because that was taking another 50% of a CPU (I have a dual core).
-
-Note also that things calmed down since git-annex started transfering larger files - the webapp only takes 75% of the CPU now. ;) And chromium is negligible. But there clearly seems to be a degenerate case where a lot of small files get transfered that seem to freakout the web UI. -- [[anarcat]]
-
-Oh, and just copying the files using `git annex copy --to backup` doesn't use 100% of the CPU.
diff --git a/doc/bugs/webdav_special_remote_fails_on_android___40__box.com__41__.mdwn b/doc/bugs/webdav_special_remote_fails_on_android___40__box.com__41__.mdwn
deleted file mode 100644
--- a/doc/bugs/webdav_special_remote_fails_on_android___40__box.com__41__.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-### Please describe the problem.
-
-The Box.com/WebDAV special remote fails with this error on my Android tablet:
-
-    WebDAV failed to write file: InternalIOException user error (Network.Socket.setSocketOption: socket option NoDelay unsupported on this system): user error
-
-### What steps will reproduce the problem?
-
- 1. Install the Android beta from the download page.
- 2. Create a repository (using the assistant)
- 3. (At this point I configured XMPP, if that's relevant.)
- 4. Configure a Box.com repository using the assistant
-
-The repository will fail to add with the above error message.
-
-### What version of git-annex are you using? On what operating system?
-
-git-annex 5.20131221-gf8c928d
-
-Android 4.0.4<br>
-Kernel 2.6.35-palm-tenderloin<br>
-CyanogenMod 9-20121202-NIGHTLY-tenderloin (HP Touchpad)
-
-### Please provide any additional information below.
-
-I have successfully set up the same Box.com account via the assistant on another machine.
-
-I don't see any mention of WebDAV in daemon.log and friends.  
-
-It seems like NODELAY should be optional, as it's just a performance optimization (and disabling packet coalescing may be battery-hostile on a mobile device, too).
-
-> Should be fixed in the last release, [[done]] --[[Joey]]
diff --git a/doc/bugs/weird_local_clone_confuses.mdwn b/doc/bugs/weird_local_clone_confuses.mdwn
deleted file mode 100644
--- a/doc/bugs/weird_local_clone_confuses.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-See
-<http://www.git.code-experiments.com/blog/2011/01/manage-large-files-with-git-annex-by-joey-hess.html>
-
-If a local repo is cloned with "git clone orig/.git new", then git-annex in
-new cannot see origin. 
-
-the .git/config has "url=/.../orig/.git". Apparently git is ok with that
-weird construction; probably it treats it as a bare git repo. But git-annex
-just sees a directory w/o a .git subdir, and gives up.
-
----
-
-Just tested, and the new support for bare repositories didn't solve this.
-(Because config.bare is not set.)
-
-I think this is not something git-annex should go out of its way to
-support. [[done]]
---[[Joey]] 
-
-Later.. Fixed this after all. --[[Joey]] 
diff --git a/doc/bugs/wget_tarball_over_https_complains.mdwn b/doc/bugs/wget_tarball_over_https_complains.mdwn
deleted file mode 100644
--- a/doc/bugs/wget_tarball_over_https_complains.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-### Please describe the problem.
-Can't download new tarball via wget on remote machine without passing '--no-check-certificate'.
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-greg@rose:~/bin$ wget https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz
---2014-05-14 15:55:59--  https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz
-Resolving downloads.kitenet.net... 107.170.31.195
-Connecting to downloads.kitenet.net|107.170.31.195|:443... connected.
-ERROR: certificate common name "kitenet.net" doesn\'t match requested host name "downloads.kitenet.net".
-To connect to downloads.kitenet.net insecurely, use '--no-check-certificate'.
-"""]]
-
-> [[done]]: Per joey's comment, I'll investigate my broken wget
diff --git a/doc/bugs/whereis_outputs_no_informaiton_for_unlocked_files.mdwn b/doc/bugs/whereis_outputs_no_informaiton_for_unlocked_files.mdwn
--- a/doc/bugs/whereis_outputs_no_informaiton_for_unlocked_files.mdwn
+++ b/doc/bugs/whereis_outputs_no_informaiton_for_unlocked_files.mdwn
@@ -42,3 +42,5 @@
     Linux ... 3.2.0-31-generic #50-Ubuntu SMP Fri Sep 7 16:16:45 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux
 
 Please provide any additional information below.
+
+[[!tag confirmed]]
diff --git a/doc/bugs/windows_fails_test___34__recoverEncode__34__.mdwn b/doc/bugs/windows_fails_test___34__recoverEncode__34__.mdwn
deleted file mode 100644
--- a/doc/bugs/windows_fails_test___34__recoverEncode__34__.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-### Please describe the problem.
-
-My windows install (2013-09-09) fails "quick checks" when running "git annex test".  See below the errors from two seperate runs of the test in two fresh empty directories:
-
-*** Failed! Exception: 'recoverEncode: invalid argument (invalid character)' (after 13 tests): 
-Key {keyName = "\140\DEL\159/\RS'", keyBackendName = "WQACSWJDVY", keySize = Just 6, keyMtime = Just 3}
-prop_idempotent_configEscape
-
-*** Failed! Exception: 'recoverEncode: invalid argument (invalid character)' (after 4 tests): 
-Key {keyName = "\130", keyBackendName = "Y", keySize = Nothing, keyMtime = Nothing}
-prop_idempotent_configEscape
-
-### What steps will reproduce the problem?
-
-create a directory
-cd to it in cmd or Git Bash
-run "git annex test"
-
-
-### What version of git-annex are you using? On what operating system?
-
-OS Name:                   Microsoft Windows 7 Professional (64bit)
-OS Version:                6.1.7601 Service Pack 1 Build 7601
-
-Install Git-1.8.3-preview20130601 (third option to add git and tools to path)
-Install git-annex-installer (2013-09-09)
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-
-# End of transcript or log.
-"""]]
-
-> I've released a fix for this problem. Thanks for reporting! [[done]]
-> --[[Joey]]
diff --git a/doc/bugs/windows_install_failure.mdwn b/doc/bugs/windows_install_failure.mdwn
--- a/doc/bugs/windows_install_failure.mdwn
+++ b/doc/bugs/windows_install_failure.mdwn
@@ -28,3 +28,6 @@
 """]]
 
 [[!meta title="windows installer fails unless run as admin user"]]
+
+> [[dup|done]] of
+> [[git-annex_does_not_install_on_windows_without_admin_rights]] --[[Joey]] 
diff --git a/doc/bugs/windows_port_-_can__39__t_directly_access_files.mdwn b/doc/bugs/windows_port_-_can__39__t_directly_access_files.mdwn
deleted file mode 100644
--- a/doc/bugs/windows_port_-_can__39__t_directly_access_files.mdwn
+++ /dev/null
@@ -1,250 +0,0 @@
-### Please describe the problem.
-Using the windows port of git annex, I'm unable to directly access files that are retrieved from a remote ssh repository. Instead, the file contains a reference to ../.git/annex/objects....
-
-**Update** This appears to be a problem with remote bare repositories only. I was able to get from a remote regular git repository without the stand-in symlinks. The stand-in symlink file gets replaced with the real content on "get" using a non-base repository.
-
-### What steps will reproduce the problem?
-
-[[!format sh """
-** on ssh server **
-
-git init --bare annex.git
-cd annex.git
-git annex init origin
-
-** on windows laptop - add content main repository ** 
-git init annex
-cd annex
-git annex init laptop
-
-git remote add origin ssh://xxxxx/~/annex.git
-echo hello > foo.txt
-git annex add .
-git commit -m "done"
-git annex sync
-git annex copy --to origin
-git annex sync
-git annex whereis foo.txt
-
-** on windows laptop - backup repository **
-
-cd ..
-git init annex.backup
-cd annex.backup
-git annex init "backup"
-git remote add origin ssh://joebo@xxxxx.com/~/annex.git
-git fetch origin
-git merge origin/synced/master
-git annex sync
-git annex get .
-find . | xargs grep hello
-./.git/annex/objects/d91/b11/SHA256E-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc7
-163af34d08286a2e846f6be03.txt/SHA256E-s6--5891b5b522d5df086d0ff0b110fbd9d21bb4fc
-7163af34d08286a2e846f6be03.txt:hello
-
-** updating the file from windows laptop **
-cd ..\annex
-echo hello2 > foo.txt
-git annex add .
-git commit -m "updated"
-git annex sync
-git annex copy --to origin
-git annex sync	
-
-cd ..\annex.backup
-git fetch origin
-git merge origin/synced/master
-get annex sync
-git annex get .
-find . | xargs grep hello2
-./.git/annex/objects/7ed/895/SHA256E-s9--3f70947299d2926028fd0107c4309e65ca33a9a
-e0175fc4bc57792ca17240d18.txt/SHA256E-s9--3f70947299d2926028fd0107c4309e65ca33a9
-ae0175fc4bc57792ca17240d18.txt:hello2
-"""]]
-
-
-
-### What version of git-annex are you using? On what operating system?
-
-	git-annex version: 4.20130601-gc01f842
-	build flags: Pairing Testsuite S3 WebDAV DNS
-	local repository version: 4
-	default repository version: 3
-	supported repository versions: 3 4
-	upgrade supported from repository versions: 2
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-joebo@joebo:~$ sudo rm -rf annex.git
-joebo@joebo:~$ git init --bare annex.git
-Initialized empty Git repository in /home/joebo/annex.git/
-joebo@joebo:~$ cd annex.git
-joebo@joebo:~/annex.git$ git annex init origin
-init origin ok
-
-
-
-C:\Users\joebo>cd annex
-
-C:\Users\joebo\annex>git annex init laptop
-init laptop
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-ok
-(Recording state in git...)
-
-C:\Users\joebo\annex>
-C:\Users\joebo\annex>git remote add origin ssh://joebo@xxxxx.com/~
-cho hello > foo.txt
-
-C:\Users\joebo\annex>git annex add .
-add foo.txt (checksum...) ok
-(Recording state in git...)
-
-C:\Users\joebo\annex>git commit -m "done"
-[master (root-commit) 7f54efa] done
- 1 file changed, 1 insertion(+)
- create mode 120000 foo.txt
-
-C:\Users\joebo\annex>git annex sync
-commit
-ok
-pull origin
-warning: no common commits
-remote: Counting objects: 5, done.
-remote: Compressing objects: 100% (3/3), done.
-remote: Total 5 (delta 1), reused 0 (delta 0)
-Unpacking objects: 100% (5/5), done.
-From ssh://xxxxx.com/~/annex
- * [new branch]      git-annex  -> origin/git-annex
-ok
-(merging origin/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 18, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (12/12), done.
-Writing objects: 100% (16/16), 1.48 KiB, done.
-Total 16 (delta 1), reused 0 (delta 0)
-To ssh://joebo@xxxxx.com/~/annex.git
- * [new branch]      git-annex -> synced/git-annex
- * [new branch]      master -> synced/master
-ok
-
-C:\Users\joebo\annex>git annex copy --to origin
-copy foo.txt (checking origin...) (to origin...)
-foo.txt
-           0 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 67 bytes  received 31 bytes  65.33 bytes/sec
-total size is 0  speedup is 0.00
-ok
-(Recording state in git...)
-
-C:\Users\joebo\annex>git annex sync
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 446 bytes, done.
-Total 5 (delta 1), reused 0 (delta 0)
-To ssh://joebo@xxxxx.com/~/annex.git
-   ed1a701..c4c9cd0  git-annex -> synced/git-annex
-ok
-
-C:\Users\joebo\annex>git annex whereis foo.txt
-whereis foo.txt (2 copies)
-        03573d86-d460-11e2-8500-ebab2910b225 -- origin
-        3b6b60fb-0979-4869-98de-38208182ab92 -- here (laptop)
-ok
-
-
-C:\Users\joebo\annex>cd ..
-
-C:\Users\joebo>git init annex.backup
-Initialized empty Git repository in C:/Users/joebo/annex.backup/.git/
-
-C:\Users\joebo>cd annex.backup
-
-C:\Users\joebo\annex.backup>git annex init "backup"
-init backup
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-ok
-(Recording state in git...)
-
-C:\Users\joebo\annex.backup>git remote add origin ssh://joebo@xxxxx.com/~/anne
-x.git
-
-C:\Users\joebo\annex.backup>git fetch origin
-warning: no common commits
-remote: Counting objects: 25, done.
-remote: Compressing objects: 100% (19/19), done.
-remote: Total 25 (delta 4), reused 0 (delta 0)
-Unpacking objects: 100% (25/25), done.
-From ssh://xxxxx.com/~/annex
- * [new branch]      git-annex  -> origin/git-annex
- * [new branch]      synced/git-annex -> origin/synced/git-annex
- * [new branch]      synced/master -> origin/synced/master
-
-C:\Users\joebo\annex.backup>git merge origin/synced/master
-
-C:\Users\joebo\annex.backup>git annex sync
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 12, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (6/6), done.
-Writing objects: 100% (8/8), 818 bytes, done.
-Total 8 (delta 2), reused 0 (delta 0)
-To ssh://joebo@xxxxx.com/~/annex.git
-   c4c9cd0..f403560  git-annex -> synced/git-annex
-ok
-
-C:\Users\joebo\annex.backup>git annex get .
-get foo.txt (from origin...)
-SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt
-
-           0 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 145 bytes  116.67 bytes/sec
-total size is 0  speedup is 0.00
-ok
-(Recording state in git...)
-
-C:\Users\joebo\annex.backup>cat foo.txt
-.git/annex/objects/fW/Gk/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649
-b934ca495991b7852b855.txt/SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e464
-9b934ca495991b7852b855.txt
-C:\Users\joebo\annex.backup>ls
-foo.txt
-
-
-# End of transcript or log.
-"""]]
-
-> [[done]]; see my comment. --[[Joey]] 
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn
deleted file mode 100644
--- a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn
+++ /dev/null
@@ -1,559 +0,0 @@
-### Please describe the problem.
-
-Using a centralized remote repository, new files that are added to the repository after it's pulled cannot be directly accessed - instead are pulled as symlinks.
-
-The workaround is to create a new remote repository that clones from the source. That repo can pull all files correctly
-
-### What steps will reproduce the problem?
-
-The following script works fine when everything is run on a linux box. If the same script is run on the windows box, it will not show foo2.txt in the repository clone. foo.txt is still valid.
-
-a file, testrepo.sh is set up on the server to simplify the creation of the repo for testing
-
-**testrepo.sh**
-[[!format sh """
-
-rm -rf repo.git
-git init --bare repo.git
-cd repo.git
-git annex init origin
-git annex sync
-
-
-"""]]
-
-**test script**
-[[!format sh """
-
-ssh joebo@xxxxx sh testrepo.sh
-
-
-rm -rf repo
-git init repo
-cd repo
-
-git annex init
-git remote add origin ssh://joebo@xxxxx/~/repo.git
-echo hello > foo.txt
-git annex add .
-git commit -m "initial commit"
-git annex sync
-git annex copy --to origin
-git annex sync
-
-cd ..
-rm -rf repo-bak
-git init repo-bak
-cd repo-bak
-git remote add origin ssh://joebo@xxxxx/~/repo.git
-git fetch origin
-git merge origin/synced/master
-git annex sync
-git annex get .
-cat foo.txt #works just fine!
-
-cd ..
-cd repo
-echo foo2 > foo2.txt
-git annex add .
-git commit -m "another"
-git annex sync
-git annex copy --to origin
-git annex sync
-
-cd ..
-cd repo-bak
-git annex sync
-
-## throws a fastforward error:
-commit
-ok
-pull origin
-remote: Counting objects: 21, done.
-remote: Compressing objects: 100% (14/14), done.
-remote: Total 16 (delta 3), reused 0 (delta 0)
-Unpacking objects: 100% (16/16), done.
-From ssh://xxxx.com/~/repo
-   c5ed8e1..7ea5586  synced/git-annex -> origin/synced/git-annex
-   a8402ae..1a72b3d  synced/master -> origin/synced/master
-ok
-(merging origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 15, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (7/7), done.
-Writing objects: 100% (8/8), 844 bytes, done.
-Total 8 (delta 2), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   7ea5586..5df3c85  git-annex -> synced/git-annex
- ! [rejected]        master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'ssh://joebo@xxx.com/~/repo.git'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-failed
-git-annex: sync: 1 failed
-"""]]
-
-If I try to work around it by merging, then I get the symlink in the file after getting
-
-
-[[!format sh """
-
-C:\joe\backup\repo-bak>git merge origin/synced/master
-Updating f586b6a..fcae7bc
-Fast-forward
- foo2.txt | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 foo2.txt
-
-C:\joe\backup\repo-bak>git annex get foo2.txt
-get foo2.txt (from origin...)
-SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
-
-           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 156 bytes  124.00 bytes/sec
-total size is 7  speedup is 0.04
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
-ece05f.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo-bak>cat foo2.txt
-.git/annex/objects/3V/kM/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd
-78762e80a45f0bbece05f.txt/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5cc
-d78762e80a45f0bbece05f.txt
-
-"""]]
-
-removing the backup repository and starting over works:
-
-[[!format sh """
-
-C:\joe\backup>git init repo-bak
-Initialized empty Git repository in C:/joe/backup/repo-bak/.git/
-
-C:\joe\backup>cd repo-bak
-
-C:\joe\backup\repo-bak>git remote add origin ssh://joebo@xxxx.com/~/repo.git
-
-C:\joe\backup\repo-bak>git fetch origin
-remote: Counting objects: 57, done.
-remote: Compressing objects: 100% (48/48), done.
-remote: Total 57 (delta 20), reused 0 (delta 0)
-Unpacking objects: 100% (57/57), done.
-From ssh://xxxx.com/~/repo
- * [new branch]      git-annex  -> origin/git-annex
- * [new branch]      synced/git-annex -> origin/synced/git-annex
- * [new branch]      synced/master -> origin/synced/master
-
-C:\joe\backup\repo-bak>git merge origin/synced/master
-
-C:\joe\backup\repo-bak>git annex sync
-
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\uuid.log.
-The file will have its original line endings in your working directory.
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 533 bytes, done.
-Total 5 (delta 3), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   5038806..67d6383  git-annex -> synced/git-annex
-ok
-
-C:\joe\backup\repo-bak>git annex get .
-get foo.txt (from origin...)
-SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a87.txt
-
-           8 100%    7.81kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 157 bytes  124.67 bytes/sec
-total size is 8  speedup is 0.04
-ok
-get foo2.txt (from origin...)
-SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
-
-           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 156 bytes  124.00 bytes/sec
-total size is 7  speedup is 0.04
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
-ece05f.txt.log.
-The file will have its original line endings in your working directory.
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\ae4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691c
-d51a87.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo-bak>cat *
-hello
-foo2
-
-C:\joe\backup\repo-bak>ls -lah
-total 5.0k
-drwxr-xr-x    1 jbogner  Administ        0 Jun 15 08:44 .
-drwxr-xr-x   23 jbogner  Administ     4.0k Jun 15 08:43 ..
-drwxr-xr-x    1 jbogner  Administ     4.0k Jun 15 08:44 .git
--rw-r--r--    1 jbogner  Administ        8 Jun 15 08:44 foo.txt
--rw-r--r--    1 jbogner  Administ        7 Jun 15 08:44 foo2.txt
-
-C:\joe\backup\repo-bak>
-
-"""]]
-
-### What version of git-annex are you using? On what operating system?
-
-Windows:
-
-	C:\joe\backup\repo-bak>git annex version
-	git-annex version: 4.20130614-g3a93e24
-	build flags: Pairing Testsuite S3 WebDAV DNS
-	local repository version: 4
-	default repository version: 3
-	supported repository versions: 3 4
-	upgrade supported from repository versions: 2
-
-
-Linux:
-
-        git-annex version: 4.20130531-g5df09b5
-	build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
-
-
-### Please provide any additional information below.
-
-[[!format sh """
-# If you can, paste a complete transcript of the problem occurring here.
-# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
-
-C:\joe\backup>cd repo
-
-C:\joe\backup\repo>git annex init
-init
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\uu
-id.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo>git remote add origin ssh://joebo@xxxx.com/~/repo.git
-
-C:\joe\backup\repo>echo hello  1>foo.txt
-
-C:\joe\backup\repo>git annex add .
-add foo.txt (checksum...) ok
-(Recording state in git...)
-warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\ae
-4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a
-87.txt.log.
-The file will have its original line endings in your working directory.
-
-C:\joe\backup\repo>git commit -m "initial commit"
-[master (root-commit) 47c05ea] initial commit
- 1 file changed, 1 insertion(+)
- create mode 120000 foo.txt
-
-C:\joe\backup\repo>git annex sync
-commit
-ok
-pull origin
-warning: no common commits
-remote: Counting objects: 5, done.
-remote: Compressing objects: 100% (3/3), done.
-remote: Total 5 (delta 1), reused 0 (delta 0)
-Unpacking objects: 100% (5/5), done.
-From ssh://xxxx.com/~/repo
- * [new branch]      git-annex  -> origin/git-annex
-ok
-(merging origin/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 18, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (12/12), done.
-Writing objects: 100% (16/16), 1.40 KiB, done.
-Total 16 (delta 3), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
- * [new branch]      git-annex -> synced/git-annex
- * [new branch]      master -> synced/master
-ok
-
-C:\joe\backup\repo>git annex copy --to origin
-copy foo.txt (checking origin...) (to origin...)
-foo.txt
-           8 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 79 bytes  received 31 bytes  73.33 bytes/sec
-total size is 8  speedup is 0.07
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\ae
-4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a
-87.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo>git annex sync
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 450 bytes, done.
-Total 5 (delta 1), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   bd52e5f..02a0a4a  git-annex -> synced/git-annex
-ok
-
-C:\joe\backup\repo>cd ..
-
-C:\joe\backup>rm -rf repo-bak
-
-C:\joe\backup>git init repo-bak
-Initialized empty Git repository in C:/joe/backup/repo-bak/.git/
-
-C:\joe\backup>cd repo-bak
-
-C:\joe\backup\repo-bak>git remote add origin ssh://joebo@xxxx.com/~/repo.git
-
-C:\joe\backup\repo-bak>git fetch origin
-remote: Counting objects: 25, done.
-remote: Compressing objects: 100% (19/19), done.
-remote: Total 25 (delta 6), reused 0 (delta 0)
-Unpacking objects: 100% (25/25), done.
-From ssh://xxxx.com/~/repo
- * [new branch]      git-annex  -> origin/git-annex
- * [new branch]      synced/git-annex -> origin/synced/git-annex
- * [new branch]      synced/master -> origin/synced/master
-
-C:\joe\backup\repo-bak>git merge origin/synced/master
-
-C:\joe\backup\repo-bak>git annex sync
-
-  Detected a crippled filesystem.
-
-  Enabling direct mode.
-
-  Detected a filesystem without fifo support.
-
-  Disabling ssh connection caching.
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\uuid.log.
-The file will have its original line endings in your working directory.
-(merging origin/git-annex origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 610 bytes, done.
-Total 5 (delta 1), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   02a0a4a..88d19ce  git-annex -> synced/git-annex
-ok
-
-C:\joe\backup\repo-bak>git annex get .
-get foo.txt (from origin...)
-SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a87.txt
-
-           8 100%    7.81kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 157 bytes  124.67 bytes/sec
-total size is 8  speedup is 0.04
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\ae4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691c
-d51a87.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo-bak>cat foo.txt
-hello
-
-C:\joe\backup\repo-bak>cd ..
-
-C:\joe\backup>cd repo
-
-C:\joe\backup\repo>echo foo2  1>foo2.txt
-
-C:\joe\backup\repo>git annex add .
-add foo2.txt (checksum...) ok
-(Recording state in git...)
-warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\fb
-a_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece0
-5f.txt.log.
-The file will have its original line endings in your working directory.
-
-C:\joe\backup\repo>git commit -m "another"
-[master 76a9e44] another
- 1 file changed, 1 insertion(+)
- create mode 120000 foo2.txt
-
-C:\joe\backup\repo>git annex sync
-commit
-ok
-pull origin
-remote: Counting objects: 9, done.
-remote: Compressing objects: 100% (4/4), done.
-remote: Total 5 (delta 1), reused 0 (delta 0)
-Unpacking objects: 100% (5/5), done.
-From ssh://xxxx.com/~/repo
-   02a0a4a..88d19ce  synced/git-annex -> origin/synced/git-annex
-ok
-(merging origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 16, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (10/10), done.
-Writing objects: 100% (11/11), 1.11 KiB, done.
-Total 11 (delta 2), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   88d19ce..f47091a  git-annex -> synced/git-annex
-   47c05ea..76a9e44  master -> synced/master
-ok
-
-C:\joe\backup\repo>git annex copy --to origin
-copy foo.txt (checking origin...) ok
-copy foo2.txt (checking origin...) (to origin...)
-foo2.txt
-           7 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 79 bytes  received 31 bytes  73.33 bytes/sec
-total size is 7  speedup is 0.06
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\fb
-a_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece0
-5f.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo>git annex sync
-commit
-ok
-pull origin
-ok
-push origin
-Counting objects: 9, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (5/5), 477 bytes, done.
-Total 5 (delta 1), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   f47091a..98082cb  git-annex -> synced/git-annex
-ok
-
-C:\joe\backup\repo>cd ..
-
-C:\joe\backup>cd repo-bak
-
-C:\joe\backup\repo-bak>git annex sync
-commit
-ok
-pull origin
-remote: Counting objects: 21, done.
-remote: Compressing objects: 100% (14/14), done.
-remote: Total 16 (delta 4), reused 0 (delta 0)
-Unpacking objects: 100% (16/16), done.
-From ssh://xxxx.com/~/repo
-   88d19ce..98082cb  synced/git-annex -> origin/synced/git-annex
-   47c05ea..76a9e44  synced/master -> origin/synced/master
-ok
-(merging origin/synced/git-annex into git-annex...)
-(Recording state in git...)
-push origin
-Counting objects: 15, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (7/7), done.
-Writing objects: 100% (8/8), 843 bytes, done.
-Total 8 (delta 2), reused 0 (delta 0)
-To ssh://joebo@xxxx.com/~/repo.git
-   98082cb..2537203  git-annex -> synced/git-annex
- ! [rejected]        master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'ssh://joebo@xxxx.com/~/repo.git'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-failed
-git-annex: sync: 1 failed
-
-C:\joe\backup\repo-bak>git annex get foo2.txt
-git-annex: foo2.txt not found
-
-C:\joe\backup\repo-bak>cat foo2.txt
-cat: foo2.txt: No such file or directory
-C:\joe\backup\repo-bak>git pull origin synced/master
-From ssh://xxxx.com/~/repo
- * branch            synced/master -> FETCH_HEAD
-Updating 47c05ea..76a9e44
-Fast-forward
- foo2.txt | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 foo2.txt
-
-C:\joe\backup\repo-bak>git annex get foo2.txt
-get foo2.txt (from origin...)
-SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
-
-           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
-
-sent 30 bytes  received 156 bytes  124.00 bytes/sec
-total size is 7  speedup is 0.04
-ok
-warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
-l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
-ece05f.txt.log.
-The file will have its original line endings in your working directory.
-(Recording state in git...)
-
-C:\joe\backup\repo-bak>cat foo2.txt
-.git/annex/objects/3V/kM/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd
-78762e80a45f0bbece05f.txt/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5cc
-d78762e80a45f0bbece05f.txt
-C:\joe\backup\repo-bak>
-
-
-
-# End of transcript or log.
-"""]]
-
-> Apparently the last of the issues discussed here is fixed.
-> Closing this bug report before it grows a new issue. ;) [[done]] --[[Joey]]
diff --git a/doc/bugs/xdg-user-dir_error.mdwn b/doc/bugs/xdg-user-dir_error.mdwn
deleted file mode 100644
--- a/doc/bugs/xdg-user-dir_error.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-Run *git annex webapp* in Debian Sid with KDE.
-
-It opens the web browser with this error: **Internal Server Error** *xdg-user-dir ["DESKTOP"] exited 127*.
-
-I've tried to changing the xdg-user-dir config with no success.
-
-> This is fixed in my master branch. Workaround: Install the xdg-user-dirs
-> package. [[done]] --[[Joey]]
diff --git a/doc/bugs/xmpp_needs_one_account_per_distinct_repository.mdwn b/doc/bugs/xmpp_needs_one_account_per_distinct_repository.mdwn
deleted file mode 100644
--- a/doc/bugs/xmpp_needs_one_account_per_distinct_repository.mdwn
+++ /dev/null
@@ -1,107 +0,0 @@
-The way [[XMPP pairing|design/assistant/XMPP]] currently works, each
-separate repository needs to use a different XMPP account. If two
-repositories use the same XMPP account, then they will be combined together
-when XMPP pairing takes place.
-
-There are two different UIs for XMPP pairing. While the same protocol
-is running behind the scenes, these UIs should be considered separately.
-
-## Share with your other devices
-
-Here, I think it makes sense to require the user to use the same XMPP
-account on all their devices (otherwise it's pairing with a friend), and
-automatically combine repositories of devices that use the same XMPP
-account.
-
-The UI is pretty clear about this:
-
-	If you have multiple devices, all running git-annex, and using #
-	your Jabber account #{account}, you can configure them to share #
-	your files between themselves.
-
-Doing it this way avoids needing to confirm pair requests coming from the same
-XMPP account. Which means that, for example, you can have a device at home,
-and one at work, and pair them by simply initiating a pair request from one
-to the other. You don't have to travel between home and work to confirm 
-the request.
-
-(Also, when you have a lot of devices, this avoids a combinatorial explosion
-of pair request confirmations.)
-
-The only problem with this is that users who want multiple repositories
-need to find multiple XMPP accounts. However, I'm inclined to think this is
-a reasonable requirement.
-
-## Share with a friend
-
-Suppose that Alice wants to share with Bob. Bob is using the same XMPP
-account for two separate repositories (B1 and B2), that are not
-themselves paired.
-
-When Alice chooses to share with Bob, a XMPP pair request is sent.
-Both of Bob's repositories see it, and both ask him to confirm.
-Bob can choose to only confirm the request in B1, and 
-not in B2. This should work ok.
-
-* The UI for this only says "Pair request received from #{name}",
-  it does not indicate which repository of Alice's is being paired
-  with. This could be improved. If Alice has two repositories as well,
-  she and Bob will want to coordinate pairing the right ones together.
-  Could be fixed by just displaying the description of Alice's repository
-  to Bob.
-
------
-
-Now, suppose that Alice makes a second, distinct repository (A2),
-and chooses to share it with Bob (intending to share with B2). This
-sends an XMPP pair request to both of Bob's repositories.
-
-B1 has already paired with Alice, so it assumes this
-new pair request is from a different device belonging to Alice, and it
-automatically ACKs the pair request. 
-
-The result is that Alice's new A2 repository combines with B1,
-which is already combined with A1. Effectively combining all of A1, A2, B1,
-and B2, unexpectedly. **This is a bug**.
-
-Some possible fixes:
-
-1. Stop auto-accepting pair requests
-   from friends we're already paired with. Require another confirmation.
-2. Or, only auto-accept pair requests from friends we're already paired with
-   when they come from a repository whose UUID we already know. This
-   enhancment to fix #1 makes it easier to build more robust networks of
-   repositories. **done**
-
-Hmm, I don't think those fixes are sufficient. Suppose they're in place.
-Then when Alice shares A2 with Bob, both his repositories will ask him to
-confirm the pair request. He confirms in B2, and pairing proceeds.
-
-But, XMPP git push is broadcast to all clients of an XMPP account.
-So when B2 sends a push, A1 sees it, and happily merges away. The
-repositories still combine!
-
-So, we need another fix:
-
-* Send UUID in XMPP git push protocol messages. Only respond to git push
-  messages from a known UUID, and ignore all others. (XMPP pairing
-  already sends the UUID, so it will be known.) **done**
-
-----
-
-* Alternatively, we could say that the problem is that Bob has two 
-  distinct repositories using the same XMPP account, and try to prevent
-  him from doing that in the first place. 
-   
-  One way to do this would be, when configuring the
-  XMPP account, scan for other repositories using the same account, and
-  don't let it be used unless the user confirms they want to pair them.
-  But, this doesn't seem viable because if the other repository is on
-  another device, which is turned off, this check wouldn't see it.
-
-  Or there could be a warning about account reuse. Doesn't seem likely to
-  be effective.
-
------
-
-> [[done]]. I've put in the fixes around pairing with friends. --[[Joey]]
diff --git a/doc/bugs/yesod-default_is_needed_as_a_dependancy.mdwn b/doc/bugs/yesod-default_is_needed_as_a_dependancy.mdwn
deleted file mode 100644
--- a/doc/bugs/yesod-default_is_needed_as_a_dependancy.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-Seems like there is a needed dependancy, yesod-default is needed on OSX.
-
-<pre>
-Utility/Yesod.hs:10:8:
-    Could not find module `Yesod.Default.Util'
-    Use -v to see a list of the files searched for.
-make: *** [git-annex] Error 1
-</pre>
-
-> Only on OSX apparently. Weird. Added. [[done]] --[[Joey]] 
diff --git a/doc/bugs/yesod-form_missing.mdwn b/doc/bugs/yesod-form_missing.mdwn
deleted file mode 100644
--- a/doc/bugs/yesod-form_missing.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-What steps will reproduce the problem?
-
-build using cabal from a git checkout
-
-What is the expected output? What do you see instead?
-
-successful build; error message is:
-
-Assistant/WebApp/Form.hs:15:8:
-    Could not find module `Yesod.Form.Fields'
-    It is a member of the hidden package `yesod-form-1.2.0'.
-    Perhaps you need to add `yesod-form' to the build-depends in your .cabal file.
-
-
-What version of git-annex are you using? On what operating system?
-
-git checkout commit 90b62db1defdd223294935ec0bbaac883cd20c04 on OS X Lion
-
-Please provide any additional information below.
-
-adding yesod-form to the build depends in git-annex.cabal does indeed fix the problem!
-
-> [[done]] --[[Joey]] 
diff --git a/doc/builds.mdwn b/doc/builds.mdwn
--- a/doc/builds.mdwn
+++ b/doc/builds.mdwn
@@ -16,5 +16,5 @@
 <iframe width=1024 scrolling=no frameborder=0 marginheight=0 marginwidth=0 src="https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/">
 </iframe>
 <h2>Windows</h2>
-<iframe width=1024 height=1024 scrolling=no frameborder=0 marginheight=0 marginwidth=0 src="https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/">
+<a href="https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/">here</a>
 </iframe>
diff --git a/doc/contribute.mdwn b/doc/contribute.mdwn
--- a/doc/contribute.mdwn
+++ b/doc/contribute.mdwn
@@ -17,7 +17,8 @@
 posted asking the submitter for details.
 
 Joey spends a lot of time dealing with this kind of bug triage. If you can
-take the time to pick a bug, try to reproduce it and follow up either
+take the time to pick a bug from the list of
+[[unconfirmed_bugs|bugs/unconfirmed]], try to reproduce it and follow up either
 confirming that the problem exists, or asking the submitter for more info,
 you'll make Joey more productive!
 
diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn
--- a/doc/design/assistant/polls/Android_default_directory.mdwn
+++ b/doc/design/assistant/polls/Android_default_directory.mdwn
@@ -4,4 +4,4 @@
 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 67 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
+[[!poll open=yes expandable=yes 67 "/sdcard/annex" 6 "Whole /sdcard" 7 "DCIM directory (photos and videos only)" 2 "Same as for regular git-annex. ~/annex/"]]
diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn
--- a/doc/design/roadmap.mdwn
+++ b/doc/design/roadmap.mdwn
@@ -11,8 +11,8 @@
 * Month 5 user-driven features and polishing
 * Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]]
 * Month 7 user-driven features and polishing
-* **Month 8 [[!traillink git-remote-daemon]]**
-* Month 9 Brazil!, [[!traillink assistant/sshpassword]]
+* Month 8 [[!traillink git-remote-daemon]]
+* **Month 9 Brazil!, [[!traillink assistant/sshpassword]]**
 * Month 10 get [[assistant/Android]] out of beta
 * Month 11 [[!traillink assistant/chunks]], [[!traillink assistant/deltas]], [[!traillink assistant/gpgkeys]] (pick 2?)
 * Month 12 [[!traillink assistant/telehash]]
diff --git a/doc/devblog/day_167__growing_the_community_of_git-annex_contributors.mdwn b/doc/devblog/day_167__growing_the_community_of_git-annex_contributors.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_167__growing_the_community_of_git-annex_contributors.mdwn
@@ -0,0 +1,11 @@
+Released git-annex 5.20140517 today. The changelog for this release
+is very unusual, because it's full of contributions from others! There are
+as many patches from others in this release as git-annex got in the first
+entire two years of its existence.
+
+I'd like to keep that going. Also, I could really use help triaging bug
+reports right now. So I have updated the **[[contribute]]** page with more
+info about easy ways to contribute to git-annex. If you read this devblog,
+you're an ideal contributor, and you don't need to know how to write
+haskell either.. So take a [[look at the page|contribute]] and see if
+you can help out.
diff --git a/doc/devblog/day_168__backlog_continued.mdwn b/doc/devblog/day_168__backlog_continued.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_168__backlog_continued.mdwn
@@ -0,0 +1,16 @@
+Worked on triaging several bugs. Fixed an easy one, which involved the
+assistant choosing the wrong path to a repository that has multiple
+remotes. After today, backlog is down to 43, nearly pre-Brazil levels.
+
+It seems that git-remote-gcrypt [[never quite worked on OSX|bugs/remote_gcrypt_based_repos_and_conflicting_uuids]].
+It looked like it did, but a bug prevented anything being pushed to the remote.
+Tracked down and fixed that bug.
+
+This evening, getting back to working on the armel autobuilder setup
+using propellor. The autobuilder will use a pair of docker containers, one
+armel and a companion amd64, and their quite complex setup will be *almost*
+fully automated (except for the haskell library patching part).
+
+----
+
+Today's work was sponsored by Mica Semrick.
diff --git a/doc/devblog/day_169-171__juggling.mdwn b/doc/devblog/day_169-171__juggling.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_169-171__juggling.mdwn
@@ -0,0 +1,14 @@
+Keeping lots of things going these past few days..
+
+* Rebootstrapping the armel autobuilder with propellor. 
+  Some qemu instability and the need to update haskell
+  library patches meant this took a lot of hand-holding. Finally got a
+  working setup today.
+* Designing and ordering new git-annex stickers on clear viynl backing;
+  have put off sending those to campaign contributors for too long.
+* Added a new feature to the webapp: It now remembers the ssh remotes
+  that it sets up, and makes it easy to enable them elsewhere, the same
+  as other sorts of remotes. Had a very pleasant surprise building this,
+  when I was able to reuse all the UI code for enabling rsync and gcrypt
+  remotes. I think this will be a useful feature as we transition away
+  from XMPP.
diff --git a/doc/devblog/day_172__.mdwn b/doc/devblog/day_172__.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_172__.mdwn
@@ -0,0 +1,7 @@
+Working on moving the android autobuilder to Docker & Propellor, which will
+finish containerizing all the autobuilds that I run. Updated
+ghc-android to use the released ghc 7.8.2, which will make it build more
+reliably. 
+
+Also did bug triage. Bugs are now divided into [[bugs/confirmed]]
+and [[bugs/unconfirmed]] categories.
diff --git a/doc/devblog/day_173-174__android_rebootstrap.mdwn b/doc/devblog/day_173-174__android_rebootstrap.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_173-174__android_rebootstrap.mdwn
@@ -0,0 +1,8 @@
+With some help from Sören, have been redoing the android build environment
+for git-annex. This included making propellor put it in a docker container,
+which was easy. But then much struggling with annoying stuff like getting
+the gnutls linking to work, and working around some dependency issues on
+hackage that make cabal's dependency resolver melt down.
+Finally succeeded after much more time than I had wanted to spend on this.
+
+[[!meta date="Mon May 27 16:36:40 JEST 2014"]]
diff --git a/doc/devblog/day_175__encoding_day.mdwn b/doc/devblog/day_175__encoding_day.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_175__encoding_day.mdwn
@@ -0,0 +1,20 @@
+These themed days are inaverdent, but it happened again: Nearly everything
+done today had to do with encoding issues.
+
+The big news is that it turned out everything written to files in the
+git-annex branch had unicode characters truncated to 8 bits. Now fixed so
+you should always get out the same thing you put in, no matter what
+encoding you use (but please use utf8). This affected things like storing
+repository descriptions, but worse, it affected metadata. (Also preferred
+content expressions, I suppose.)
+
+With that fixed, there are still 7 source files left that use Char8 libraries.
+There used to be more; nearly every use of those is a bug. I looked over
+the remaining uses of it, and there might be a problem with Creds using it.
+I should probably make a push to stamp out all remaining uses of Char8.
+
+Other encoding bugs were less reproducible.
+
+And just now, Sören made some progress on
+[[bugs/Bootstrap3_icons_missing_on_Android]] ... and my current theory
+is this is actually caused by an encoding issue too.
diff --git a/doc/devblog/day_176__mostly_a_day_off.mdwn b/doc/devblog/day_176__mostly_a_day_off.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/devblog/day_176__mostly_a_day_off.mdwn
@@ -0,0 +1,8 @@
+Got a handle on the Android webapp static file problems (no, they were not
+really encoding problems!), and hopefully
+that's all fixed now. Also, only 3 modules use Char8 now. And updated the
+git-annex backport. That's all I did today.
+
+Meanwhile, a complete [[tips/ZSH_completion]] has been contributed by
+Schnouki. And, Ben Gamari sent in a patch moving from the deprecated 
+MonadCatchIO-transformers library to the exceptions library.
diff --git a/doc/forum/Fast_cloning_a_repo_initially.mdwn b/doc/forum/Fast_cloning_a_repo_initially.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/Fast_cloning_a_repo_initially.mdwn
@@ -0,0 +1,3 @@
+Is there any fast way to rsync a direct-mode (assistant) git/annex directory from one machine to another?
+
+Scenario: I was already using unison to synchronize 40GB between my desktop and laptop. I've added git annex to my desktop, but is there a way to bootstrap on my laptop without needing to re-transfer all the files? (I don't have a .git on my laptop yet but all the files are there already.)
diff --git a/doc/forum/How_to_debug_failing_sync.mdwn b/doc/forum/How_to_debug_failing_sync.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/How_to_debug_failing_sync.mdwn
@@ -0,0 +1,5 @@
+I've got a remote I setup while connected to my home network that is no longer syncing when I'm on the same network. I'm not sure how to debug the problem. Any tips?
+
+I will say that when I edit the repository in the assistant, the url it gives for the "git repository location at" field looks incorrect. It's got an extra "git-annex-" prepended to the hostname. I'm not sure how to alter that.
+
+I'm using version 5.20140517~bpo70+1, from the wheezy backports.
diff --git a/doc/forum/Manual_commit_message_in_direct_mode.mdwn b/doc/forum/Manual_commit_message_in_direct_mode.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/Manual_commit_message_in_direct_mode.mdwn
@@ -0,0 +1,3 @@
+I am just returning to git-annex after some time. The last time I was using it, the [[/todo/direct_mode_guard]] was not yet in place, and I could supply my own commit messages even in a direct mode repository using `git commit`. Now that the guard is in place, is there a built-in way to provide a commit message that will be used instead of "git-annex automatic sync" by `git annex sync`? 
+
+I have tried doing a manual commit with `git --git-dir=/path/to/local/.git --work-tree=/path/to/local -c core.bare=false commit -m 'Manual Commit Message'`, and it seems to work. Does this do the same thing as the part of `git annex sync` that commits any outstanding changes before syncing with remotes?
diff --git a/doc/forum/Sync_only_what_is_not_available_from_my_central_git_repo.mdwn b/doc/forum/Sync_only_what_is_not_available_from_my_central_git_repo.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/Sync_only_what_is_not_available_from_my_central_git_repo.mdwn
@@ -0,0 +1,7 @@
+I work in a distributed startup.  We have a master repository on GitHub.  At the office we have modern hunky Linux desktops (seriously more powerful than any of our laptops).
+
+I (and others) have hard deadlines at the end of the day (typically child commitments).  If I leave from a meeting or brainstorming session without having pushed all of my work into the cloud then I cannot continue working from home.  This is because our office is behind multiple levels of NAT over which we have no control.  Hence I am unable to remote into my machine in order to push work up to GitHub or scp it to my laptop.
+
+Is there a way to get git-annex to sync only files that do not correspond to git objects available from our GitHub repository?  Because our source tree is quite large (2.5GB including tests and test data) I would not want git-annex to sync the entire tree.  And when I checkout a different branch I would not want git-annex to sync all changes between the previously checked-out branch and the new branch.  Rather I would like git-annex to discard any previously synced objects, note the identity of the new branch and the values of all files (object) not available from the upstream state of that branch on GitHub.
+
+Thanks in advance for any suggestions.
diff --git a/doc/forum/__34__Preseeding__34___a_special_remote.mdwn b/doc/forum/__34__Preseeding__34___a_special_remote.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/__34__Preseeding__34___a_special_remote.mdwn
@@ -0,0 +1,5 @@
+I have a remote repository that I have yet to add as a remote into git-annex, but which already contains data that I want git-annex to manage. I already know what the SHA256 hashes and sizes of all the files are, and I can arrange them to match what git-annex will expect.
+
+Is there a way that I can tell git-annex about the presence of the data, to save me having to download and re-upload everything, in a way that is safe? What I want seems to be similar to "git annex reinject" but for special remotes (and I'll take care of the renaming), but I don't see anything in the manpage that looks likely.
+
+I can quite easily create and commit the symlinks with correctly predicted names in my master branch. Will git-annex will treat these correctly?
diff --git a/doc/forum/pgp_issue_in_log_file_after_upgrade_to_5.20140517.mdwn b/doc/forum/pgp_issue_in_log_file_after_upgrade_to_5.20140517.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/pgp_issue_in_log_file_after_upgrade_to_5.20140517.mdwn
@@ -0,0 +1,13 @@
+    [2014-05-18 22:38:21 SAST] main: starting assistant version 5.20140517-g0aed6d9
+    Already up-to-date.
+    
+    (scanning...) [2014-05-18 22:38:22 SAST] Watcher: Performing startup scan
+    gpg: WARNING: unsafe permissions on homedir `/var/folders/m6/zkd11n111m38ff37zbtgq0lr0000gp/T/git-annex-gpg.tmp.0'
+    gpg: keyring `/Applications/git-annex.app/Contents/MacOS/trustedkeys.gpg' created
+    gpg: Signature made Sun May 18 04:16:11 2014 SAST using DSA key ID XXXXXXXX
+    gpg: Can't check signature: public key not found
+    (started...) 
+
+And still facing:
+
+    git-annex-remote-skydrive is not installed in PATH (/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/usr/bin:/bin:/usr/sbin:/sbin)
diff --git a/doc/forum/ssh_vs_cifs__47__webdav.mdwn b/doc/forum/ssh_vs_cifs__47__webdav.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/forum/ssh_vs_cifs__47__webdav.mdwn
@@ -0,0 +1,7 @@
+Hello,
+
+I'm new to git-annex and I would like to know which is the best method to deploy it for my case. I would like to have a central repo in my Synology NAS but with files to be able to browse files (not a bare repo). This repo will not have remotes configured. The mobile clients will use the central repo to exchange files. I thinks that this setup is totally valid x-D. Now my question is more related to how to share the repo in the Synology NAS. I am considering to use cifs/webdav for LAN/WAN access to the repo or SSH for LAN/WAN access. Which is the recommended setup? Which is the most optimum setup in terms of bandwidth or cpu usage (the CPU of my synology NAS is ARM). Thanks in advance and for this great piece of software!
+
+Best regards,
+
+Christian
diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn
--- a/doc/install/Android.mdwn
+++ b/doc/install/Android.mdwn
@@ -27,9 +27,9 @@
 git-annex can be built from source for Android.
 
 1. Run `standalone/android/buildchroot` as root (requires debootstrap).
-   This builds a chroot with an `androidbuilder` user.
+   This builds a chroot with an `builder` user.
    The rest of the build will run in this chroot as that user.
-2. Then run `standalone/android/install-haskell-packages`
+2. In the chroot, run `standalone/android/install-haskell-packages`
    Note that this will break from time to time as new versions of packages
    are released, and the patches it applies have to be updated when
    this happens.
diff --git a/doc/install/Fedora/comment_7_4832d271dcc63a6cd1c40fe38ad5e367._comment b/doc/install/Fedora/comment_7_4832d271dcc63a6cd1c40fe38ad5e367._comment
new file mode 100644
--- /dev/null
+++ b/doc/install/Fedora/comment_7_4832d271dcc63a6cd1c40fe38ad5e367._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI"
+ nickname="Michele"
+ subject="building fails on fedora 19"
+ date="2014-05-26T15:31:10Z"
+ content="""
+latest version (git-annex-5.20140517) during cabal install git-annex I encounter this:
+
+[[!format sh \"\"\"
+[266 of 457] Compiling Remote.WebDAV    ( Remote/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV.o )
+
+Remote/WebDAV.hs:380:32:
+    Constructor `StatusCodeException' should have 3 arguments, but has been given 2
+    In the pattern: StatusCodeException s _
+    In an equation for `matchStatusCodeException':
+        matchStatusCodeException want (StatusCodeException s _)
+          | s == want = Just ()
+          | otherwise = Nothing
+Failed to install git-annex-5.20140517
+cabal: Error: some packages failed to install:
+git-annex-5.20140517 failed during the building phase. The exception was:
+ExitFailure 1
+\"\"\"]]
+"""]]
diff --git a/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment b/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment
new file mode 100644
--- /dev/null
+++ b/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.176"
+ subject="comment 8"
+ date="2014-05-27T16:08:14Z"
+ content="""
+@Michele, you seem to have an old version of the haskell DAV library installed. The simple solutions is probably `cabal install DAV` to upgrade to the new one.
+
+(The complex solution is to edit the file and copy the line 2 lines above the error, or fix the ifdefs somehow to work with whatever combination of versions of DAV and http-client or http-conduit you have installed.)
+"""]]
diff --git a/doc/news/version_5.20140405.mdwn b/doc/news/version_5.20140405.mdwn
deleted file mode 100644
--- a/doc/news/version_5.20140405.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-git-annex 5.20140405 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * git-annex-shell: Added notifychanges command.
-   * Improve display of dbus notifications. Thanks, Johan Kiviniemi.
-   * Fix nautilus script installation to not crash when the nautilus script dir
-     does not exist. Instead, only install scripts when the directory already
-     exists."""]]
diff --git a/doc/news/version_5.20140529.mdwn b/doc/news/version_5.20140529.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/news/version_5.20140529.mdwn
@@ -0,0 +1,25 @@
+git-annex 5.20140529 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix encoding of data written to git-annex branch. Avoid truncating
+     unicode characters to 8 bits. Allow any encoding to be used, as with
+     filenames (but utf8 is the sane choice). Affects metadata and repository
+     descriptions, and preferred content expressions.
+   * assistant: When there are multiple remotes giving different ways
+     to access the same repository, honor remote cost settings and use
+     the cheapest available.
+   * webapp: More robust startup when annex directory is not a git repo.
+   * initremote/enableremote: Basic support for using with regular git remotes;
+     initremote stores the location of an already existing git remote,
+     and enableremote setups up a remote using its stored location.
+   * webapp: Support for enabling known git repositories on ssh servers.
+     The repository must have been added using initremote.
+   * webapp: When setting up a ssh remote, record it using initremote,
+     so that it can be easily enabled elsewhere.
+   * webapp: When setting up a ssh remote, if the user inputs ~/foo,
+     normalize that to foo, since it's in the home directory by default.
+   * Use exceptions in place of deprecated MonadCatchIO-transformers
+     Thanks, Ben Gamari.
+   * android: Run busybox install with -s, since some versions of Android
+     prohibit making hard links.
+   * Android webapp: Fix EvilSplicer bugs that mangled the css files,
+     preventing icons from displaying, and also slightly broke the js files."""]]
diff --git a/doc/special_remotes/webdav.mdwn b/doc/special_remotes/webdav.mdwn
--- a/doc/special_remotes/webdav.mdwn
+++ b/doc/special_remotes/webdav.mdwn
@@ -39,4 +39,4 @@
 
 Setup example:
 
-	# WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb keyid=joey@kitenet.net
+	# WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunksize=75mb keyid=joey@kitenet.net
diff --git a/doc/tips/ZSH_completion.mdwn b/doc/tips/ZSH_completion.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/tips/ZSH_completion.mdwn
@@ -0,0 +1,13 @@
+ZSH users, here's some good news: after 2 years of silence, the completion function for git-annex has been updated. It now supports *all* git-annex commands (as of 5.20140517) and has many improvements for completing arguments, remotes, groups, and backends.
+
+To install it:
+
+1. make sure your have Python 3 installed (as `python3` somewhere in your `$PATH`; tested with 3.4, should work with 3.2+)
+2. get it from [GitHub](https://github.com/Schnouki/git-annex-zsh-completion)
+3. copy `_git-annex` to somewhere in your `$fpath` (I use `$HOME/.config/zsh/completion`)
+4. run `autoload -U path/to/_git-annex`
+5. type `git annex <TAB>`
+
+This is very far from being perfect, but it's (IMHO) better than nothing. If you have any issue or suggestion, please [tell me](https://github.com/Schnouki/git-annex-zsh-completion/issues)!
+
+Many thanks to Frank Terbeck and Valentin Haenel, the original authors of this completion function ([source](https://github.com/esc/git-annex-zsh-completion)).
diff --git a/doc/tips/skydriveannex/comment_10_c3465b5587548dea56b80b32cd66d653._comment b/doc/tips/skydriveannex/comment_10_c3465b5587548dea56b80b32cd66d653._comment
new file mode 100644
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_10_c3465b5587548dea56b80b32cd66d653._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="Syncing not working :-/"
+ date="2014-05-17T19:52:33Z"
+ content="""
+Error log says:
+
+    git-annex-remote-skydrive is not installed in PATH (/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/Applications/git-annex.app/Contents/MacOS/bundle:/usr/bin:/bin:/usr/sbin:/sbin)
+
+BUT I did a symlink, I even did 2 to 2 different locations that are in my path:
+
+    cd /Users/ovi/skydriveannex/
+    ln -sf `pwd`/git-annex-remote-skydrive /usr/bin/git-annex-remote-skydrive
+    ln -sf `pwd`/git-annex-remote-skydrive /opt/local/bin/git-annex-remote-skydrive
+"""]]
diff --git a/doc/tips/skydriveannex/comment_7_7fcd9c6b5e2a3fc7b753eeac06164036._comment b/doc/tips/skydriveannex/comment_7_7fcd9c6b5e2a3fc7b753eeac06164036._comment
new file mode 100644
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_7_7fcd9c6b5e2a3fc7b753eeac06164036._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="making some progress"
+ date="2014-05-17T19:08:16Z"
+ content="""
+Figured out how to solve that:
+    which python
+    /opt/local/bin/python
+    shiny-2:git-annex ovi$ sudo ln -s `which python` /usr/bin/python2
+
+The URL opened in my browser, I allowed access, waited for the redirect, copied the URL, hit the next problem:
+
+    OAUTH='https://login.live.com/oauth20_desktop.srf?code=hidden_on_purpose' git annex initremote skydrive type=external externaltype=skydrive encryption=shared folder=git-annex
+initremote skydrive (encryption setup) (shared cipher)  21:06:27 [skydriveannex-0.2.1] <module> : 'Starting'
+     21:06:27 [skydriveannex-0.2.1] login : 'EXCEPTION api.auth_get_token:ImportError('No module named requests',)'
+    git-annex: You need to set OAUTH environment variables and folder and encryption parameters when running initremote.
+"""]]
diff --git a/doc/tips/skydriveannex/comment_8_856eaa1b167033aede91a937099c7833._comment b/doc/tips/skydriveannex/comment_8_856eaa1b167033aede91a937099c7833._comment
new file mode 100644
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_8_856eaa1b167033aede91a937099c7833._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="Done! Success!"
+ date="2014-05-17T19:23:06Z"
+ content="""
+realized I need requests. to install I need pip.
+
+    sudo port install py27-pip
+
+    pip install requests
+
+    login : 'EXCEPTION api.auth_get_token:ImportError('No module named six',)' 
+
+    pip install six
+
+Finished! Seems to be working and I can see this repository in my assistant!
+"""]]
diff --git a/doc/tips/skydriveannex/comment_9_cfcf767a1bf07957b76d7f44ef8a9500._comment b/doc/tips/skydriveannex/comment_9_cfcf767a1bf07957b76d7f44ef8a9500._comment
new file mode 100644
--- /dev/null
+++ b/doc/tips/skydriveannex/comment_9_cfcf767a1bf07957b76d7f44ef8a9500._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="QUESTION"
+ date="2014-05-17T19:29:37Z"
+ content="""
+Wondering about this:
+
+    encryption=shared
+
+I read what it means: http://git-annex.branchable.com/encryption/ 
+
+But now I'm wondering how the repos which I set up via the assistant have been setup. when setting them up I only had the choice between \"encrypt all files\" and \"disable encryption\" so how can I check what settings my other repos are using?
+"""]]
diff --git a/doc/todo/Allow_syncing_only_selected_branches.mdwn b/doc/todo/Allow_syncing_only_selected_branches.mdwn
deleted file mode 100644
--- a/doc/todo/Allow_syncing_only_selected_branches.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-It seems that currently, syncing will result in every branch winding
-up everywhere within the network of git annex nodes. It would be great
-if one could keep some branches purely local.
-
-The «fetch» part of «sync» seems to respect the fetch refspec in the
-git config, but the push part seems to always push everything.
-
-> [[done]]
diff --git a/doc/todo/Build_for_Synology_DSM.mdwn b/doc/todo/Build_for_Synology_DSM.mdwn
deleted file mode 100644
--- a/doc/todo/Build_for_Synology_DSM.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-It would be wonderful if a pre-built package would be available for Synology NAS. Basically, this is an ARM-based Linux. It has most of the required shell commands either out of the box or easily available (through ipkg). But I think it would be difficult to install the Haskell compiler and all the required modules, so it would probably be better to cross-compile targeting ARM.
-
-> [[done]]; the standalone armel tarball has now been tested working on
-> Synology. --[[Joey]]
diff --git a/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn b/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn
deleted file mode 100644
--- a/doc/todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Especially on Mac OSX (and Windows, and maybe Android), it would be great to be able to check in the webapp if an upgrade is available. A deeper integration with these OS would be even better: for example on Mac OSX, an icon on the status bar list available upgrades for some programs, including LibreOffice and others which are not installed by default.
-
-Also, it would be great to be able to download and install git-annex upgrades directly from the webapp.
-
-> comprehensively [[done]]; [[design/assistant/upgrading]] --[[Joey]]
diff --git a/doc/todo/Chunks_support_in_all_special_remotes.mdwn b/doc/todo/Chunks_support_in_all_special_remotes.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/todo/Chunks_support_in_all_special_remotes.mdwn
@@ -0,0 +1,5 @@
+The special remote `directory` support files split in chunks, other special remotes do not.
+
+Support for chunks is useful, for example, to be able to upload large files over slow, unreliable connections or to minimize the amount of data to be sent when only part of a big file has been changed.
+
+Couldn't the code used to split, checksum and reconstruct the files in the `directory` remote be used also in all the other special remotes?
diff --git a/doc/todo/Limit_file_revision_history.mdwn b/doc/todo/Limit_file_revision_history.mdwn
deleted file mode 100644
--- a/doc/todo/Limit_file_revision_history.mdwn
+++ /dev/null
@@ -1,117 +0,0 @@
-Hi, I am assuming to use git-annex-assistant for two usecases, but I would like to ask about the options or planed roadmap for dropped/removed files from the repository.
-
-Usecases:
-
-1. sync working directory between laptop, home computer, work komputer
-2. archive functionality for my photograps
-
-Both usecases have one common factor. Some files might become obsolate and
-in long time frame nobody is interested to keep their revisions. Let's
-assume photographs. Usuall workflow I take is to import all photograps to
-filesystem, then assess (select) the good ones I want to keep and then
-process them what ever way.
-
-Problem with git-annex(-assistant) I have is that it start to revision all
-of the files at the time they are added to directory. This is welcome at
-first but might be an issue if you are used to put 80% of the size of your
-imported files to trash.
-
-I am aware of what git-annex is not. I have been reading documentation for
-"git-annex drop" and "unused" options including forums. I do understand
-that I am actually able to delete all revisions of the file if I will drop
-it, remove it and if I will run git annex unused 1..###. (on all synced
-repositories).
-
-I actually miss the option to have above process automated/replicated to the other synced repositories.
-
-I would formulate the 'use case' requirements for git-annex as:
-
-* command to drop an file including revisions from all annex repositories?
-  (for example like moving a file to /trash folder) that will schedulle
-  it's deletition)
-* option to keep like max. 10 last revisions of the file?
-* option to keep only previous revisions if younger than 6 months from now?
-
-Finally, how to specify a feature request for git-annex?
-
-> By moving it here ;-) --[[Joey]] 
-
-> So, let's spec out a design.
-> 
-> * Add preferred content terminal to configure whether a repository wants
->   to hang on to unused content. Simply `unused`.
->   (It cannot include a timestamp, because there's
->   no way repos can agree on about when a key became unused.) **done**
-> * In order to quickly match that terminal, the Annex monad will need
->   to keep a Set of unused Keys. This should only be loaded on demand.
->   **done**  
->   NB: There is some potential for a great many unused Keys to cause
->   memory usage to balloon.
-> * Client repositories will end their preferred content with
->   `and (not unused)`. Transfer repositories too, because typically
->   only client repos connect to them, and so otherwise unused files
->   would build up there. Backup repos would want unused files. I
->   think that archive repos would too. **done**
-> * Make the assistant check for unused files periodically. Exactly
->   how often may need to be tuned, but once per day seems reasonable
->   for most repos. Note that the assistant could also notice on the
->   fly when files are removed and mark their keys as unused if that was
->   the last associated file. (Only currently possible in direct mode.)
->   **done**
-> * After scanning for unused files, it makes sense for the
->   assistant to queue transfers of unused files to any remotes that
->   do want them (eg, backup remotes). If the files can successfully be
->   sent to a remote, that will lead to them being dropped locally as
->   they're not wanted.
-> * Add a git config setting like annex.expireunused=7d. This causes
->   *deletion* of unused files after the specified time period if they are
->   not able to be moved to a repo that wants them.
->   (The default should be annex.expireunused=false.)
-> * How to detect how long a file has been unused? We can't look at the
->   time stamp of the object; we could use the mtime of the .map file,
->   that that's direct mode only and may be replaced with a database
->   later. Seems best to just keep a unused log file with timestamps.
->   **done**
-> * After the assistant scans for unused files, if annex.expireunused
->   is not set, and there is some significant quantity of unused files
->   (eg, more than 1000, or more than 1 gb, or more than the amount of
->   remaining free disk space),
->   it can pop up a webapp alert asking to configure it. **done**
-> * Webapp interface to configure annex.expireunused. Reasonable values
->   are no expiring, or any number of days. **done**
-> 
-> [[done]] This does not cover every use case that was requested.
-> But I don't see a cheap way to ensure it keeps eg the past 10 versions of
-> a file. I guess that if you care about that, you leave
-> annex.expireunused=false, and set up a backup repository where the unused
-> files will be moved to.
-> 
-> Note that since the assistant uses direct mode by default, old versions
-> of modififed files are not guaranteed to be retained. But they very well
-> might be. For example, if a file is replicated to 2 clients, and one
-> client directly edits it, or deletes it, it loses the old version,
-> but the other client will still be storing that old version.
-> 
-> ## Stability analysis for unused in preferred content expressions
-> 
-> This is tricky, because two repos that are otherwise entirely
-> in sync may have differing opinons about whether a key is unused,
-> depending on when each last scanned for unused keys.
-> 
-> So, this preferred content terminal is *not stable*.
-> It may be possible to write preferred content expressions 
-> that constantly moved such keys around without reaching a steady state.
-> 
-> Example:
-> 
-> A and B are clients directly connected, and both also connected
-> to BACKUP.
-> 
-> A deletes F. B syncs with A, and runs unused check; decides F
-> is unused. B sends F to BACKUP. B will then think A doesn't want F,
-> and will drop F from A. Next time A runs a full transfer scan, it will
-> *not* find F (because the file was deleted!). So it won't get F back from
-> BACKUP.
-> 
-> So, it looks like the fact that unused files are not going to be
-> looked for on the full transfer scan seems to make this work out ok.
diff --git a/doc/todo/Move_ssh_config_to___126____47__ssh__47__git-annex__47__config.mdwn b/doc/todo/Move_ssh_config_to___126____47__ssh__47__git-annex__47__config.mdwn
--- a/doc/todo/Move_ssh_config_to___126____47__ssh__47__git-annex__47__config.mdwn
+++ b/doc/todo/Move_ssh_config_to___126____47__ssh__47__git-annex__47__config.mdwn
@@ -5,3 +5,5 @@
 I'm using git-annex 4.20130601 on a Debian Testing/Unstable/Experimental mix.
 
 [[!tag design/assistant]]
+
+[[wontfix]]
diff --git a/doc/todo/Option_for_browser_to_launch_webapp_with.mdwn b/doc/todo/Option_for_browser_to_launch_webapp_with.mdwn
deleted file mode 100644
--- a/doc/todo/Option_for_browser_to_launch_webapp_with.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Firefox is my default browser, but as we all know, it doesn't load quickly.  If I don't have Firefox running but I want to access the git-annex webapp, I'd rather launch the webapp in some small, quick browser like QupZilla than wait for Firefox to load.
-
-Could git-annex have a setting, maybe a "webapp --browser" option and/or a setting in the config file, to specify the browser to launch?
-
-> git-annex uses the standard `git config web.browser` if you set it.
-> [[done]]
-> --[[Joey]]
diff --git a/doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn b/doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn
deleted file mode 100644
--- a/doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-A failure during "make test" should be signalled to the caller by means of
-a non-zero exit code. Without that signal, it's very hard to run the
-regression test suite in an automated fashion.
-
-> git-annex used to have a Makefile that ignored make test exit status,
-> but that was fixed in commit dab5bddc64ab4ad479a1104748c15d194e138847,
-> in October 6th. [[done]] --[[Joey]] 
diff --git a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
deleted file mode 100644
--- a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-Git-annex doesn't compile with the latest version of monad-control. Would it be hard to support that new version?
-
-> I have been waiting for it to land in Debian before trying to 
-> deal with its changes.
-> 
-> There is now a branch in git called `new-monad-control` that will build
-> with the new monad-control. --[[Joey]]
-
->> Now merged to master. [[done]] --[[Joey]]
diff --git a/doc/todo/S3.mdwn b/doc/todo/S3.mdwn
deleted file mode 100644
--- a/doc/todo/S3.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-Support Amazon S3 as a file storage backend.
-
-There's a haskell library that looks good. Not yet in Debian.
-
-Multiple ways of using S3 are possible. Currently implemented as 
-a special type of git remote.
-
-Before this can be close, I need to fix:
-
-## encryption
-
-TODO
-
-## unused checking
-
-One problem is `git annex unused`. Currently it only looks at the local
-repository, not remotes. But if something is dropped from the local repo,
-and you forget to drop it from S3, cruft can build up there.
-
-This could be fixed by adding a hook to list all keys present in a remote.
-Then unused could scan remotes for keys, and if they were not used locally,
-offer the possibility to drop them from the remote.
-
-[[done]]
diff --git a/doc/todo/Sync_repo_names__63__.mdwn b/doc/todo/Sync_repo_names__63__.mdwn
deleted file mode 100644
--- a/doc/todo/Sync_repo_names__63__.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-It's very confusing to me that the same repo viewed from different client systems can have different names and descriptions.  This implies that making changes to a remote repo from one system only affects how that system sees the repo, but it seems to affect how the entire git-annex "pair" or "network of repos" sees it.
-
-I think it would be good if the names and descriptions of repos were synced across clients.
-
-> The descriptions of repositories are synced. (They're stored in git-annex:uuid.log)
-> 
-> git allows for the same repository to be referred to using as many different remote names as you want to set up. git-annex inherits this,
-> and I can't see this changing; there are very good reasons for remotes to
-> have this flexability. [[done]]
-> --[[Joey]] 
diff --git a/doc/todo/Use_bitcoin-mining_ASICs_for_hashing__63__.mdwn b/doc/todo/Use_bitcoin-mining_ASICs_for_hashing__63__.mdwn
deleted file mode 100644
--- a/doc/todo/Use_bitcoin-mining_ASICs_for_hashing__63__.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-This is just an idea, and I have no idea if it would work (that's why I'm asking):
-
-**Would it be possible to use ASICs made for Bitcoin mining inside git-annex to offload the hashing of files?**
-
-I got the idea, because I have two RaspberryPis here: 
-
-- one runs my git-annex archive. It is really slow at hashing, so I resorted to using the WORM backend
-- another one runs 2 old-ish ASIC miners. They are just barely "profitable" right now, so in a few months they will be obsolete
-
-Both devices to some kind of `SHA256`. I have a feeling this is either extremely easy or extremely complicated to do… :)
-
-> git-annex uses binaries such as `sha256sum` for hashing large files (large is
-> currently hardcoded as bigger than 1MB). If you insert a binary with the same
-> interface as `sha256sum` into your `$PATH`, git-annex will automatically use
-> it. If you want to use ASIC hashing even for small files, you need to tweak
-> `Backend/Hash.hs`. --[[HelmutGrohne]]
-
->> [[done]] --[[Joey]]
diff --git a/doc/todo/add_--exclude_option_to_git_annex_find.mdwn b/doc/todo/add_--exclude_option_to_git_annex_find.mdwn
deleted file mode 100644
--- a/doc/todo/add_--exclude_option_to_git_annex_find.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Seems pretty self-explanatory.
-
-> This was already implemented, the --exclude option can be used
-> for find as well as most any other subcommand. --[[Joey]] [[done]]
diff --git a/doc/todo/add_-all_option.mdwn b/doc/todo/add_-all_option.mdwn
deleted file mode 100644
--- a/doc/todo/add_-all_option.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-`--all` would make git-annex operate on either every key with content
-present (or in some cases like `get` and `copy --from` on 
-every keys with content not present).
-
-This would be useful when a repository has a history with deleted files
-whose content you want to keep (so you're not using `dropunused`).
-Or when you have a lot of branches and just want to be able to fsck
-every file referenced in any branch (or indeed, any file referenced in any
-ref). It could also be useful (or even a
-good default) in a bare repository.
-
-A problem with the idea is that `.gitattributes` values for keys not
-currently in the tree would not be available (without horrific anounts of
-grubbing thru history to find where/when the key used to exist). So
-`numcopies` set via `.gitattributes` would not work. This would be a
-particular problem for `drop` and for `--auto`.
-
---[[Joey]]
-
-> [[done]]. The .gitattributes problem was solved simply by not
-> supporting `drop --all`. `--auto` also cannot be mixed with --all for
-> similar reasons. --[[Joey]] 
diff --git a/doc/todo/add_a_git_backend.mdwn b/doc/todo/add_a_git_backend.mdwn
deleted file mode 100644
--- a/doc/todo/add_a_git_backend.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-There should be a backend where the file content is stored.. in a git
-repository!
-
-This way, you know your annexed content is safe & versioned, but you only
-have to deal with the pain of git with large files in one place, and can
-use all of git-annex's features everywhere else.
-
-> Speaking as a future user, do very, very much want. -- RichiH
-
->> Might also be interesting to use `bup` in the git backend, to work
->> around git's big file issues there. So git-annex would pull data out
->> of the git backend using bup. --[[Joey]] 
-
->>> Very much so. Generally speaking, having one or more versioned storage back-ends with current data in the local annexes sounds incredibly useful. Still being able to get at old data in via the back-end and/or making offline backups of the full history are excellent use cases. -- RichiH
-
-[[done]], the bup special remote type is written! --[[Joey]] 
-
-> Yay! -- RichiH
diff --git a/doc/todo/add_an_icon_for_the_.desktop_file.mdwn b/doc/todo/add_an_icon_for_the_.desktop_file.mdwn
deleted file mode 100644
--- a/doc/todo/add_an_icon_for_the_.desktop_file.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Maybe add the icon /usr/share/doc/git-annex/html/logo.svg to the .desktp file.
-
-> [[done]] long ago.. --[[Joey]] 
diff --git a/doc/todo/add_metadata_to_annexed_files.mdwn b/doc/todo/add_metadata_to_annexed_files.mdwn
deleted file mode 100644
--- a/doc/todo/add_metadata_to_annexed_files.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-I would like to attach metadata to annexed files (objects) without
-cluttering the workdir with files containing this metadata. A common use
-case would be to add titles to my photo collection that could than end up
-in a generated photo album.
-
-Depending on the implementation it might also be possible to use the metadata facility for a threaded commenting system.
-
-The first question is whether the metadata is attached to the objects and
-thus shared by all paths pointing to the same data object or to paths in
-the worktree. I've no preference here at this point.
-
-> This is [[done]]; see [[design/metadata]].
-> The metadata is attached to objects, not to files.
-> --[[Joey]] 
diff --git a/doc/todo/assistant_git_sync_laddering.mdwn b/doc/todo/assistant_git_sync_laddering.mdwn
deleted file mode 100644
--- a/doc/todo/assistant_git_sync_laddering.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-When the [[design/assistant]] is running on a pair of remotes, I've seen
-them get out of sync, such that every pull and merge results in a conflict,
-that then has to be auto-resolved. 
-
-This seems similar to the laddering problem described in this old bug:
-[[bugs/making_annex-merge_try_a_fast-forward]]
-
---[[Joey]]
-
-Think I've fixed this. [[done]] --[[Joey]]
diff --git a/doc/todo/assistant_smarter_archive_directory_handling.mdwn b/doc/todo/assistant_smarter_archive_directory_handling.mdwn
deleted file mode 100644
--- a/doc/todo/assistant_smarter_archive_directory_handling.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-Client repos do not want files in archive directories. This can turn
-out to be confusing to users who are using archive directories for their
-own purposes and not aware of this special case in the assistant. It can
-seem like the assistant is failing to sync their files.
-
-I thought, first, that it should have a checkbox to enable the archive
-directory behavior.
-
-However, I think I have a better idea. Change the preferred content
-expression for clients, so they want files in archive directories, *until*
-those files land in an archive.
-
-This way, only users who set up an archive repo get this behavior. And they
-asked for it by setting up that repo!
-
-Also, the new behavior will mean that files in archive directories still
-propigate around to clients. Consider this topology:
-
-	client A ---- client B ---- archive
-
-If a file is created in client A, and moved to an archive directory before
-it syncs to B, it will never get to the archive, and will continue wasting
-space on A. With the new behavior, A and B serve as effectively, transfer
-repositories for archived content.
-
-Something vaguely like this should work as the preferred content
-expression for the clients:
-
-	exclude=archive/* or (include=archive/* and (not (copies=archive:1 or copies=smallarchive:1)))
-
-> [[done]] --[[Joey]]
diff --git a/doc/todo/assistant_threaded_runtime.mdwn b/doc/todo/assistant_threaded_runtime.mdwn
deleted file mode 100644
--- a/doc/todo/assistant_threaded_runtime.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-The [[design/assistant]] would be better if git-annex used ghc's threaded
-runtime (`ghc -threaded`).
-
-Currently, whenever the assistant code runs some external command, all
-threads are blocked waiting for it to finish.
-
-For transfers, the assistant works around this problem by forking separate
-upload processes, and not waiting on them until it sees an indication that
-they have finished the transfer. While this works, it's messy.. threaded
-would be better.
-
-When pulling, pushing, and merging, the assistant runs external git
-commands, and this does block all other threads. The threaded runtime would
-really help here.
-
-[[done]]; the assistant now builds with the threaded runtime.
-Some work still remains to run certian long-running external git commands
-in their own threads to prevent them blocking things, but that is easy to
-do, now. --[[Joey]] 
-
----
-
-Currently, git-annex seems unstable when built with the threaded runtime.
-The test suite tends to hang when testing add. `git-annex` occasionally
-hangs, apparently in a futex lock. This is not the assistant hanging, and
-git-annex does not otherwise use threads, so this is surprising. --[[Joey]]
-
-> I've spent a lot of time debugging this, and trying to fix it, in the
-> "threaded" branch. There are still deadlocks. --[[Joey]]
-
->> Fixed, by switching from `System.Cmd.Utils` to `System.Process`
->> --[[Joey]] 
-
----
-
-It would be possible to not use the threaded runtime. Instead, we could
-have a child process pool, with associated continuations to run after a
-child process finishes. Then periodically do a nonblocking waitpid on each
-process in the pool in turn (waiting for any child could break anything not
-using the pool!). This is probably a last resort...
diff --git a/doc/todo/auto_remotes.mdwn b/doc/todo/auto_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/auto_remotes.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-It should be possible for clones to learn about how to contact
-each other without remotes needing to always be explicitly set
-up. Say that `.git-annex/remote.log` is maintained by git-annex
-to contain:
-
-	UUID hostname URI
-
-The URI comes from configured remotes and maybe from 
-`file://$(pwd)`, or even `ssh://$(hostname -f)`
-for the current repo. This format will merge without
-conflicts or data loss.
-
-Then when content is belived to be in a UUID, and no
-configured remote has it, the remote.log can be consulted and
-URIs that look likely tried. (file:// ones if the hostname
-is the same (or maybe always -- a removable drive might tend
-to be mounted at the same location on different hosts),
-otherwise ssh:// ones.)
-
-Question: When should git-annex update the remote.log? 
-(If not just on init.) Whenever it reads in a repo's remotes?
-
-> This sounds useful and the log should be updated every time any remote is being accessed. A counter or timestamp (yes, distributed times may be wrong/different) could be used to auto-prune old entries via a global and per-remote config setting. -- RichiH
-
----
-
-I no longer think I'd use this myself, I find that my repositories quickly
-grow the paths I actually use, somewhat organically. Unofficial paths
-across university quads come to mind. [[done]] --[[Joey]] 
diff --git a/doc/todo/auto_remotes/discussion.mdwn b/doc/todo/auto_remotes/discussion.mdwn
deleted file mode 100644
--- a/doc/todo/auto_remotes/discussion.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Remotes log should probably be stored in ".git/annex/remote.log"
-instead of ".git-annex/remote.log" to prevent leaking credentials.
-
-> The idea is to distribute the info between repositories, which is
-> why it'd go in `.git-annex`. Of course that does mean that repository
-> location information would be included, and if that'd not desirable
-> this feature would need to be turned off. --[[Joey]] 
diff --git a/doc/todo/automatic_bookkeeping_watch_command.mdwn b/doc/todo/automatic_bookkeeping_watch_command.mdwn
deleted file mode 100644
--- a/doc/todo/automatic_bookkeeping_watch_command.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-A "git annex watch" command would help make git-annex usable by users who
-don't know how to use git, or don't want to bother typing the git commands. 
-It would run, in the background, watching via inotify for changes, and
-automatically annexing new files, etc.
-
-The blue sky goal would be something automated like dropbox, except fully
-distributed. All files put into the repository would propagate out
-to all the other clones of it, as network links allow. Note that while
-dropbox allows modifying files, git-annex freezes them upon creation,
-so this would not be 100% equivalent to dropbox. --[[Joey]]
-
-This is a big project with its own [[design pages|design/assistant]].
-
-> [[done]].. at least, we have a watch command an an assistant, which
-> is still being developed. --[[Joey]] 
diff --git a/doc/todo/avoid_unnecessary_union_merges.mdwn b/doc/todo/avoid_unnecessary_union_merges.mdwn
deleted file mode 100644
--- a/doc/todo/avoid_unnecessary_union_merges.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-Some commands cause a union merge unnecessarily. For example, `git annex add`
-modifies the location log, which first requires reading the current log (if
-any), which triggers a merge.
-
-Would be good to avoid these unnecessary union merges. First because it's
-faster and second because it avoids a possible delay when a user might
-ctrl-c and leave the repo in an inconsistent state. In the case of an add,
-the file will be in the annex, but no location log will exist for it (fsck
-fixes that).
-
-It may be that all that's needed is to modify Annex.Branch.change
-to read the current value, without merging. Then commands like `get`, that
-query the branch, will still cause merges, and commands like `add` that
-only modify it, will not. Note that for a command like `get`, the merge
-occurs before it has done anything, so ctrl-c should not be a problem
-there.
-
-This is a delicate change, I need to take care.. --[[Joey]]
-
-> [[done]] (assuming I didn't miss any cases where this is not safe!) --[[Joey]] 
diff --git a/doc/todo/backendSHA1.mdwn b/doc/todo/backendSHA1.mdwn
deleted file mode 100644
--- a/doc/todo/backendSHA1.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-This backend is not finished.
-
-In particular, while files can be added using it, git-annex will not notice
-when their content changes, and will not create a new key for the new sha1
-of the net content.
-
-[[done]]; use unlock subcommand and commit changes with git
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
deleted file mode 100644
--- a/doc/todo/branching.mdwn
+++ /dev/null
@@ -1,159 +0,0 @@
-[[done]] !!!
-
-The use of `.git-annex` to store logs means that if a repo has branches 
-and the user switched between them, git-annex will see different logs in
-the different branches, and so may miss info about what remotes have which
-files (though it can re-learn). 
-
-An alternative would be to store the log data directly in the git repo
-as `pristine-tar` does. Problem with that approach is that git won't merge
-conflicting changes to log files if they are not in the currently checked
-out branch.
-
-It would be possible to use a branch with a tree like this, to avoid
-conflicts:
-
-key/uuid/time/status
-
-As long as new files are only added, and old timestamped files deleted,
-there would be no conflicts.
-
-A related problem though is the size of the tree objects git needs to
-commit. Having the logs in a separate branch doesn't help with that.
-As more keys are added, the tree object size will increase, and git will
-take longer and longer to commit, and use more space. One way to deal with
-this is simply by splitting the logs among subdirectories. Git then can
-reuse trees for most directories. (Check: Does it still have to build
-dup trees in memory?)
-
-Another approach would be to have git-annex *delete* old logs. Keep logs
-for the currently available files, or something like that. If other log
-info is needed, look back through history to find the first occurance of a
-log. Maybe even look at other branches -- so if the logs were on master,
-a new empty branch could be made and git-annex would still know where to
-get keys in that branch. 
-
-Would have to be careful about conflicts when deleting and bringing back
-files with the same name. And would need to avoid expensive searching thru
-all history to try to find an old log file.
-
-## fleshed out proposal
-
-Let's use one branch per uuid, named git-annex/$UUID.
-
-- I came to realize this would be a good idea when thinking about how
-  to upgrade. Each individual annex will be upgraded independantly,
-  so each will want to make a branch, and if the branches aren't distinct,
-  they will merge conflict for sure.
-- TODO: What will need to be done to git to make it push/pull these new
-  branches?
-- A given repo only ever writes to its UUID branch. So no conflicts.
-  - **problem**: git annex move needs to update log info for other repos!
-    (possibly solvable by having git-annex-shell update the log info
-    when content is moved using it)
-- (BTW, UUIDs probably don't compress well, and this reduces the bloat of having
-  them repeated lots of times in the tree.)
-- Per UUID branches mean that if it wants to find a file's location
-  among configured remotes, it can examine only their branches, if
-  desired.
-- It's important that the per-repo branches propigate beyond immediate
-  remotes. If there is a central bare repo, that means push --all. Without
-  one, it means that when repo B pulls from A, and then C pulls from B,
-  C needs to get A's branch -- which means that B should have a tracking
-  branch for A's branch.
-
-In the branch, only one file is needed. Call it locationlog. git-annex
-can cache location log changes and write them all to locationlog in
-a single git operation on shutdown.
-
-- TODO: what if it's ctrl-c'd with changes pending? Perhaps it should
-  collect them to .git/annex/locationlog, and inject that file on shutdown?
-- This will be less overhead than the current staging of all the log files.
-
-The log is not appended to, so in git we have a series of commits each of
-which replaces the log's entire contens.
-
-To find locations of a key, all (or all relevant) branches need to be
-examined, looking backward through the history of each until a log
-with a indication of the presense/absense of the key is found.
-
-- This will be less expensive for files that have recently been added
-  or transfered.
-- It could get pretty slow when digging deeper.
-- Only 3 places in git-annex will be affected by any slowdown: move --from,
-  get and drop. (Update: Now also unused, whereis, fsck) 
-
-## alternate
-
-As above, but use a single git-annex branch, and keep the per-UUID
-info in their own log files. Hope that git can auto-merge as long as
-each observing repo only writes to its own files. (Well, it can, but for
-non-fast-forward merges, the git-annex branch would need to be checked out,
-which is problimatic.)
-
-Use filenames like:
-
-	<observing uuid>/<location uuid>
-
-That allows one repo to record another's state when doing a
-`move`.
-
-## outside the box approach
-
-If the problem is limited to only that the `.git-annex/` files make
-branching difficult (and not to the related problem that commits to them
-and having them in the tree are sorta annoying), then a simple approach
-would be to have git-annex look in other branches for location log info
-too.
-
-The problem would then be that any locationlog lookup would need to look in
-all other branches (any branch could have more current info after all),
-which could get expensive.
-
-## way outside the box approach
-
-Another approach I have been mulling over is keeping the log file
-branch checked out in .git/annex/logs/ -- this would be a checkout of a git
-repository inside a git repository, using "git fake bare" techniques. This
-would solve the merge problem, since git auto merge could be used. It would
-still mean all the log files are on-disk, which annoys some. It would
-require some tighter integration with git, so that after a pull, the log
-repo is updated with the data pulled. --[[Joey]] 
-
-> Seems I can't use git fake bare exactly. Instead, the best option
-> seems to be `git clone --shared` to make a clone that uses
-> `.git/annex/logs/.git` to hold its index etc, but (mostly) uses
-> objects from the main repo. There would be some bloat,
-> as commits to the logs made in there would not be shared with the main
-> repo. Using `GIT_OBJECT_DIRECTORY` might be a way to avoid that bloat.
-
-## notes
-
-Another approach could be to use git-notes. It supports merging branches
-of notes, with union merge strategy (a hook would have to do this after
-a pull, it's not done automatically). 
-
-Problem: Notes are usually attached to git
-objects, and there are no git objects corresponding to git-annex keys.
-
-Problem: Notes are not normally copied when cloning.
-
-------
-
-## elminating the merge problem
-
-Most of the above options are complicated by the problem of how to merge
-changes from remotes. It should be possible to deal with the merge
-problem generically. Something like this:
-
-* We have a local branch `B`.
-* For remotes, there are also `origin/B`, `otherremote/B`, etc.
-* To merge two branches `B` and `foo/B`, construct a merge commit that
-  makes each file have all lines that were in either version of the file,
-  with duplicates removed (probably). Do this without checking out a tree.
-  -- now implemented as git-union-merge
-* As a `post-merge` hook, merge `*/B` into `B`. This will ensure `B`
-  is always up-to-date after a pull from a remote.
-* When pushing to a remote, nothing need to be done, except ensure
-  `B` is either successfully pushed, or the push fails (and a pull needs to
-  be done to get the remote's changes merged into `B`).
diff --git a/doc/todo/checkout.mdwn b/doc/todo/checkout.mdwn
deleted file mode 100644
--- a/doc/todo/checkout.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-The checkout subcommand replaces the symlink that normally points at a
-file's content, with a copy of the file. Once you've checked a file out,
-you can edit it, and `git commit` it. On commit, git-annex will detect
-if the file has been changed, and if it has, `add` its content to the
-annex.
-
-> Internally, this will need to store the original symlink to the file, in 
-> `.git/annex/checkedout/$filename`.
-> 
-> * git-annex uncheckout moves that back
-> * git-annex pre-commit hook checks each file being committed to see if
->   it has a symlink there, and if so, removes the symlink and adds the new
->   content to the annex. 
-> 
-> And it seems the file content should be copied, not moved or hard linked:
-> 
-> * Makes sure other annexes can find it if transferring it from
->   this annex.
-> * Ensures it's always available for uncheckout.
-> * Avoids the last copy of a file's content being lost when
->   the checked out file is modified.
-
-[[done]]
diff --git a/doc/todo/direct_mode_guard.mdwn b/doc/todo/direct_mode_guard.mdwn
deleted file mode 100644
--- a/doc/todo/direct_mode_guard.mdwn
+++ /dev/null
@@ -1,105 +0,0 @@
-Currently [[/direct_mode]] allows the user to point many normally safe
-git commands at his foot and pull the trigger. At LCA2013, a git-annex
-user suggested modifying direct mode to make this impossible.
-
-One way to do it would be to move the .git directory. Instead, make there
-be a .git-annex directory in direct mode repositories. git-annex would know
-how to use it, and would be extended to support all known safe git
-commands, passing parameters through, and in some cases verifying them.
-
-So, for example, `git annex commit` would run `git commit --git-dir=.git-annex`
-
-However, `git annex commit -a` would refuse to run, or even do something
-intelligent that does not involve staging every direct mode file.
-
-----
-
-One source of problems here is that there is some overlap between git-annex
-and git commands. Ie, `git annex add` cannot be a passthrough for `git
-add`. The git wrapper could instead be another program, or it could be
-something like `git annex git add`
-
---[[Joey]]
-
-----
-
-Or, no git wrapper could be provided. Limit the commands to only git-annex
-commands. This should be all that is needed to manage a direct mode
-repository simply, and if the user is doing something complicated that
-needs git access, they can set `GIT_DIR=.git-annex` and be careful not to
-shoot off their foot. (Or can just switch to indirect mode!)
-
-This wins on simplicity, and if it's the wrong choice a git wrapper
-can be added later. --[[Joey]]
-
----
-
-Implementation: Pretty simple really. Already did the hard lifting to
-support `GIT_DIR`, so only need to override the default git directory
-in direct mode when that's not set to `.git-annex`.
-
-A few things hardcode ".git", including Assistant.Threads.Watcher.ignored
-and `Seek.withPathContents`, and parts of `Git.Construct`.
-
----
-
-Transition: git-annex should detect when it's in a direct mode repository
-with a .git directory and no .git-annex directory, and transparently
-do the move to transition to the new scheme. (And remember that `git annex
-indirect` needs to move it back.)
-
-# alternative approach: move index
-
-Rather than moving .git, maybe move .git/index?
-
-This would cause git to think that all files in the tree were deleted.
-So git commit -a would make a commit that removes them from git history.
-But, the files in the work tree are not touched by this.
-
-Also, git checkout, git merge, and other things that manipulate the work
-tree refuse to do anything if they'd change a file that they think is
-untracked.
-
-Hmm, this does't solve the user accidentially running git add on an annexed
-file; the whole file still gets added.
-
-# alternative approach: fake bare repo
-
-Set core.bare to true.  This prevents all work tree operations, 
-so prevents any foot shooting. It still lets the user run commands like
-git log, even on files in the tree, and git fetch, and push, and git
-config, etc.
-
-Even better, it integrates with other tools, like `mr`, so they know
-it's a git repo.
-
-This seems really promising. But of course, git-annex has its own set of
-behaviors in a bare repo, so will need to recognise that this repo is not
-really bare, and avoid them.
-
-> [[done]]!!  --[[Joey]]
-
-(Git may also have some bare repo behaviors that are unwanted. One example
-is that git allows pushes to the current branch in a bare repo, 
-even when `receive.denyCurrentBranch` is set.)
-
-> This is indeed a problem. Indeed, `git annex sync` successfully
-> pushes changes to the master branch of a fake bare direct mode repo.
-> 
-> And then, syncing in the repo that was pushed to causes the changes
-> that were pushed to the master branch to get reverted! This happens
-> because sync commits; commit sees that files are staged in index
-> differing from the (pushed) master, and commits the "changes"
-> which revert it.
-> 
-> Could fix this using an update hook, to reject the updated of the master
-> branch. However, won't work on crippled filesystems! (No +x bit)
-> 
-> Could make git annex sync detect this. It could reset the master
-> branch to the last one committed, before committing. Seems very racy
-> and hard to get right!
->
-> Could make direct mode operate on a different branch, like
-> `annex/direct/master` rather than `master`. Avoid pushing to that
-> branch (`git annex sync` can map back from it to `master` and push there
-> instead). A bit clumsy, but works.
diff --git a/doc/todo/dumb_plaindir_remote___40__e.g._for_NAS_mounts__41__.mdwn b/doc/todo/dumb_plaindir_remote___40__e.g._for_NAS_mounts__41__.mdwn
deleted file mode 100644
--- a/doc/todo/dumb_plaindir_remote___40__e.g._for_NAS_mounts__41__.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-I've an external USB hard disc attached to my (fritzbox) router that is only accessible through SMB/CIFS. I'd like have all my annexed files on this drive in kind of direct-mode so that I can also access the files without git-annex.
-
-I tried to put a direct-mode repo on the drive but this is painfully slow. The git-annex process than runs on my desktop and accesses the repo over SMB over the slow fritzbox over USB.
-
-I'd wish that git-annex could be told to just use a (mounted) folder as a direct-mode remote.
-
-> [[done]]; dup. --[[Joey]] 
diff --git a/doc/todo/exclude_files_on_a_given_remote.mdwn b/doc/todo/exclude_files_on_a_given_remote.mdwn
deleted file mode 100644
--- a/doc/todo/exclude_files_on_a_given_remote.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-Say I have some files on remote A. But I'm away from it, and transferring
-files from B to C. I'd like to avoid transferring any files I already have
-on A. 
-
-Something like:
-
-	git annex copy --to C --exclude-on A
-
-This would not contact A, just use its cached location log info.
-
-I suppose I might also sometime want to only act on files that are
-thought/known to be on A.
-
-	git annex drop --only-on A
-
---[[Joey]] 
-
-[[done]]
diff --git a/doc/todo/faster_gnupg_cipher.mdwn b/doc/todo/faster_gnupg_cipher.mdwn
deleted file mode 100644
--- a/doc/todo/faster_gnupg_cipher.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-Apparently newer gnupg has support for hardware-accelerated AES-NI. It
-would be good to have an option to use that. I also wonder if using the
-same symmetric key for many files presents a security issues (and whether
-using GPG keys directly would be more secure).
-
-> [[done]]; you can now use encryption=pubkey when setting up a special
-> remote to use pure public keys without the hybrid symmetric key scheme.
-> Which you choose is up to you. Also,  annex.gnupg-options can configure
-> the ciphers used. --[[Joey]]
diff --git a/doc/todo/faster_rsync_remotes.mdwn b/doc/todo/faster_rsync_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/faster_rsync_remotes.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Using an rsync remote is currently very slow when there are a lot of files, since rsync appears to be called for each file copied.  It would be awesome if each call to rsync was amortized to copy many files; rsync is very good at copying many small files quickly.
-
-> [[done]]; bug submitter was apparently not using a version 
-> with rsync connection caching. --[[Joey]]
diff --git a/doc/todo/file_copy_progress_bar.mdwn b/doc/todo/file_copy_progress_bar.mdwn
deleted file mode 100644
--- a/doc/todo/file_copy_progress_bar.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Find a way to copy a file with a progress bar, while still preserving
-stat. Easiest way might be to use pv and fix up the permissions etc
-after?
-
-[[done]]
diff --git a/doc/todo/fsck.mdwn b/doc/todo/fsck.mdwn
deleted file mode 100644
--- a/doc/todo/fsck.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-add a git annex fsck that finds keys that have no referring file
-
-(done)
-
-* Need per-backend fsck support. sha1 can checksum all files in the annex.
-  WORM can check filesize.
-
-* Both can check that annex.numcopies is satisfied. Probably only
-  querying the locationlog, not doing an online verification.
-
-[[done]]
diff --git a/doc/todo/fsck_special_remotes.mdwn b/doc/todo/fsck_special_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/fsck_special_remotes.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-`git annex fsck --from remote`
-
-Basically, this needs to receive each file in turn from the remote, to a
-temp file, and then run the existing fsck code on it. Could be quite
-expensive, but sometimes you really want to check.
-
-An unencrypted directory special remote could be optimised, by not actually
-copying the file, just dropping a symlink, etc.
-
-The WORM backend doesn't care about file content, so it would be nice to
-avoid transferring the content at all, and only send the size.
-
-> [[done]] --[[Joey]] 
diff --git a/doc/todo/git-annex-shell.mdwn b/doc/todo/git-annex-shell.mdwn
deleted file mode 100644
--- a/doc/todo/git-annex-shell.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-[[done]]
-
-I've been considering adding a `git-annex-shell` command. This would
-be similar to `git-shell` (and in fact would pass unknown commands off to
-`git-shell`).
-
-## Reasons
-
-* Allows locking down an account to only be able to use git-annex (and
-  git).
-* Avoids needing to construct complex shell commands to run on the remote
-  system. (Mostly already avoided by the plumbing level commands.)
-* Could possibly allow multiple things to be done with one ssh connection
-  in future.
-* Allows expanding `~` and `~user` in repopath on the remote system.
diff --git a/doc/todo/git-annex_ignores_GIT__95__SSH.mdwn b/doc/todo/git-annex_ignores_GIT__95__SSH.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/todo/git-annex_ignores_GIT__95__SSH.mdwn
@@ -0,0 +1,39 @@
+### Please describe the problem.
+
+git uses environment variable GIT_SSH to determine SSH client.
+
+I set it to plink.exe because I extensively use pageant infrastructure and do NOT want to have 2 systems lying around.
+
+Unfortunately git-annex seems to ignore that.
+
+Even worse, it results in unpredicted behavior because the git part works (e.g. clone) whereas annex/rsync does not resulting in half-ok repositories without meaningful error messages.
+
+It only becomes evident when ssh.exe in the git repository is deleted.
+
+### What steps will reproduce the problem?
+
+Set %GIT_SSH% and remove ssh.exe
+
+You will get
+
+     git-annex: ssh: createProcess: does not exist (No such file or directory)
+     failed
+     git-annex: drop: 1 failed
+
+### What version of git-annex are you using? On what operating system?
+
+Windows 8,
+
+     $ git annex version
+     git-annex version: 5.20140411-gda795e0
+     build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feeds Quvi TDFA CryptoHash
+     key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+     remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+     local repository version: 5
+     supported repository version: 5
+     upgrade supported from repository versions: 2 3 4
+
+
+### Please provide any additional information below.
+
+
diff --git a/doc/todo/git-annex_unused_eats_memory.mdwn b/doc/todo/git-annex_unused_eats_memory.mdwn
deleted file mode 100644
--- a/doc/todo/git-annex_unused_eats_memory.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-`git-annex unused` has to compare large sets of data
-(all keys with content present in the repository,
-with all keys used by files in the repository), and so
-uses more memory than git-annex typically needs.
-
-It used to be a lot worse (hundreds of megabytes).
-
-Now it only needs enough memory to store a Set of all Keys that currently
-have content in the annex. On a lightly populated repository, it runs in
-quite low memory use (like 8 mb) even if the git repo has 100 thousand
-files. On a repository with lots of file contents, it will use more.
-
-Still, I would like to reduce this to a purely constant memory use,
-as running in constant memory no matter the repo size is a git-annex design
-goal.
-
-One idea is to use a bloom filter. 
-For example, construct a bloom filter of all keys used by files in
-the repository. Then for each key with content present, check if it's
-in the bloom filter. Since there can be false positives, this might
-miss finding some unused keys. The probability/size of filter
-could be tunable.
-
-> Fixed in `bloom` branch in git. --[[Joey]] 
->> [[done]]! --[[Joey]] 
-
-Another way might be to scan the git log for files that got removed
-or changed what key they pointed to. Correlate with keys with content
-currently present in the repository (possibly using a bloom filter again),
-and that would yield a shortlist of keys that are probably not used. 
-Then scan thru all files in the repo to make sure that none point to keys
-on the shortlist.
diff --git a/doc/todo/gitolite_and_gitosis_support.mdwn b/doc/todo/gitolite_and_gitosis_support.mdwn
deleted file mode 100644
--- a/doc/todo/gitolite_and_gitosis_support.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-gitosis and gitolite should support git-annex being used to send/receive
-files from the repositories they manage. Users with read-only access
-could only get files, while users with write access could also put and drop
-files.
-
-Doing this right requires modifying both programs, to add [[git-annex-shell]]
-to the list of things they can run, and only allow through appropriate
-git-annex-shell subcommands to read-only users.
-
-I have posted an RFC for modifying gitolite to the
-[gitolite mailing list](http://groups.google.com/group/gitolite?lnk=srg).
-
-> I have not developed a patch yet, but all that git-annex needs is a way
-> to ssh to the server and run the git-annex-shell command there.
-> git-annex-shell is very similar to git-shell. So, one way to enable
-> it is simply to set GL_ADC_PATH to a directory containing git-annex-shell.
-> 
-> But, that's not optimal, since git-annex-shell will send off receive-pack
-> commands to git, which would bypass gitolite's permissions checking.
-> Also, it makes sense to limit readonly users to only download, not
-> upload/delete files from git-annex. Instead, I suggest adding something
-> like this to gitolite's config:
- 
-	# If set, users with W access can write file contents into the git-annex,
-	# and users with R access can read file contents from the git-annex.
-	$GL_GIT_ANNEX = 0;
-
-> If this makes sense, I'm sure I can put a patch together for your
-> review. It would involve modifying gl-auth-command so it knows how
-> to run git-annex-shell, and how to parse out the "verb" from a
-> git-annex-shell command line, and modifying R_COMMANDS and W_COMMANDS.
-
-As I don't write python, someone else is needed to work on gitosis.
---[[Joey]] 
-
-> [[done]]; support for gitolite is in its `pu` branch, and some changes
-> made to git-annefor gitolite is in its `pu` branch, and some changes
-> made to git-annex. Word is gitosis is not being maintained so I won't
-> worry about try to support it. --[[Joey]] 
diff --git a/doc/todo/gitrm.mdwn b/doc/todo/gitrm.mdwn
deleted file mode 100644
--- a/doc/todo/gitrm.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-how to handle git rm file? (should try to drop keys that have no
-referring file, if it seems safe..)
-
-[[done]] -- I think that git annex unused and dropunused are the best
-solution to this.
diff --git a/doc/todo/http_git_annex_404_retry.mdwn b/doc/todo/http_git_annex_404_retry.mdwn
deleted file mode 100644
--- a/doc/todo/http_git_annex_404_retry.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-A repository like http://annex.debconf.org/debconf-share/ has a git repo
-published via http. When getting files from such a repo, git-annex tries
-two urls. One url would be used by a bare repo, and the other by a non-bare
-repo. (This is due to the directory hashing change.) Result is every file
-download from a non-bare http repo starts with a 404 and then it retries
-with the right url.
-
-Since git-annex already downloads the .git/config to find the uuid of the
-http repo, it could also look at it to see if the repo is bare. If not,
-set a flag, and try the two urls in reverse order, which would almost
-always avoid this 404 problem.
-
-(The real solution is probably to flag day and get rid of the old-style
-directory hashing, but that's been discussed elsewhere.)
-
---[[Joey]]
-
-[[done]]
diff --git a/doc/todo/http_headers.mdwn b/doc/todo/http_headers.mdwn
deleted file mode 100644
--- a/doc/todo/http_headers.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-The IA would find it useful to be able to control the http headers
-git-annex get, addurl, etc uses. This will allow setting cookies, for
-example.
-
-* annex-web-headers=blah 
-* Perhaps also annex-web-headers-command=blah
-
-[[done]]
diff --git a/doc/todo/immutable_annexed_files.mdwn b/doc/todo/immutable_annexed_files.mdwn
deleted file mode 100644
--- a/doc/todo/immutable_annexed_files.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-> josh: Do you do anything in git-annex to try to make the files immutable?
-> For instance, removing write permission, or even chattr?
-> joey: I don't, but that's a very good idea
-> josh: Oh, I just thought of another slightly crazy but handy idea.
-> josh: I'd hate to run into a program which somehow followed the symlink and then did an unlink to replace the file.
-> josh: To break that, you could create a new directory under annex's internal directory for each file, and make the directory have no write permission.
-
-[[done]] and done --[[Joey]] 
diff --git a/doc/todo/incremental_fsck.mdwn b/doc/todo/incremental_fsck.mdwn
deleted file mode 100644
--- a/doc/todo/incremental_fsck.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-Justin Azoff realized git-annex should have an incremental fsck.
-
-This requires storing the last fsck time of each object.
-
-I would not be strongly opposed to sqlite, but I think there are other
-places the data could be stored. One possible place is the mode or mtime
-of the .git/annex/objects/xx/yy/$key directories (the parent directories
-of where the content is stored). Perhaps the sticky bit could be used to
-indicate the content has been fsked, and the mtime indicate the time
-of last fsck. Anything that dropped or put in content would need to
-clear the sticky bit. --[[Joey]] 
-
-> Basic incremental fsck is done now.
-> 
-> Some enhancements would include:
-> 
-> * --max-age=30d  Once the incremental fsck completes and was started 30 days ago,
->   start a new one.
-> * --time-limit --size-limit --file-limit: Limit how long the fsck runs.
-
->> Calling this [[done]]. The `--incremental-schedule` option
->> allows scheduling time between incremental fscks. `--time-limit` is
->> done. I implemented `--smallerthan` independently. Not clear what
->> `--file-limit` would be. --[[Joey]]
diff --git a/doc/todo/integrate_support_for_spideroak_as_archive__47__backup.mdwn b/doc/todo/integrate_support_for_spideroak_as_archive__47__backup.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/todo/integrate_support_for_spideroak_as_archive__47__backup.mdwn
@@ -0,0 +1,9 @@
+SpiderOak is a great backup service and many of us have unlimited accounts with them since World Backup Day.  That makes SpiderOak a very interesting candidate for use as an archive or backup node.  I can think of only two ways to go about this:
+
+1. Designate one of your computers as an archive/backup and use spideroak independantly to sync that archive.  This is very unattractive, since it makes the spideroak backup completely unknown to git-annex.
+
+2. Integrate the SpiderOak CLI tool somehow as a remote.  I don't know to what extent this would be possible, but if it were, that'd be awesome.  And a lot of work, presumably.
+
+Bonus option:
+
+3. Can the SpiderOak API be useful? https://spideroak.com/faq/questions/37/how_do_i_use_the_spideroak_web_api/
diff --git a/doc/todo/link_file_to_remote_repo_feature.mdwn b/doc/todo/link_file_to_remote_repo_feature.mdwn
deleted file mode 100644
--- a/doc/todo/link_file_to_remote_repo_feature.mdwn
+++ /dev/null
@@ -1,52 +0,0 @@
-I have two repos, using SHA1 backend and both using git.
-The first one is a laptop, the second one is a usb drive.
-
-When I drop a file on the laptop repo, the file is not available on that repo until I run *git annex get*
-But when the usb drive is plugged in the file is actually available.
-
-How about adding a feature to link some/all files to the remote repo?
-
-e.g. 
-We have *railscasts/196-nested-model-form-part-1.mp4* file added to git, and only available on the usb drive:
-
-      $ git annex whereis 196-nested-model-form-part-1.mp4 
-         whereis 196-nested-model-form-part-1.mp4 (1 copy) 
-  	   a7b7d7a4-2a8a-11e1-aebc-d3c589296e81 -- origin (Portable usb drive)
-
-I can see the link with:
-
-    $ cd railscasts
-    $ ls -ls 196*
-    8 lrwxr-xr-x  1 framallo  staff  193 Dec 20 05:49 196-nested-model-form-part-1.mp4 -> ../.git/annex/objects/Wz/6P/SHA256-s16898930--43679c67cd968243f58f8f7fb30690b5f3f067574e318d609a01613a2a14351e/SHA256-s16898930--43679c67cd968243f58f8f7fb30690b5f3f067574e318d609a01613a2a14351e
-
-I save this in a variable just to make the example more clear:
-
-    ID=".git/annex/objects/Wz/6P/SHA256-s16898930--43679c67cd968243f58f8f7fb30690b5f3f067574e318d609a01613a2a14351e/SHA256-s16898930--43679c67cd968243f58f8f7fb30690b5f3f067574e318d609a01613a2a14351e"
-
-The file doesn't exist on the local repo:
-
-    $ ls ../$ID
-    ls: ../$ID: No such file or directory
-
-however I can create a link to access that file on the remote repo.
-First I create a needed dir:
-
-    $ mkdir ../.git/annex/objects/Wz/6P/SHA256-s16898930--43679c67cd968243f58f8f7fb30690b5f3f067574e318d609a01613a2a14351e/
-
-Then I link to the remote file:
-
-    $ ln -s /mnt/usb_drive/repo_folder/$ID ../$ID
-
-now I can open the file in the laptop repo.
-
-
-I think it could be easy to implement. Maybe It's a naive approach, but looks apealing.
-Checking if it's a real file or a link shouldn't impact on performance.
-The limitation is that it would work only with remote repos on local dirs
-
-Also allows you to have one directory structure like AFS or other distributed FS. If the file is not local I go to the remote server. 
-Which is great for apps like Picasa, Itunes, and friends that depends on the file location.
-
-> This is a duplicate of [[union_mounting]]. So closing it: [[done]]. 
-> 
-> It's a good idea, but making sure git-annex correctly handles these links in all cases is a subtle problem that has not yet been tackled. --[[Joey]]
diff --git a/doc/todo/make___34__itemdate__34___valid_importfeed_template_option.mdwn b/doc/todo/make___34__itemdate__34___valid_importfeed_template_option.mdwn
deleted file mode 100644
--- a/doc/todo/make___34__itemdate__34___valid_importfeed_template_option.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-Some podcasts don't include a sortable date as the first thing in their episode title, which makes listening to them in order challenging if not impossible.
-
-The date the item was posted is part of the RSS standard, so we should parse that and provide a new importfeed template option "itemdate".
-
-(For the curious, I tried "itemid" thinking that might give me something close, but it doesn't. I used --template='${feedtitle}/${itemid}-${itemtitle}${extension}' and get:
-
-    http___openmetalcast.com__p_1163-Open_Metalcast_Episode__93__Headless_Chicken.ogg
-
-or
-
-    http___www.folkalley.com_music_podcasts__name_2013_08_21_alleycast_6_13.mp3-Alleycast___06.13.mp3
-
-that "works" but is ugly :)
-
-Would love to be able to put a YYYYMMDD at the beginning and then the title.
-
-> [[done]]; itempubdate will use form YYYY-MM-DD (or the raw date string
-> if the feed does not use a parsable form). --[[Joey]]
diff --git a/doc/todo/network_remotes.mdwn b/doc/todo/network_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/network_remotes.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Support for remote git repositories (ssh:// specifically can be made to
-work, although the other end probably needs to have git-annex
-installed..)
-
-[[done]], at least get and put work..
diff --git a/doc/todo/nicer_whereis_output.mdwn b/doc/todo/nicer_whereis_output.mdwn
deleted file mode 100644
--- a/doc/todo/nicer_whereis_output.mdwn
+++ /dev/null
@@ -1,100 +0,0 @@
-We had some informal discussions on IRC about improving the output of the `whereis` command.
-
-[[!toc levels=2]]
-
-First version: columns
-======================
-
-[[mastensg]] started by implementing a [simple formatter](https://gist.github.com/mastensg/6500982) that would display things in columns [screenshot](http://www.ping.uio.no/~mastensg/whereis.png)
-
-Second version: Xs
-==================
-
-After some suggestions from [[joey]], [[mastensg]] changed the format slightly ([screenshot](http://www.ping.uio.no/~mastensg/whereis2.png)):
-
-[[!format txt """
-17:01:34 <joeyh> foo
-17:01:34 <joeyh> |bar
-17:01:34 <joeyh> ||baz (untrusted)
-17:01:34 <joeyh> |||
-17:01:34 <joeyh> XXx 3?  img.png
-17:01:36 <joeyh> _X_ 1!  bigfile
-17:01:37 <joeyh> XX_ 2   zort
-17:01:39 <joeyh> __x 1?! maybemissing
-17:02:09 * joeyh does a s/\?/+/ in the above
-17:02:24 <joeyh> and decrements the counters for untrusted
-17:03:37 <joeyh> __x 0+! maybemissing
-"""]]
-
-Third version: incremental
-==========================
-
-Finally, [[anarcat]] worked on making it run faster on large repositories, in a [fork](https://gist.github.com/anarcat/6502988) of that first gist. Then paging was added (so headers are repeated). 
-
-Fourth version: tuning and blocked
-==================================
-
-[[TobiasTheViking]] provided some bugfixes, and the next step was to implement the trusted/untrusted detection, and have a counter.
-
-This required more advanced parsing of the remotes, and instead of starting to do some JSON parsing, [[anarcat]] figured it was time to learn some Haskell instead.
-
-Current status: needs merge
-===========================
-
-So right now, the most recent version of the python script is in [anarcat's gist](https://gist.github.com/anarcat/6502988) and works reasonably well. However, it doesn't distinguish between trusted and untrusted repos and so on.
-
-Furthermore, we'd like to see this factored into the `whereis` command directly. A [raw.hs](http://codepad.org/miVJb5oK) file has been programmed by `mastensg`, and is now available in the above gist. It fits the desired output and prototypes, and has been `haskellized` thanks to [[guilhem]].
-
-Now we just need to merge those marvelous functions in `Whereis.hs` - but I can't quite figure out where to throw that code, so I'll leave it to someone more familiar with the internals of git-annex. The most recent version is still in [anarcat's gist](https://gist.github.com/anarcat/6502988). --[[anarcat]]
-
-Desired output
---------------
-
-The output we're aiming for is:
-
-    foo
-    |bar
-    ||baz (untrusted)
-    |||
-    XXx 2+  img.png
-    _X_ 1!  bigfile
-    XX_ 2   zort
-    __x 0+! maybemissing
-
-Legend:
-
- * `_` - file missing from repo
- * `x` - file may be present in untrusted repo
- * `X` - file is present in trusted repo
- * `[0-9]` - number of copies present in trusted repos
- * `+` - indicates there may be more copies present
- * `!` - indicates only one copy is left
-
-Implementation notes
---------------------
-
-[[!format txt """
-20:48:18 <joeyh> if someone writes me a headerWhereis ::  [(RemoteName, TrustLevel)] -> String  and a formatWhereis :: [(RemoteName, TrustLevel, UUID)] -> [UUD] -> FileName -> String   , I can do the rest ;)
-20:49:22 <joeyh> make that second one formatWhereis :: [(RemoteName, TrueLevel, Bool)] -> FileName -> String
-20:49:37 <joeyh> gah, typos
-20:49:45 <joeyh> suppose you don't need the RemoteName either
-"""]]
-
-> So, I incorporated this, in a new remotes command.
-> Showing all known repositories seemed a bit much
-> (I have 30-some known repositories in some cases),
-> so just showing configured remotes seems a good simplification.
-> [[done]]
-> --[[Joey]]
-
-> > I would have prefered this to be optional since I don't explicitely configure all remotes in git, especially if I can't reach them all the time (e.g. my laptop). It seems to me this should at least be an option, but I am confused as to why `Remote.List.remoteList` doesn't list all remotes the same way `Remote.remote_list` does... Also, it's unfortunate that the +/!/count flags have been dropped, it would have been useful... Thanks for the merge anyways! --[[done]]
-> > 
-> > The more I look at this, the more i think there are a few things wrong with the new `remotes` command.
-> > 
-> >  1. the name is confusing: being a git addict, I would expect the `git annex remote` command to behave like the `git remote` command: list remotes, add remotes, remove remotes and so on. it would actually be useful to have such a command (which would replace `initremote`, I guess). i recommend replacing the current `whereis` command, even if enabled through a special flag
-> > 
-> >  2. its behavior is inconsistent with other git annex commands: `git annex status`, for example, lists information about all remotes, regardless of whether they are configured in git. `remotes` (whatever it's called), should do the same, or at least provide an option to allow the user to list files on all remotes. The way things stand, there is no way to list files on non-git remotes, even if they are added explicitely as a remote, if the remote is not actually reachable: the files are just marked as absent (even thought `whereis` actually finds them). i recommend showing all remotes regardless, either opt-in or opt-out using a flag.
-> > 
-> >  3. having the `!` flag, at least, would be useful because it would allow users to intuitively grep for problematic files without having to learn extra syntax. same with + and having an explicit count.
-> > 
-> > thanks. --[[anarcat]]
diff --git a/doc/todo/object_dir_reorg_v2.mdwn b/doc/todo/object_dir_reorg_v2.mdwn
deleted file mode 100644
--- a/doc/todo/object_dir_reorg_v2.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-Several things suggest now would be a good time to reorgaize the object
-directory. This would be annex.version=2. It will be slightly painful for
-all users, so this should be the *last* reorg in the forseeable future.
-
-1. Remove colons from filenames, for [[bugs/fat_support]]
-
-2. Add hashing, since some filesystems do suck (like er, fat at least :)
-   [[forum/hashing_objects_directories]]
-   (Also, may as well hash .git-annex/* while at it -- that's what
-   really gets big.)
-
-3. Add filesize metadata for [[bugs/free_space_checking]]. (Currently only
-   present in WORM, and in an ad-hoc way.)
-
-4. Perhaps use a generic format that will allow further metadata to be
-   added later. For example,
-   "bSHA1,s101111,kf3101c30bb23467deaec5d78c6daa71d395d1879"
-
-   (Probably everything after ",k" should be part of the key, even if it
-   contains the "," separator character. Otherwise an escaping mechanism
-   would be needed.)
-
-[[done]] now! 
-
-Although [[bugs/free_space_checking]] is not quite there --[[Joey]] 
diff --git a/doc/todo/optinally_transfer_file_unencryptedly.mdwn b/doc/todo/optinally_transfer_file_unencryptedly.mdwn
deleted file mode 100644
--- a/doc/todo/optinally_transfer_file_unencryptedly.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-I have a git-annex repository on a NSLU 2, and transfers are much slower over ssh compared to unencrypted transfers (no wonder at that CPU speed). For the files that I am transferring, no encryption would be necessary. Unfortunately, ssh in Debian does not support "-c none" to disable encryption.
-
-It would be nice if git-annex would have a way of conveniently transferring files in another way than SSH. I’m not sure what a good way would be – maybe launching a one-shot HTTP-server on the sending end? Haskell libraries for that would be available... Of course it is not always the case that the host reachable with "ssh foo" is also reachable via TCP at "foo:1234"... And there are surely more problem. But still, it would be nice :-)
-
-> Setting `remote.name.annex-rsync-transport = rsh` will now
-> make rsync special remotes use rsh instead of ssh. [[done]]
diff --git a/doc/todo/preferred_content_numcopies_check.mdwn b/doc/todo/preferred_content_numcopies_check.mdwn
deleted file mode 100644
--- a/doc/todo/preferred_content_numcopies_check.mdwn
+++ /dev/null
@@ -1,86 +0,0 @@
-The assistant and git annex sync --content do not try to proactively
-download content that is not otherwise wanted in order to get numcopies
-satisfied. (Unlike get --auto, which does take numcopies into account.)
-
-Should these automated systems try to proactively satisfy numcopies? I
-don't feel they should. It could result in surprising results. For example,
-a transfer repository, which is of limited size, could start being filled
-up with lots of content that all clients have, just because numcopies was
-set to a larger number than the total number of clients. Another example,
-a source repository on eg an Android phone, should never have content in it
-that was not created on that device.
-
-However, it would make sense for some specific 
-types of repositories to proactively get content to satisfy numcopies. 
-Currently some types of repositories use "or (not copies=semitrusted+:1)",
-to ensure that if the only copy of a file is on a dead repository, they
-will try to get that file before the repo goes away. This is done
-by client repositories, and backup, and archive. Probably the same set
-would make sense to proactively satisfy numcopies.
-
-So, a new type of preferred content expression is called for. Such as, for
-example, "numcopiesneeded=1". Which indicates that at least 1 more copy 
-is needed to satifsy numcopies. 
-
-(Note that it should only count semittrusted and higher trust
-level repos as satisfying numcopies.)
-
-But, preferred content expressions can only operate on info stored in the
-git repo, or they will fail to be stable. Ie, repo A needs to be able to
-calculate whether a file is preferred content by repo B and get the same
-result as when repo B calculates that.
-
-numcopies is currently configured in 3 places:
-
-* .git/config `annex.numcopies` (global, stored only locally)
-* .gitattributes `annex.numcopies` (per file, stored in git repo)
-* --numcopies (not relevant)
-
-So, need to add a global numcopies setting that is stored in the git repo.
-That could either be a file in the git-annex branch, or just
-`* annex.numcopies=2` in the toplevel .gitattributes. Note that the
-assistant needs to be able to query and set it, which I think argues
-against using .gitattributes for it. Also arguing against that is that the
-.git/config numcopies valie applies even to objects with no file in the
-work tree, which gitattributes settings do not.
-
-Conclusion:
-
-* Add to the git-annex branch a numcopies file that holds the global
-  numcopies default if present. **done**
-* Modify the assistant to use it when configuring numcopies. **done**
-* To deprecate .git/config's annex.numcopies, only make it take effect
-  when there is no numcopies file in the git-annex branch. **done**
-* Add "numcopiesneeded=N" preferred content expression using the git-annex
-  branch numcopies setting, overridden by any .gitattributes numcopies setting
-  for a particular file. It should ignore the other ways to specify
-  numcopies, particularly git config annex.numcopies. **done**
-* Make the repo groups that currently end with "or (not copies=semitrusted+:1)"
-  to instead end with "or numcopiesneeded=1" **done**
-* See if "numcopiesneeded=N" can check .gitattributes without getting
-  a lot slower. If now, perhaps add a "numcopiesneededaccurate=N" that
-  checks it. **done**
-
-[[done]] 
-
-## Stability analysis
-
-If a remote prefers eg, "blah or numcopiesneeded=1", and
-file $foo does not match blah, but needs more copies, then then the
-expression will match.
-
-So, git-annex will get $foo, adding a copy. Which means that the 
-numcopiesneeded=1 will no longer match, so the file is no longer wanted
-now that it has been downloaded.
-
-Now there are two cases for what can happen:
-
-* git-annex tries to drop $foo, but fails because it cannot find enough
-  other copies
-* git-annex copies $foo to some other remote that wants it, and then
-  manages to drop $foo from the local remote.
-
-This seems ok. Files flow through repos and they act like transfer
-repos when there are not enough copies.
-
---[[Joey]]
diff --git a/doc/todo/pushpull.mdwn b/doc/todo/pushpull.mdwn
deleted file mode 100644
--- a/doc/todo/pushpull.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
---push/--pull should take a reponame and files, and push those files
-  to that repo; dropping them from the current repo
-
-[[done]] (move --from/--to)
diff --git a/doc/todo/quvi_0.9_support.mdwn b/doc/todo/quvi_0.9_support.mdwn
deleted file mode 100644
--- a/doc/todo/quvi_0.9_support.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-quvi 0.9 has a completely different interface; git-annex needs to be made
-to detect and use it.
-
-I have already fixed the worst problem, which caused git-annex addurl to
-think that every url was a valid quvi url. --[[Joey]]
-
-> [[done]], 0.9 is supported, although the version is detected at build
-> time. --[[Joey]]
diff --git a/doc/todo/rsync.mdwn b/doc/todo/rsync.mdwn
deleted file mode 100644
--- a/doc/todo/rsync.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Transferring a file from a ssh:// remote should use rsync to allow resuming
-of a prior transfer.
-
-[[done]]
diff --git a/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn b/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn
deleted file mode 100644
--- a/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-The bandwidth for upload and download are often different.  It would be useful to have different settings for upload and download limits.
-As it is, I have to keep changing annex-rsync-options options between uploads and downloads.
-
-> [[done]] --[[Joey]]
diff --git a/doc/todo/special_remote_for_amazon_glacier.mdwn b/doc/todo/special_remote_for_amazon_glacier.mdwn
deleted file mode 100644
--- a/doc/todo/special_remote_for_amazon_glacier.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-Amazon's new glacier service would be a nice special remote to support for
-long-term archival.
-
-The main difficulty is that glacier is organized into vaults, and accessing
-a file in a vault takes ~4 hours. A naive implementation would make `git
-annex get` wait for 4 hours, which is certainly not reasonable.
-
-One approach I am pondering is to make each glacier vault a separate
-special remote. You could then request git-annex to spin up a remote, and
-come back later, and be able to access the data stored in it (need to check
-if glacier would also allow adding new data to it then). This is
-conceptually similar to using git-annex with offline removable drives,
-except with glacier, you have a controllable robot to get them plugged in. :)
-
-Ideally, git-annex would arrange for glacier to send it a message when the
-vault becomes available, and the user could queue a list of commands to
-run, or files to transfer, at that point.
-
---[[Joey]]
-
-> [[done]]! --[[Joey]]
-
------
-
-> In the coming months, Amazon S3 will introduce an option that will allow customers to seamlessly move data between Amazon S3 and Amazon Glacier based on data lifecycle policies.
-
--- <http://aws.amazon.com/glacier/faqs/#How_should_I_choose_between_Amazon_Glacier_and_Amazon_S3>
-
->> They did, but it's IMHO not very useful for git-annex. It's rather
->> intended to allow aging S3 storage out to Glacier. --[[Joey]] 
diff --git a/doc/todo/speed_up_fsck.mdwn b/doc/todo/speed_up_fsck.mdwn
deleted file mode 100644
--- a/doc/todo/speed_up_fsck.mdwn
+++ /dev/null
@@ -1,40 +0,0 @@
-moving to the git-annex branch has slowed down fsck worse than most
-commands. Actually, some commands have sped up, while others like get
-are slightly slower but are swamped by the normal runtime. 
-
-For fsck though, it has to pull each file's location log info out of git.
-And, it's typically run on the entire tree.
-
-Another slow one in `git annex copy --from`.
-
-It would be possible to run a single `git cat-file --batch` and pass it
-sha1s of location logs for file that is going to be fsked (gotten via
-`read-tree`). Then just read its output until the next requested sha1 to
-chunk it, and pass this in to fsck in a closure.
-
-The difficulty, besides writing that is that everything that works with
-location logs now reads them out of git, would need to find a way to
-provide the info on a side channel of some sort.
-
-If this is implemented, the same infrastructure could be used for other
-commands like whereis and add. --[[Joey]]
-
-> Updated plan:
-> 
-> Run `git ls-file --batch`, and cache its stdin and out handles in Branch
-> state.
-> 
-> To see a git-annex branch file, send it something like
-> "git-annex:uuid.log", and read the content fron stdout handle.
-> 
-> To detect the end of content, send "TOKEN\n", and look for 
-> "TOKEN missing" in its output. A good choice for TOKEN is anything
-> that will never exist in the repo; 40 0's would be a fairly good choice,
-> but even better seems to be something completely invalid and impossible
-> to have as a sha1 or filename or ref: "".
-> 
-> Hmm, except that's actually an error message sent to stderr. Unless
-> stderr is connected to stdout, it might be better to look for a known,
-> empty object. Could just add a git-annex:empty file to that end.
-
-[[done]] --[[Joey]] 
diff --git a/doc/todo/ssh_special_remote.mdwn b/doc/todo/ssh_special_remote.mdwn
new file mode 100644
--- /dev/null
+++ b/doc/todo/ssh_special_remote.mdwn
@@ -0,0 +1,44 @@
+ssh:// remotes are not special remotes. Perhaps it would be useful to have
+a special remote that wraps a ssh:// remote? This would allow setting up a
+ssh:// remote that can be enabled using the webapp's normal UI for enabling
+special remotes.
+
+Enabling such a special remote would just make a regular git remote, so
+there would be no need to implement the methods to get/put data. (Although
+it might need to provide stubs to appease the compiler.)
+
+> Above is done. The command line interface in initremote and enableremote
+> is not too easy or perhaps useful, but it works great in the webapp.
+> --[[Joey]]
+
+It could optionally embed the ssh private key into the git-annex branch as
+a credential, for when you want anyone who has access to the git repo to be
+able to use the (locked-down) git-annex-shell on that server.
+
+> Leaving this todo open for this ssh private key embedcreds part.
+> I think it makes sense to do, but it it probably not too easy.
+> ([[webapp_ssh_setup_should_work_with_locked_down_git-annex-shell_account]]
+> needs to be fixed first). --[[Joey]]
+
+[[!meta title="remember ssh remote including optionally ssh key"]]
+
+----
+
+I am on the fence about whether this would be useful, and would appreciate
+use cases.
+
+One use case I was thinking about was a LAN with a central server, with a
+shared account with a git-annex repository on it. But then I realized this
+wouldn't really help set up git-annex in that situation, most of the time,
+because new clients would have the central server added as their first
+remote. 
+
+(It would help if one client paired with another new client, but
+that is unncessarily round-about most of the time.) 
+
+It might help in a more complex situation, where the LAN is not the whole
+network an a client might come onto the LAN already knowing about the
+central server there. --[[Joey]]
+
+A very compelling use case is switching from XMPP to a ssh server,
+and wanting to make it easy for users. --[[Joey]]
diff --git a/doc/todo/support-non-utf8-locales.mdwn b/doc/todo/support-non-utf8-locales.mdwn
deleted file mode 100644
--- a/doc/todo/support-non-utf8-locales.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-Currenty, git-annex forces output, particularly of filenames, in a utf-8
-locale.
-
-Note that this does not mean it cannot be used with filenames in other
-encodings. git-annex is entirely encoding agnostic when it comes to 
-manipulating filenames. It just *displays* their names always converted to
-utf-8, which  may not look right when you have a non-utf8 locale.
-
-This had to be done to work around some bugs with haskell's handling
-of filename encodings. In particular,
-
-* [[bugs/unhappy_without_UTF8_locale]]: haskell crashes when told to output 
-  a string with characters > 255 in a non-utf8 locale.
-* [[bugs/problems_with_utf8_names]]: On many OSs, haskell expects
-  non-decoded raw char8 in FilePaths. In order to display a filename,
-  though, it needs to first be decoded, and git-annex currently assumes
-  it was encoded as utf8.
-
-git-annex's behavior is unlikely to improve much until haskell's
-support for utf8 filenames improves. --[[Joey]]
-
-> [[done]] -- I just turned off all encoding handling on stdout and stderr,
-> which avoids these problems nicely. Git-annex now displays just what it
-> input, at least on platforms where haskell does not decode unicode in
-> FilePaths. This will later be a problem when it gets localized, but for
-> now works great. --[[Joey]]
diff --git a/doc/todo/support_for_lossy_remotes.mdwn b/doc/todo/support_for_lossy_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/support_for_lossy_remotes.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-I'm curious if there's a possibility to support lossy remotes. It may be handy to support syncing to special remotes that do lossy compression on the files (e.g., videos and images). For example, one could imagine having a YouTube special remote that only syncs video files. The original files wouldn't be available for download due to the transcoding and compression that YouTube does, so they wouldn't count towards the number of copies. In this YouTube example, the user gains:
-
-1. an online place that their videos are available from
-2. a worst-case scenario "backup"
-3. a remote that they could download smaller video files
-
-> [[done]]; lossy remotes are supported as seen with `git annex addurl
-> --fast` and also with the new addurl support for using quvi to get
-> videos fro youtube. Just make a key with a URL or something in it, and 
-> no size or checksum, and any content will be assumed to be the right
-> content. --[[Joey]]
diff --git a/doc/todo/support_for_writing_external_special_remotes.mdwn b/doc/todo/support_for_writing_external_special_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/support_for_writing_external_special_remotes.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-It would be good to have something in between the hook special remote and
-the built-in special remotes. The hook is easy to set up, but its simple
-interface misses some features that a more full-features interface could
-provide to a third-party program that wants to provide the best possible
-special remote it can w/o being written in haskell:
-
-* No way to send progress updates when uploading, so no progress bars for uploads from hook special remotes in the webapp.
-* No way to verify the `initremote` parameters include all needed configuration, and do any initalization needed.
-* No way to query and/or set the remote.log while it's running. (Well, technically, `git annex enableremote` can set values..)
-* No way to store per-key information to the git-annex branch.
-* No (easy) way to split files into chunks.
-
-Some of these features could be added to git-annex as subcommands. Which would
-improve the general programmability and flexability of git-annex. OTOH,
-running `git-annex upload-progress` repeatedly is pretty ugly. Or the
-interface could provide a channel for the program and git-annex to
-communicate back and forth on. Maybe a mix of the two?
-
-A final feature such an interface should provide is the ability to drop a
-program into PATH and have it just work, without the user needing to do any
-configuration beyond `initremote`. So, `git annex initremote foo type=$bar`
-should look for `git-annex-remote-$bar` in PATH if that's not a built-in
-special remote name.
-
---[[Joey]]
-
-[[done]]
diff --git a/doc/todo/support_fsck_in_bare_repos.mdwn b/doc/todo/support_fsck_in_bare_repos.mdwn
deleted file mode 100644
--- a/doc/todo/support_fsck_in_bare_repos.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-What is says on the tin:
-
-    22:56:54 < RichiH> joeyh_: by the way, i have been thinking about fsck on bare repos
-    22:57:37 < RichiH> joeyh_: the best i could come with is to have a bare and a non-bare access the same repo store
-    22:58:00 < RichiH> joeyh_: alternatively, with the SHA* backend, you have all the information to verify that the local data is correct
-    22:58:41 < RichiH> and verifying that would already be a plus. if there  really _is_ a problem, having the SHA is enough to track issues down
-    23:09:50 < joeyh_> oh, I think I have code that fsck could use on bare repos already.. just a matter of wiring it up
-    23:10:42 < joeyh_> feel free to reopen a bug or whatever so I remember.. the unused command's branch content enumeration could be used in a bare repo
-    23:14:51 < joeyh_> unused/dropunused could work in bare repos too btw
-
-> Also `status`'s total annex keys/size could be handled for bare repos. --[[Joey]] 
-
->> Fsck is done. Rest not done yet. --[[Joey]]
-
->>> all [[done]]! --[[Joey]] 
-
-[[!meta title="support unused, dropunused in bare repos"]]
diff --git a/doc/todo/symlink_farming_commit_hook.mdwn b/doc/todo/symlink_farming_commit_hook.mdwn
deleted file mode 100644
--- a/doc/todo/symlink_farming_commit_hook.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-TODO: implement below
-
-git-annex does use a lot of symlinks. Specicially, relative symlinks,
-that are checked into git. To allow you to move those around without
-annoyance, git-annex can run as a post-commit hook. This way, you can `git mv`
-a symlink to an annexed file, and as soon as you commit, it will be fixed
-up.
-
-`git annex init` tries to set up a post-commit hook that is itself a symlink
-back to git-annex. If you want to have your own shell script in the post-commit
-hook, just make it call `git annex` with no parameters. git-annex will detect
-when it's run from a git hook and do the necessary fixups.
-
-[[done]]
diff --git a/doc/todo/untracked_remotes.mdwn b/doc/todo/untracked_remotes.mdwn
deleted file mode 100644
--- a/doc/todo/untracked_remotes.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-Seems that a fairly common desire in some use cases is to be able to make a
-clone of a repository and be able to get files, without updating the
-location tracking information. (And without even recording a uuid in the
-remote.log.) Use cases include wanting to have temporary
-clones without cluttering history, and centralized development where the
-developers don't care to know about one-another's systems.
-
-It seems that such an untracked repository would need to automatically
-consider itself untrusted. Is that enough to avoid losing data?
-
-> [[done]]; set remote.<name>.annex-readonly=true to prevent
-> git-annex from pushing changes to the remote, or modifying the contents
-> of the remote in any way.
-> 
-> Note that I am intentionally not making this feature be about security.
-> The remote can still tell if you're connecting to it, and indeed if it
-> really wants to, and git-annex-shell is being used on the remote, it can
-> determine your local repository's uuid.
-> 
-> This allows for some complicated setups. For example, a public repository
-> P can be a readonly remote of a clone on your laptop L, and L in turn has
-> another, non-readonly remote D on a removable drive. This allows L and D
-> to keep track of which files one-another have, without leaking this info
-> to P. But note that if L adds P as a remote, it also has to mark it
-> readonly, to avoid leaking data.
-> 
-> --[[Joey]]
diff --git a/doc/todo/use_cp_reflink.mdwn b/doc/todo/use_cp_reflink.mdwn
deleted file mode 100644
--- a/doc/todo/use_cp_reflink.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-The unlock command needs to copy a file, and it would be great to use this:
-	cp --reflink=auto src dst
-
-O(1) overhead on BTRFS. Needs coreutils 7.6; and remember that git-annex
-may be used on systems without coreutils..
-
-[[done]]
diff --git a/doc/todo/using_url_backend.mdwn b/doc/todo/using_url_backend.mdwn
deleted file mode 100644
--- a/doc/todo/using_url_backend.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-There is no way to `git annex add` a file using the URL [[backend|backends]].
-
-For now, we have to manually make the symlink. Something like this:
-
-	ln -s .git/annex/URL:http:%%www.example.com%foo.tar.gz
-
-Note the escaping of slashes.
-
-A `git annex register <url>` command could do this..
-
-[[done]]
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -3,7 +3,6 @@
 [[!toc]]
 
 [[!inline feeds=no trail=yes show=0 template=walkthrough pagenames="""
-	walkthrough/setup_git
 	walkthrough/creating_a_repository
 	walkthrough/adding_a_remote
 	walkthrough/adding_files
diff --git a/doc/walkthrough/setup_git.mdwn b/doc/walkthrough/setup_git.mdwn
deleted file mode 100644
--- a/doc/walkthrough/setup_git.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-If you haven't configured your identity for GIT, you will have to do this before git annex will work.
-
diff --git a/git-annex.cabal b/git-annex.cabal
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 5.20140517
+Version: 5.20140529
 Cabal-Version: >= 1.8
 License: GPL-3
 Maintainer: Joey Hess <joey@kitenet.net>
@@ -98,7 +98,7 @@
    containers, utf8-string, network (>= 2.0), mtl (>= 2),
    bytestring, old-locale, time, HTTP,
    extensible-exceptions, dataenc, SHA, process, json,
-   base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
+   base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.5),
    IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
    SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3),
    data-default, case-insensitive
diff --git a/standalone/android/buildchroot-inchroot b/standalone/android/buildchroot-inchroot
--- a/standalone/android/buildchroot-inchroot
+++ b/standalone/android/buildchroot-inchroot
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Runs inside the chroot set up by buildchroot
 set -e
+set -x
 if [ "$(whoami)" != root ]; then
 	echo "Must run this as root!" >&2
 	exit 1
@@ -18,6 +19,11 @@
 apt-get -y install libgnutls-dev libxml2-dev libgsasl7-dev pkg-config c2hs
 apt-get -y install ant default-jdk rsync wget gnupg lsof
 apt-get -y install gettext unzip python
+apt-get -y install locales
+# works around a dependncy issue with the current hjsmin
+apt-get -y install libghc-hjsmin-dev
+echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
+locale-gen
 apt-get clean
 wget http://snapshot.debian.org/archive/debian/20130903T155330Z/pool/main/a/automake-1.14/automake_1.14-1_all.deb
 dpkg -i automake*.deb
diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser
--- a/standalone/android/buildchroot-inchroot-asuser
+++ b/standalone/android/buildchroot-inchroot-asuser
@@ -1,7 +1,16 @@
 #!/bin/sh
 # Runs inside the chroot set up by buildchroot, as the user it creates
 set -e
+set -x
 
+# Put in /tmp by buildchroot, but when bootstrapping with propellor,
+# this is run inside a checked out git-annex tree.
+if [ -e /tmp/abiversion ]; then
+	ABIVERSION=$(cat /tmp/abiversion)
+else
+	ABIVERSION=$(cat standalone/android/abiversion)
+fi
+
 cd
 rm -rf .ghc .cabal .android
 cabal update
@@ -29,10 +38,7 @@
 rm -rf adt-bundle-linux-x86/eclipse
 
 # The git-annex android Makefile needs this cc symlink.
-ln -s arm-linux-androideabi-gcc $HOME/.ghc/$(cat /tmp/abiversion)/bin/cc
-
-cd
-git clone git://git-annex.branchable.com/ git-annex
+ln -s arm-linux-androideabi-gcc $HOME/.ghc/$ABIVERSION/bin/cc
 
 git config --global user.email androidbuilder@example.com
 git config --global user.name androidbuilder
diff --git a/standalone/android/haskell-patches/libxml-sax_text-dep.patch b/standalone/android/haskell-patches/libxml-sax_text-dep.patch
deleted file mode 100644
--- a/standalone/android/haskell-patches/libxml-sax_text-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4c861dbdee34cb2434085b9ece62c416d4cad79 Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Sat, 8 Feb 2014 17:19:37 +0000
-Subject: [PATCH] text dependency
-
----
- libxml-sax.cabal |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libxml-sax.cabal b/libxml-sax.cabal
-index 60dba81..d6883bd 100644
---- a/libxml-sax.cabal
-+++ b/libxml-sax.cabal
-@@ -35,7 +35,7 @@ library
-   build-depends:
-       base >= 4.1 && < 5.0
-     , bytestring >= 0.9
--    , text >= 0.7 && < 0.12
-+    , text
-     , xml-types >= 0.3 && < 0.4
- 
-   exposed-modules:
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/lifted-base_crossbuild.patch b/standalone/android/haskell-patches/lifted-base_crossbuild.patch
deleted file mode 100644
--- a/standalone/android/haskell-patches/lifted-base_crossbuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8a98fa29048b508c64d5bb1e03ef89bfad8adc01 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sat, 21 Sep 2013 21:34:17 +0000
-Subject: [PATCH] crossbuild
-
----
- lifted-base.cabal |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lifted-base.cabal b/lifted-base.cabal
-index 24f2860..3bef225 100644
---- a/lifted-base.cabal
-+++ b/lifted-base.cabal
-@@ -9,7 +9,7 @@ Copyright:           (c) 2011-2012 Bas van Dijk, Anders Kaseorg
- Homepage:            https://github.com/basvandijk/lifted-base
- Bug-reports:         https://github.com/basvandijk/lifted-base/issues
- Category:            Control
--Build-type:          Custom
-+Build-type:          Simple
- Cabal-version:       >= 1.8
- Description:         @lifted-base@ exports IO operations from the base library lifted to
-                      any instance of 'MonadBase' or 'MonadBaseControl'.
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/system-filepath_cross-build.patch b/standalone/android/haskell-patches/system-filepath_cross-build.patch
--- a/standalone/android/haskell-patches/system-filepath_cross-build.patch
+++ b/standalone/android/haskell-patches/system-filepath_cross-build.patch
@@ -1,14 +1,14 @@
-From 9345a1ad95cc263f99ef124c7a386fb5aaa5405b Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Fri, 7 Feb 2014 22:18:12 +0000
-Subject: [PATCH] fix
+From 0e728d5b049224394908d793c73902a8c981e636 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Mon, 26 May 2014 01:04:40 +0000
+Subject: [PATCH] fix cross build
 
 ---
  system-filepath.cabal |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/system-filepath.cabal b/system-filepath.cabal
-index d5fbbdd..efdf9ca 100644
+index d6aa726..f4e5e0f 100644
 --- a/system-filepath.cabal
 +++ b/system-filepath.cabal
 @@ -6,7 +6,7 @@ license-file: license.txt
@@ -17,7 +17,7 @@
  copyright: John Millikin 2010-2012
 -build-type: Custom
 +build-type: Simple
- cabal-version: >= 1.6
+ cabal-version: >= 1.8
  category: System
  stability: experimental
 -- 
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -20,6 +20,24 @@
 
 cabalopts="$@"
 
+setupcabal () {
+	cabal update
+
+	# Workaround for http://www.reddit.com/r/haskell/comments/26045a/if_youre_finding_cabal_cant_build_your_project/
+	# should be able to remove this eventually.
+	cabal install transformers-compat -fthree
+	cabal install mtl-2.1.3.1
+
+	# Some packages fail to install in a non unicode locale.
+	LANG=en_US.UTF-8
+	export LANG
+
+	# The android build chroot has recent versions of alex and happy
+	# installed here.
+	PATH=$HOME/bin:$PATH
+	export PATH
+}
+
 cabalinstall () {
 	echo cabal install "$@" "$cabalopts"
 	eval cabal install "$@" "$cabalopts"
@@ -106,8 +124,6 @@
 	patched uuid
 	patched dns
 	patched gnutls
-	patched libxml-sax
-	patched network-protocol-xmpp
 	patched unbounded-delays
 
 	cd ..
@@ -119,7 +135,7 @@
 echo
 echo native build
 echo
-cabal update
+setupcabal
 installgitannexdeps
 
 echo 
@@ -127,5 +143,5 @@
 echo cross build
 echo
 PATH=$HOME/.ghc/$(cat abiversion)/bin:$HOME/.ghc/$(cat abiversion)/arm-linux-androideabi/bin:$PATH
-cabal update
+setupcabal
 install_pkgs
diff --git a/standalone/android/runshell b/standalone/android/runshell
--- a/standalone/android/runshell
+++ b/standalone/android/runshell
@@ -30,7 +30,7 @@
 		$cmd ln -s "$base/lib/lib.$prog.so" "$base/bin/$prog"
 	done
 
-	$cmd --install $base/bin
+	$cmd --install -s $base/bin
 
 	$cmd rm -rf "$base/bin.old"
 
diff --git a/standalone/linux/install-haskell-packages b/standalone/linux/install-haskell-packages
--- a/standalone/linux/install-haskell-packages
+++ b/standalone/linux/install-haskell-packages
@@ -51,6 +51,8 @@
 
 installgitannexdeps () {
 	pushd ../..
+	echo "cabal install QuickCheck -f-templateHaskell"
+	cabal install QuickCheck -f-templateHaskell
 	echo cabal install --only-dependencies "$@"
 	cabal install --only-dependencies "$@"
 	popd
@@ -63,18 +65,14 @@
 
 	patched network
 	patched wai-app-static
+	patched aeson
 	patched shakespeare
-	patched shakespeare-css
 	patched yesod-routes
-	patched hamlet
 	patched monad-logger
-	patched shakespeare-i18n
-	patched shakespeare-js
 	patched yesod-core
 	patched persistent
 	patched persistent-template
 	patched file-embed
-	patched shakespeare-text
 	patched process-conduit
 	patched yesod-static
 	patched yesod-persistent
diff --git a/standalone/no-th/evilsplicer-headers.hs b/standalone/no-th/evilsplicer-headers.hs
--- a/standalone/no-th/evilsplicer-headers.hs
+++ b/standalone/no-th/evilsplicer-headers.hs
@@ -13,6 +13,7 @@
 import qualified Data.Foldable
 import qualified Data.Text
 import qualified Data.Text.Lazy.Builder
+import qualified Data.Text.Lazy.Builder as Data.Text.Internal.Builder
 import qualified Text.Shakespeare
 import qualified Text.Hamlet
 import qualified Text.Julius
@@ -29,6 +30,8 @@
 import qualified Network.Wai
 import qualified Network.Wai as Network.Wai.Internal
 import qualified Yesod.Core.Types
+import qualified GHC.IO
+import qualified Data.ByteString.Unsafe
 {- End EvilSplicer headers. -}
 
 
diff --git a/standalone/no-th/haskell-patches/DAV_build-without-TH.patch b/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
--- a/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
+++ b/standalone/no-th/haskell-patches/DAV_build-without-TH.patch
@@ -1,6 +1,6 @@
-From a908cec3ae1644d72d04ccc7657433d8335665bc Mon Sep 17 00:00:00 2001
+From 8e115228601a97b19d3f713ccf2d13f58838d927 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Sat, 8 Feb 2014 17:11:05 +0000
+Date: Mon, 26 May 2014 01:48:22 +0000
 Subject: [PATCH] expand TH
 
 ---
@@ -10,12 +10,12 @@
  3 files changed, 307 insertions(+), 45 deletions(-)
 
 diff --git a/DAV.cabal b/DAV.cabal
-index 3a755bb..748b0e1 100644
+index bf54f44..04f375a 100644
 --- a/DAV.cabal
 +++ b/DAV.cabal
 @@ -42,29 +42,7 @@ library
                       , transformers-base
-                      , xml-conduit >= 1.0          && <= 1.2
+                      , xml-conduit >= 1.0          && < 1.3
                       , xml-hamlet >= 0.4           && <= 0.5
 -executable hdav
 -  main-is:           hdav.hs
@@ -38,7 +38,7 @@
 -                     , optparse-applicative >= 0.5.0
 -                     , transformers >= 0.3
 -                     , transformers-base
--                     , xml-conduit >= 1.0          && <= 1.2
+-                     , xml-conduit >= 1.0          && < 1.3
 -                     , xml-hamlet >= 0.4           && <= 0.5
 +                     , text
  
diff --git a/standalone/no-th/haskell-patches/aeson_remove-TH.patch b/standalone/no-th/haskell-patches/aeson_remove-TH.patch
new file mode 100644
--- /dev/null
+++ b/standalone/no-th/haskell-patches/aeson_remove-TH.patch
@@ -0,0 +1,40 @@
+From f147ec9aeaa03ca6e30232c84c413ef29b95fb62 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Tue, 20 May 2014 19:53:55 +0000
+Subject: [PATCH] avoid TH
+
+---
+ aeson.cabal | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/aeson.cabal b/aeson.cabal
+index 493d625..02dc6f4 100644
+--- a/aeson.cabal
++++ b/aeson.cabal
+@@ -88,7 +88,6 @@ library
+     Data.Aeson.Generic
+     Data.Aeson.Parser
+     Data.Aeson.Types
+-    Data.Aeson.TH
+ 
+   other-modules:
+     Data.Aeson.Functions
+@@ -121,7 +120,6 @@ library
+     old-locale,
+     scientific >= 0.3.1 && < 0.4,
+     syb,
+-    template-haskell >= 2.4,
+     time,
+     unordered-containers >= 0.2.3.0,
+     vector >= 0.7.1
+@@ -164,7 +162,6 @@ test-suite tests
+     base,
+     containers,
+     bytestring,
+-    template-haskell,
+     test-framework,
+     test-framework-quickcheck2,
+     test-framework-hunit,
+-- 
+2.0.0.rc2
+
diff --git a/standalone/no-th/haskell-patches/hamlet_remove-TH.patch b/standalone/no-th/haskell-patches/hamlet_remove-TH.patch
deleted file mode 100644
--- a/standalone/no-th/haskell-patches/hamlet_remove-TH.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From 60d7ac8aa1b3282a06ea7b17680dfc32c61fcbf6 Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Thu, 6 Mar 2014 23:19:40 +0000
-Subject: [PATCH] remove TH
-
----
- Text/Hamlet.hs       | 86 +++++++++++++++++-----------------------------------
- Text/Hamlet/Parse.hs |  3 +-
- 2 files changed, 29 insertions(+), 60 deletions(-)
-
-diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
-index 9500ecb..ec8471a 100644
---- a/Text/Hamlet.hs
-+++ b/Text/Hamlet.hs
-@@ -11,36 +11,36 @@
- module Text.Hamlet
-     ( -- * Plain HTML
-       Html
--    , shamlet
--    , shamletFile
--    , xshamlet
--    , xshamletFile
-+    --, shamlet
-+    --, shamletFile
-+    --, xshamlet
-+    --, xshamletFile
-       -- * Hamlet
-     , HtmlUrl
--    , hamlet
--    , hamletFile
--    , hamletFileReload
--    , ihamletFileReload
--    , xhamlet
--    , xhamletFile
-+    --, hamlet
-+    --, hamletFile
-+    --, hamletFileReload
-+    --, ihamletFileReload
-+    --, xhamlet
-+    --, xhamletFile
-       -- * I18N Hamlet
-     , HtmlUrlI18n
--    , ihamlet
--    , ihamletFile
-+    --, ihamlet
-+    --, ihamletFile
-       -- * Type classes
-     , ToAttributes (..)
-       -- * Internal, for making more
-     , HamletSettings (..)
-     , NewlineStyle (..)
--    , hamletWithSettings
--    , hamletFileWithSettings
-+    --, hamletWithSettings
-+    --, hamletFileWithSettings
-     , defaultHamletSettings
-     , xhtmlHamletSettings
--    , Env (..)
--    , HamletRules (..)
--    , hamletRules
--    , ihamletRules
--    , htmlRules
-+    --, Env (..)
-+    --, HamletRules (..)
-+    --, hamletRules
-+    --, ihamletRules
-+    --, htmlRules
-     , CloseStyle (..)
-       -- * Used by generated code
-     , condH
-@@ -110,47 +110,9 @@ type HtmlUrl url = Render url -> Html
- -- | A function generating an 'Html' given a message translator and a URL rendering function.
- type HtmlUrlI18n msg url = Translate msg -> Render url -> Html
- 
--docsToExp :: Env -> HamletRules -> Scope -> [Doc] -> Q Exp
--docsToExp env hr scope docs = do
--    exps <- mapM (docToExp env hr scope) docs
--    case exps of
--        [] -> [|return ()|]
--        [x] -> return x
--        _ -> return $ DoE $ map NoBindS exps
--
- unIdent :: Ident -> String
- unIdent (Ident s) = s
- 
--bindingPattern :: Binding -> Q (Pat, [(Ident, Exp)])
--bindingPattern (BindAs i@(Ident s) b) = do
--    name <- newName s
--    (pattern, scope) <- bindingPattern b
--    return (AsP name pattern, (i, VarE name):scope)
--bindingPattern (BindVar i@(Ident s))
--    | all isDigit s = do
--        return (LitP $ IntegerL $ read s, [])
--    | otherwise = do
--        name <- newName s
--        return (VarP name, [(i, VarE name)])
--bindingPattern (BindTuple is) = do
--    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
--    return (TupP patterns, concat scopes)
--bindingPattern (BindList is) = do
--    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
--    return (ListP patterns, concat scopes)
--bindingPattern (BindConstr con is) = do
--    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
--    return (ConP (mkConName con) patterns, concat scopes)
--bindingPattern (BindRecord con fields wild) = do
--    let f (Ident field,b) =
--           do (p,s) <- bindingPattern b
--              return ((mkName field,p),s)
--    (patterns, scopes) <- fmap unzip $ mapM f fields
--    (patterns1, scopes1) <- if wild
--       then bindWildFields con $ map fst fields
--       else return ([],[])
--    return (RecP (mkConName con) (patterns++patterns1), concat scopes ++ scopes1)
--
- mkConName :: DataConstr -> Name
- mkConName = mkName . conToStr
- 
-@@ -158,6 +120,7 @@ conToStr :: DataConstr -> String
- conToStr (DCUnqualified (Ident x)) = x
- conToStr (DCQualified (Module xs) (Ident x)) = intercalate "." $ xs ++ [x]
- 
-+{-
- -- Wildcards bind all of the unbound fields to variables whose name
- -- matches the field name.
- --
-@@ -296,10 +259,12 @@ hamlet = hamletWithSettings hamletRules defaultHamletSettings
- 
- xhamlet :: QuasiQuoter
- xhamlet = hamletWithSettings hamletRules xhtmlHamletSettings
-+-}
- 
- asHtmlUrl :: HtmlUrl url -> HtmlUrl url
- asHtmlUrl = id
- 
-+{-
- hamletRules :: Q HamletRules
- hamletRules = do
-     i <- [|id|]
-@@ -360,6 +325,7 @@ hamletFromString :: Q HamletRules -> HamletSettings -> String -> Q Exp
- hamletFromString qhr set s = do
-     hr <- qhr
-     hrWithEnv hr $ \env -> docsToExp env hr [] $ docFromString set s
-+-}
- 
- docFromString :: HamletSettings -> String -> [Doc]
- docFromString set s =
-@@ -367,6 +333,7 @@ docFromString set s =
-         Error s' -> error s'
-         Ok (_, d) -> d
- 
-+{-
- hamletFileWithSettings :: Q HamletRules -> HamletSettings -> FilePath -> Q Exp
- hamletFileWithSettings qhr set fp = do
- #ifdef GHC_7_4
-@@ -408,6 +375,7 @@ strToExp s@(c:_)
-     | isUpper c = ConE $ mkName s
-     | otherwise = VarE $ mkName s
- strToExp "" = error "strToExp on empty string"
-+-}
- 
- -- | Checks for truth in the left value in each pair in the first argument. If
- -- a true exists, then the corresponding right action is performed. Only the
-@@ -452,7 +420,7 @@ hamletUsedIdentifiers settings =
- data HamletRuntimeRules = HamletRuntimeRules {
-                             hrrI18n :: Bool
-                           }
--
-+{-
- hamletFileReloadWithSettings :: HamletRuntimeRules
-                              -> HamletSettings -> FilePath -> Q Exp
- hamletFileReloadWithSettings hrr settings fp = do
-@@ -479,7 +447,7 @@ hamletFileReloadWithSettings hrr settings fp = do
-             c VTUrlParam = [|EUrlParam|]
-             c VTMixin = [|\r -> EMixin $ \c -> r c|]
-             c VTMsg = [|EMsg|]
--
-+-}
- -- move to Shakespeare.Base?
- readFileUtf8 :: FilePath -> IO String
- readFileUtf8 fp = fmap TL.unpack $ readUtf8File fp
-diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
-index b7e2954..1f14946 100644
---- a/Text/Hamlet/Parse.hs
-+++ b/Text/Hamlet/Parse.hs
-@@ -616,6 +616,7 @@ data NewlineStyle = NoNewlines -- ^ never add newlines
-                   | DefaultNewlineStyle
-     deriving Show
- 
-+{-
- instance Lift NewlineStyle where
-     lift NoNewlines = [|NoNewlines|]
-     lift NewlinesText = [|NewlinesText|]
-@@ -627,7 +628,7 @@ instance Lift (String -> CloseStyle) where
- 
- instance Lift HamletSettings where
-     lift (HamletSettings a b c d) = [|HamletSettings $(lift a) $(lift b) $(lift c) $(lift d)|]
--
-+-}
- 
- htmlEmptyTags :: Set String
- htmlEmptyTags = Set.fromAscList
--- 
-1.9.0
-
diff --git a/standalone/no-th/haskell-patches/lens_no-TH.patch b/standalone/no-th/haskell-patches/lens_no-TH.patch
--- a/standalone/no-th/haskell-patches/lens_no-TH.patch
+++ b/standalone/no-th/haskell-patches/lens_no-TH.patch
@@ -1,10 +1,10 @@
-From 66fdbc0cb69036b61552a3bce7e995ea2a7f76c1 Mon Sep 17 00:00:00 2001
+From 2109923a879a02c8a79e8e08573bf9e500d8afc8 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 7 Mar 2014 05:43:33 +0000
-Subject: [PATCH] TH
+Date: Wed, 21 May 2014 16:25:06 +0000
+Subject: [PATCH] remove  TH
 
 ---
- lens.cabal                              | 19 +------------------
+ lens.cabal                              | 20 +-------------------
  src/Control/Lens.hs                     |  8 ++------
  src/Control/Lens/Cons.hs                |  2 --
  src/Control/Lens/Internal/Fold.hs       |  2 --
@@ -12,10 +12,10 @@
  src/Control/Lens/Operators.hs           |  2 +-
  src/Control/Lens/Prism.hs               |  2 --
  src/Control/Monad/Primitive/Lens.hs     |  1 -
- 8 files changed, 4 insertions(+), 34 deletions(-)
+ 8 files changed, 4 insertions(+), 35 deletions(-)
 
 diff --git a/lens.cabal b/lens.cabal
-index 790a9d7..7cd3ff9 100644
+index 03f64f5..3f6f6d2 100644
 --- a/lens.cabal
 +++ b/lens.cabal
 @@ -10,7 +10,7 @@ stability:     provisional
@@ -27,7 +27,7 @@
  -- build-tools:   cpphs
  tested-with:   GHC == 7.6.3
  synopsis:      Lenses, Folds and Traversals
-@@ -177,7 +177,6 @@ flag lib-Werror
+@@ -182,7 +182,6 @@ flag j
  
  library
    build-depends:
@@ -35,7 +35,7 @@
      array                     >= 0.3.0.2  && < 0.6,
      base                      >= 4.3      && < 5,
      bifunctors                >= 4        && < 5,
-@@ -216,7 +215,6 @@ library
+@@ -221,7 +220,6 @@ library
      Control.Exception.Lens
      Control.Lens
      Control.Lens.Action
@@ -43,7 +43,14 @@
      Control.Lens.Combinators
      Control.Lens.Cons
      Control.Lens.Each
-@@ -251,22 +249,18 @@ library
+@@ -249,29 +247,24 @@ library
+     Control.Lens.Internal.Reflection
+     Control.Lens.Internal.Review
+     Control.Lens.Internal.Setter
+-    Control.Lens.Internal.TH
+     Control.Lens.Internal.Zoom
+     Control.Lens.Iso
+     Control.Lens.Lens
      Control.Lens.Level
      Control.Lens.Loupe
      Control.Lens.Operators
@@ -66,7 +73,7 @@
      Data.Array.Lens
      Data.Bits.Lens
      Data.ByteString.Lens
-@@ -289,17 +283,10 @@ library
+@@ -294,17 +287,10 @@ library
      Data.Typeable.Lens
      Data.Vector.Lens
      Data.Vector.Generic.Lens
@@ -81,10 +88,10 @@
 -  other-modules:
 -    Control.Lens.Internal.TupleIxedTH
 -
-   if flag(safe)
-     cpp-options: -DSAFE=1
+   cpp-options: -traditional
  
-@@ -396,7 +383,6 @@ test-suite doctests
+   if flag(safe)
+@@ -406,7 +392,6 @@ test-suite doctests
        deepseq,
        doctest        >= 0.9.1,
        filepath,
@@ -92,7 +99,7 @@
        mtl,
        nats,
        parallel,
-@@ -434,7 +420,6 @@ benchmark plated
+@@ -444,7 +429,6 @@ benchmark plated
      comonad,
      criterion,
      deepseq,
@@ -100,7 +107,7 @@
      lens,
      transformers
  
-@@ -469,7 +454,6 @@ benchmark unsafe
+@@ -479,7 +463,6 @@ benchmark unsafe
      comonads-fd,
      criterion,
      deepseq,
@@ -108,7 +115,7 @@
      lens,
      transformers
  
-@@ -486,6 +470,5 @@ benchmark zipper
+@@ -496,6 +479,5 @@ benchmark zipper
      comonads-fd,
      criterion,
      deepseq,
@@ -203,10 +210,10 @@
    reflectByte :: proxy s -> IntPtr
  
 diff --git a/src/Control/Lens/Operators.hs b/src/Control/Lens/Operators.hs
-index 3e14c55..989eb92 100644
+index 9992e63..631e8e6 100644
 --- a/src/Control/Lens/Operators.hs
 +++ b/src/Control/Lens/Operators.hs
-@@ -110,7 +110,7 @@ module Control.Lens.Operators
+@@ -111,7 +111,7 @@ module Control.Lens.Operators
    , (<#~)
    , (<#=)
    -- * "Control.Lens.Plated"
@@ -241,5 +248,5 @@
  prim :: (PrimMonad m) => Iso' (m a) (State# (PrimState m) -> (# State# (PrimState m), a #))
  prim = iso internal primitive
 -- 
-1.9.0
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/process-conduit_avoid-TH.patch b/standalone/no-th/haskell-patches/process-conduit_avoid-TH.patch
--- a/standalone/no-th/haskell-patches/process-conduit_avoid-TH.patch
+++ b/standalone/no-th/haskell-patches/process-conduit_avoid-TH.patch
@@ -1,24 +1,24 @@
-From c9f40fae5f7f44c7c28b243bf924606ef4f26700 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Wed, 18 Dec 2013 04:17:59 +0000
-Subject: [PATCH] avoid TH
+From 7e85a025349877565a70c375ef55508f215eaaf8 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Wed, 21 May 2014 04:23:49 +0000
+Subject: [PATCH] remove TH
 
 ---
  process-conduit.cabal | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/process-conduit.cabal b/process-conduit.cabal
-index c917d90..4410e2c 100644
+index e6988e0..a2e03e0 100644
 --- a/process-conduit.cabal
 +++ b/process-conduit.cabal
 @@ -24,7 +24,6 @@ source-repository head
- 
- library
-   exposed-modules:     Data.Conduit.Process
--                       System.Process.QQ
-   
-   build-depends:       base             == 4.*
-                      , template-haskell >= 2.4
+ 
+ library
+   exposed-modules:     Data.Conduit.Process
+-                       System.Process.QQ
+ 
+   build-depends:       base             == 4.*
+                      , template-haskell >= 2.4
 -- 
-1.8.5.1
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/shakespeare-i18n_0001-remove-TH.patch b/standalone/no-th/haskell-patches/shakespeare-i18n_0001-remove-TH.patch
deleted file mode 100644
--- a/standalone/no-th/haskell-patches/shakespeare-i18n_0001-remove-TH.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 57ad7d1512a3144fd0b00f9796d5fd9e0ea86852 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 17 Dec 2013 16:30:59 +0000
-Subject: [PATCH] remove TH
-
----
- Text/Shakespeare/I18N.hs | 178 ++---------------------------------------------
- 1 file changed, 4 insertions(+), 174 deletions(-)
-
-diff --git a/Text/Shakespeare/I18N.hs b/Text/Shakespeare/I18N.hs
-index 2077914..2289214 100644
---- a/Text/Shakespeare/I18N.hs
-+++ b/Text/Shakespeare/I18N.hs
-@@ -51,10 +51,10 @@
- --
- -- You can also adapt those instructions for use with other systems.
- module Text.Shakespeare.I18N
--    ( mkMessage
--    , mkMessageFor
--    , mkMessageVariant
--    , RenderMessage (..)
-+    --( mkMessage
-+    --, mkMessageFor
-+    ---, mkMessageVariant
-+    ( RenderMessage (..)
-     , ToMessage (..)
-     , SomeMessage (..)
-     , Lang
-@@ -105,143 +105,6 @@ instance RenderMessage master Text where
- -- | an RFC1766 / ISO 639-1 language code (eg, @fr@, @en-GB@, etc).
- type Lang = Text
- 
---- |generate translations from translation files
----
---- This function will:
----
----  1. look in the supplied subdirectory for files ending in @.msg@
----
----  2. generate a type based on the constructors found
----
----  3. create a 'RenderMessage' instance
----
--mkMessage :: String   -- ^ base name to use for translation type
--          -> FilePath -- ^ subdirectory which contains the translation files
--          -> Lang     -- ^ default translation language
--          -> Q [Dec]
--mkMessage dt folder lang =
--    mkMessageCommon True "Msg" "Message" dt dt folder lang
--
--
---- | create 'RenderMessage' instance for an existing data-type
--mkMessageFor :: String     -- ^ master translation data type
--             -> String     -- ^ existing type to add translations for
--             -> FilePath   -- ^ path to translation folder
--             -> Lang       -- ^ default language
--             -> Q [Dec]
--mkMessageFor master dt folder lang = mkMessageCommon False "" "" master dt folder lang
--
---- | create an additional set of translations for a type created by `mkMessage`
--mkMessageVariant :: String     -- ^ master translation data type
--                 -> String     -- ^ existing type to add translations for
--                 -> FilePath   -- ^ path to translation folder
--                 -> Lang       -- ^ default language
--                 -> Q [Dec]
--mkMessageVariant master dt folder lang = mkMessageCommon False "Msg" "Message" master dt folder lang
--
---- |used by 'mkMessage' and 'mkMessageFor' to generate a 'RenderMessage' and possibly a message data type
--mkMessageCommon :: Bool      -- ^ generate a new datatype from the constructors found in the .msg files
--                -> String    -- ^ string to append to constructor names
--                -> String    -- ^ string to append to datatype name
--                -> String    -- ^ base name of master datatype
--                -> String    -- ^ base name of translation datatype
--                -> FilePath  -- ^ path to translation folder
--                -> Lang      -- ^ default lang
--                -> Q [Dec]
--mkMessageCommon genType prefix postfix master dt folder lang = do
--    files <- qRunIO $ getDirectoryContents folder
--    (_files', contents) <- qRunIO $ fmap (unzip . catMaybes) $ mapM (loadLang folder) files
--#ifdef GHC_7_4
--    mapM_ qAddDependentFile _files'
--#endif
--    sdef <-
--        case lookup lang contents of
--            Nothing -> error $ "Did not find main language file: " ++ unpack lang
--            Just def -> toSDefs def
--    mapM_ (checkDef sdef) $ map snd contents
--    let mname = mkName $ dt ++ postfix
--    c1 <- fmap concat $ mapM (toClauses prefix dt) contents
--    c2 <- mapM (sToClause prefix dt) sdef
--    c3 <- defClause
--    return $
--     ( if genType 
--       then ((DataD [] mname [] (map (toCon dt) sdef) []) :)
--       else id)
--        [ InstanceD
--            []
--            (ConT ''RenderMessage `AppT` (ConT $ mkName master) `AppT` ConT mname)
--            [ FunD (mkName "renderMessage") $ c1 ++ c2 ++ [c3]
--            ]
--        ]
--
--toClauses :: String -> String -> (Lang, [Def]) -> Q [Clause]
--toClauses prefix dt (lang, defs) =
--    mapM go defs
--  where
--    go def = do
--        a <- newName "lang"
--        (pat, bod) <- mkBody dt (prefix ++ constr def) (map fst $ vars def) (content def)
--        guard <- fmap NormalG [|$(return $ VarE a) == pack $(lift $ unpack lang)|]
--        return $ Clause
--            [WildP, ConP (mkName ":") [VarP a, WildP], pat]
--            (GuardedB [(guard, bod)])
--            []
--
--mkBody :: String -- ^ datatype
--       -> String -- ^ constructor
--       -> [String] -- ^ variable names
--       -> [Content]
--       -> Q (Pat, Exp)
--mkBody dt cs vs ct = do
--    vp <- mapM go vs
--    let pat = RecP (mkName cs) (map (varName dt *** VarP) vp)
--    let ct' = map (fixVars vp) ct
--    pack' <- [|Data.Text.pack|]
--    tomsg <- [|toMessage|]
--    let ct'' = map (toH pack' tomsg) ct'
--    mapp <- [|mappend|]
--    let app a b = InfixE (Just a) mapp (Just b)
--    e <-
--        case ct'' of
--            [] -> [|mempty|]
--            [x] -> return x
--            (x:xs) -> return $ foldl' app x xs
--    return (pat, e)
--  where
--    toH pack' _ (Raw s) = pack' `AppE` SigE (LitE (StringL s)) (ConT ''String)
--    toH _ tomsg (Var d) = tomsg `AppE` derefToExp [] d
--    go x = do
--        let y = mkName $ '_' : x
--        return (x, y)
--    fixVars vp (Var d) = Var $ fixDeref vp d
--    fixVars _ (Raw s) = Raw s
--    fixDeref vp (DerefIdent (Ident i)) = DerefIdent $ Ident $ fixIdent vp i
--    fixDeref vp (DerefBranch a b) = DerefBranch (fixDeref vp a) (fixDeref vp b)
--    fixDeref _ d = d
--    fixIdent vp i =
--        case lookup i vp of
--            Nothing -> i
--            Just y -> nameBase y
--
--sToClause :: String -> String -> SDef -> Q Clause
--sToClause prefix dt sdef = do
--    (pat, bod) <- mkBody dt (prefix ++ sconstr sdef) (map fst $ svars sdef) (scontent sdef)
--    return $ Clause
--        [WildP, ConP (mkName "[]") [], pat]
--        (NormalB bod)
--        []
--
--defClause :: Q Clause
--defClause = do
--    a <- newName "sub"
--    c <- newName "langs"
--    d <- newName "msg"
--    rm <- [|renderMessage|]
--    return $ Clause
--        [VarP a, ConP (mkName ":") [WildP, VarP c], VarP d]
--        (NormalB $ rm `AppE` VarE a `AppE` VarE c `AppE` VarE d)
--        []
--
- toCon :: String -> SDef -> Con
- toCon dt (SDef c vs _) =
-     RecC (mkName $ "Msg" ++ c) $ map go vs
-@@ -257,39 +120,6 @@ varName a y =
-     upper (x:xs) = toUpper x : xs
-     upper [] = []
- 
--checkDef :: [SDef] -> [Def] -> Q ()
--checkDef x y =
--    go (sortBy (comparing sconstr) x) (sortBy (comparing constr) y)
--  where
--    go _ [] = return ()
--    go [] (b:_) = error $ "Extra message constructor: " ++ constr b
--    go (a:as) (b:bs)
--        | sconstr a < constr b = go as (b:bs)
--        | sconstr a > constr b = error $ "Extra message constructor: " ++ constr b
--        | otherwise = do
--            go' (svars a) (vars b)
--            go as bs
--    go' ((an, at):as) ((bn, mbt):bs)
--        | an /= bn = error "Mismatched variable names"
--        | otherwise =
--            case mbt of
--                Nothing -> go' as bs
--                Just bt
--                    | at == bt -> go' as bs
--                    | otherwise -> error "Mismatched variable types"
--    go' [] [] = return ()
--    go' _ _ = error "Mistmached variable count"
--
--toSDefs :: [Def] -> Q [SDef]
--toSDefs = mapM toSDef
--
--toSDef :: Def -> Q SDef
--toSDef d = do
--    vars' <- mapM go $ vars d
--    return $ SDef (constr d) vars' (content d)
--  where
--    go (a, Just b) = return (a, b)
--    go (a, Nothing) = error $ "Main language missing type for " ++ show (constr d, a)
- 
- data SDef = SDef
-     { sconstr :: String
--- 
-1.8.5.1
-
diff --git a/standalone/no-th/haskell-patches/shakespeare-js_0001-remove-TH.patch b/standalone/no-th/haskell-patches/shakespeare-js_0001-remove-TH.patch
deleted file mode 100644
--- a/standalone/no-th/haskell-patches/shakespeare-js_0001-remove-TH.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From be50798c9abc22648a0a3eb81db462abea79698c Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 17 Dec 2013 16:47:03 +0000
-Subject: [PATCH] remove TH
-
----
- Text/Coffee.hs     | 56 ++++-----------------------------------------
- Text/Julius.hs     | 67 +++++++++---------------------------------------------
- Text/Roy.hs        | 51 ++++-------------------------------------
- Text/TypeScript.hs | 51 ++++-------------------------------------
- 4 files changed, 24 insertions(+), 201 deletions(-)
-
-diff --git a/Text/Coffee.hs b/Text/Coffee.hs
-index 488c81b..61db85b 100644
---- a/Text/Coffee.hs
-+++ b/Text/Coffee.hs
-@@ -51,13 +51,13 @@ module Text.Coffee
-       -- ** Template-Reading Functions
-       -- | These QuasiQuoter and Template Haskell methods return values of
-       -- type @'JavascriptUrl' url@. See the Yesod book for details.
--      coffee
--    , coffeeFile
--    , coffeeFileReload
--    , coffeeFileDebug
-+    --  coffee
-+    --, coffeeFile
-+    --, coffeeFileReload
-+    --, coffeeFileDebug
- 
- #ifdef TEST_EXPORT
--    , coffeeSettings
-+    --, coffeeSettings
- #endif
-     ) where
- 
-@@ -65,49 +65,3 @@ import Language.Haskell.TH.Quote (QuasiQuoter (..))
- import Language.Haskell.TH.Syntax
- import Text.Shakespeare
- import Text.Julius
--
--coffeeSettings :: Q ShakespeareSettings
--coffeeSettings = do
--  jsettings <- javascriptSettings
--  return $ jsettings { varChar = '%'
--  , preConversion = Just PreConvert {
--      preConvert = ReadProcess "coffee" ["-spb"]
--    , preEscapeIgnoreBalanced = "'\"`"     -- don't insert backtacks for variable already inside strings or backticks.
--    , preEscapeIgnoreLine = "#"            -- ignore commented lines
--    , wrapInsertion = Just WrapInsertion { 
--        wrapInsertionIndent = Just "  "
--      , wrapInsertionStartBegin = "("
--      , wrapInsertionSeparator = ", "
--      , wrapInsertionStartClose = ") =>"
--      , wrapInsertionEnd = ""
--      , wrapInsertionAddParens = False
--      }
--    }
--  }
--
---- | Read inline, quasiquoted CoffeeScript.
--coffee :: QuasiQuoter
--coffee = QuasiQuoter { quoteExp = \s -> do
--    rs <- coffeeSettings
--    quoteExp (shakespeare rs) s
--    }
--
---- | Read in a CoffeeScript template file. This function reads the file once, at
---- compile time.
--coffeeFile :: FilePath -> Q Exp
--coffeeFile fp = do
--    rs <- coffeeSettings
--    shakespeareFile rs fp
--
---- | Read in a CoffeeScript template file. This impure function uses
---- unsafePerformIO to re-read the file on every call, allowing for rapid
---- iteration.
--coffeeFileReload :: FilePath -> Q Exp
--coffeeFileReload fp = do
--    rs <- coffeeSettings
--    shakespeareFileReload rs fp
--
---- | Deprecated synonym for 'coffeeFileReload'
--coffeeFileDebug :: FilePath -> Q Exp
--coffeeFileDebug = coffeeFileReload
--{-# DEPRECATED coffeeFileDebug "Please use coffeeFileReload instead." #-}
-diff --git a/Text/Julius.hs b/Text/Julius.hs
-index ec30690..5b5a075 100644
---- a/Text/Julius.hs
-+++ b/Text/Julius.hs
-@@ -14,17 +14,17 @@ module Text.Julius
-       -- ** Template-Reading Functions
-       -- | These QuasiQuoter and Template Haskell methods return values of
-       -- type @'JavascriptUrl' url@. See the Yesod book for details.
--      js
--    , julius
--    , juliusFile
--    , jsFile
--    , juliusFileDebug
--    , jsFileDebug
--    , juliusFileReload
--    , jsFileReload
-+    -- js
-+    -- julius
-+    -- juliusFile
-+    -- jsFile
-+    --, juliusFileDebug
-+    --, jsFileDebug
-+    --, juliusFileReload
-+    --, jsFileReload
- 
-       -- * Datatypes
--    , JavascriptUrl
-+      JavascriptUrl
-     , Javascript (..)
-     , RawJavascript (..)
- 
-@@ -37,9 +37,9 @@ module Text.Julius
-     , renderJavascriptUrl
- 
-       -- ** internal, used by 'Text.Coffee'
--    , javascriptSettings
-+    --, javascriptSettings
-       -- ** internal
--    , juliusUsedIdentifiers
-+    --, juliusUsedIdentifiers
-     , asJavascriptUrl
-     ) where
- 
-@@ -102,48 +102,3 @@ instance RawJS TL.Text where rawJS = RawJavascript . fromLazyText
- instance RawJS Builder where rawJS = RawJavascript
- instance RawJS Bool where rawJS = RawJavascript . unJavascript . toJavascript
- 
--javascriptSettings :: Q ShakespeareSettings
--javascriptSettings = do
--  toJExp <- [|toJavascript|]
--  wrapExp <- [|Javascript|]
--  unWrapExp <- [|unJavascript|]
--  asJavascriptUrl' <- [|asJavascriptUrl|]
--  return $ defaultShakespeareSettings { toBuilder = toJExp
--  , wrap = wrapExp
--  , unwrap = unWrapExp
--  , modifyFinalValue = Just asJavascriptUrl'
--  }
--
--js, julius :: QuasiQuoter
--js = QuasiQuoter { quoteExp = \s -> do
--    rs <- javascriptSettings
--    quoteExp (shakespeare rs) s
--    }
--
--julius = js
--
--jsFile, juliusFile :: FilePath -> Q Exp
--jsFile fp = do
--    rs <- javascriptSettings
--    shakespeareFile rs fp
--
--juliusFile = jsFile
--
--
--jsFileReload, juliusFileReload :: FilePath -> Q Exp
--jsFileReload fp = do
--    rs <- javascriptSettings
--    shakespeareFileReload rs fp
--
--juliusFileReload = jsFileReload
--
--jsFileDebug, juliusFileDebug :: FilePath -> Q Exp
--juliusFileDebug = jsFileReload
--{-# DEPRECATED juliusFileDebug "Please use juliusFileReload instead." #-}
--jsFileDebug = jsFileReload
--{-# DEPRECATED jsFileDebug "Please use jsFileReload instead." #-}
--
---- | Determine which identifiers are used by the given template, useful for
---- creating systems like yesod devel.
--juliusUsedIdentifiers :: String -> [(Deref, VarType)]
--juliusUsedIdentifiers = shakespeareUsedIdentifiers defaultShakespeareSettings
-diff --git a/Text/Roy.hs b/Text/Roy.hs
-index 8bffc5a..8bf2a09 100644
---- a/Text/Roy.hs
-+++ b/Text/Roy.hs
-@@ -39,12 +39,12 @@ module Text.Roy
-       -- ** Template-Reading Functions
-       -- | These QuasiQuoter and Template Haskell methods return values of
-       -- type @'JavascriptUrl' url@. See the Yesod book for details.
--      roy
--    , royFile
--    , royFileReload
-+    --  roy
-+    --, royFile
-+    --, royFileReload
- 
- #ifdef TEST_EXPORT
--    , roySettings
-+    --, roySettings
- #endif
-     ) where
- 
-@@ -53,46 +53,3 @@ import Language.Haskell.TH.Syntax
- import Text.Shakespeare
- import Text.Julius
- 
---- | The Roy language compiles down to Javascript.
---- We do this compilation once at compile time to avoid needing to do it during the request.
---- We call this a preConversion because other shakespeare modules like Lucius use Haskell to compile during the request instead rather than a system call.
--roySettings :: Q ShakespeareSettings
--roySettings = do
--  jsettings <- javascriptSettings
--  return $ jsettings { varChar = '#'
--  , preConversion = Just PreConvert {
--      preConvert = ReadProcess "roy" ["--stdio", "--browser"]
--    , preEscapeIgnoreBalanced = "'\""
--    , preEscapeIgnoreLine = "//"
--    , wrapInsertion = Just WrapInsertion {
--        wrapInsertionIndent = Just "  "
--      , wrapInsertionStartBegin = "(\\"
--      , wrapInsertionSeparator = " "
--      , wrapInsertionStartClose = " ->\n"
--      , wrapInsertionEnd = ")"
--      , wrapInsertionAddParens = True
--      }
--    }
--  }
--
---- | Read inline, quasiquoted Roy.
--roy :: QuasiQuoter
--roy = QuasiQuoter { quoteExp = \s -> do
--    rs <- roySettings
--    quoteExp (shakespeare rs) s
--    }
--
---- | Read in a Roy template file. This function reads the file once, at
---- compile time.
--royFile :: FilePath -> Q Exp
--royFile fp = do
--    rs <- roySettings
--    shakespeareFile rs fp
--
---- | Read in a Roy template file. This impure function uses
---- unsafePerformIO to re-read the file on every call, allowing for rapid
---- iteration.
--royFileReload :: FilePath -> Q Exp
--royFileReload fp = do
--    rs <- roySettings
--    shakespeareFileReload rs fp
-diff --git a/Text/TypeScript.hs b/Text/TypeScript.hs
-index 70c8820..5be994a 100644
---- a/Text/TypeScript.hs
-+++ b/Text/TypeScript.hs
-@@ -57,12 +57,12 @@ module Text.TypeScript
-       -- ** Template-Reading Functions
-       -- | These QuasiQuoter and Template Haskell methods return values of
-       -- type @'JavascriptUrl' url@. See the Yesod book for details.
--      tsc
--    , typeScriptFile
--    , typeScriptFileReload
-+    --  tsc
-+    --, typeScriptFile
-+    --, typeScriptFileReload
- 
- #ifdef TEST_EXPORT
--    , typeScriptSettings
-+    --, typeScriptSettings
- #endif
-     ) where
- 
-@@ -71,46 +71,3 @@ import Language.Haskell.TH.Syntax
- import Text.Shakespeare
- import Text.Julius
- 
---- | The TypeScript language compiles down to Javascript.
---- We do this compilation once at compile time to avoid needing to do it during the request.
---- We call this a preConversion because other shakespeare modules like Lucius use Haskell to compile during the request instead rather than a system call.
--typeScriptSettings :: Q ShakespeareSettings
--typeScriptSettings = do
--  jsettings <- javascriptSettings
--  return $ jsettings { varChar = '#'
--  , preConversion = Just PreConvert {
--      preConvert = ReadProcess "sh" ["-c", "TMP_IN=$(mktemp XXXXXXXXXX.ts); TMP_OUT=$(mktemp XXXXXXXXXX.js); cat /dev/stdin > ${TMP_IN} && tsc --out ${TMP_OUT} ${TMP_IN} && cat ${TMP_OUT}; rm ${TMP_IN} && rm ${TMP_OUT}"]
--    , preEscapeIgnoreBalanced = "'\""
--    , preEscapeIgnoreLine = "//"
--    , wrapInsertion = Just WrapInsertion { 
--        wrapInsertionIndent = Nothing
--      , wrapInsertionStartBegin = ";(function("
--      , wrapInsertionSeparator = ", "
--      , wrapInsertionStartClose = "){"
--      , wrapInsertionEnd = "})"
--      , wrapInsertionAddParens = False
--      }
--    }
--  }
--
---- | Read inline, quasiquoted TypeScript
--tsc :: QuasiQuoter
--tsc = QuasiQuoter { quoteExp = \s -> do
--    rs <- typeScriptSettings
--    quoteExp (shakespeare rs) s
--    }
--
---- | Read in a TypeScript template file. This function reads the file once, at
---- compile time.
--typeScriptFile :: FilePath -> Q Exp
--typeScriptFile fp = do
--    rs <- typeScriptSettings
--    shakespeareFile rs fp
--
---- | Read in a Roy template file. This impure function uses
---- unsafePerformIO to re-read the file on every call, allowing for rapid
---- iteration.
--typeScriptFileReload :: FilePath -> Q Exp
--typeScriptFileReload fp = do
--    rs <- typeScriptSettings
--    shakespeareFileReload rs fp
--- 
-1.8.5.1
-
diff --git a/standalone/no-th/haskell-patches/shakespeare-text_remove-TH.patch b/standalone/no-th/haskell-patches/shakespeare-text_remove-TH.patch
deleted file mode 100644
--- a/standalone/no-th/haskell-patches/shakespeare-text_remove-TH.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From f94ab5c4fe8f01cb9353a9d246e8f7c48475d834 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Wed, 18 Dec 2013 04:10:23 +0000
-Subject: [PATCH] remove TH
-
----
- Text/Shakespeare/Text.hs | 125 +++++------------------------------------------
- 1 file changed, 11 insertions(+), 114 deletions(-)
-
-diff --git a/Text/Shakespeare/Text.hs b/Text/Shakespeare/Text.hs
-index 738164b..65818ee 100644
---- a/Text/Shakespeare/Text.hs
-+++ b/Text/Shakespeare/Text.hs
-@@ -7,18 +7,18 @@ module Text.Shakespeare.Text
-     ( TextUrl
-     , ToText (..)
-     , renderTextUrl
--    , stext
--    , text
--    , textFile
--    , textFileDebug
--    , textFileReload
--    , st -- | strict text
--    , lt -- | lazy text, same as stext :)
-+    --, stext
-+    --, text
-+    --, textFile
-+    --, textFileDebug
-+    --, textFileReload
-+    --, st -- | strict text
-+    --, lt -- | lazy text, same as stext :)
-     -- * Yesod code generation
--    , codegen
--    , codegenSt
--    , codegenFile
--    , codegenFileReload
-+    --, codegen
-+    --, codegenSt
-+    --, codegenFile
-+    --, codegenFileReload
-     ) where
- 
- import Language.Haskell.TH.Quote (QuasiQuoter (..))
-@@ -43,106 +43,3 @@ instance ToText TL.Text where toText = fromLazyText
- instance ToText Int32 where toText = toText . show
- instance ToText Int64 where toText = toText . show
- 
--settings :: Q ShakespeareSettings
--settings = do
--  toTExp <- [|toText|]
--  wrapExp <- [|id|]
--  unWrapExp <- [|id|]
--  return $ defaultShakespeareSettings { toBuilder = toTExp
--  , wrap = wrapExp
--  , unwrap = unWrapExp
--  }
--
--
--stext, lt, st, text :: QuasiQuoter
--stext = 
--  QuasiQuoter { quoteExp = \s -> do
--    rs <- settings
--    render <- [|toLazyText|]
--    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
--    return (render `AppE` rendered)
--    }
--lt = stext
--
--st = 
--  QuasiQuoter { quoteExp = \s -> do
--    rs <- settings
--    render <- [|TL.toStrict . toLazyText|]
--    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
--    return (render `AppE` rendered)
--    }
--
--text = QuasiQuoter { quoteExp = \s -> do
--    rs <- settings
--    quoteExp (shakespeare rs) $ filter (/='\r') s
--    }
--
--
--textFile :: FilePath -> Q Exp
--textFile fp = do
--    rs <- settings
--    shakespeareFile rs fp
--
--
--textFileDebug :: FilePath -> Q Exp
--textFileDebug = textFileReload
--{-# DEPRECATED textFileDebug "Please use textFileReload instead" #-}
--
--textFileReload :: FilePath -> Q Exp
--textFileReload fp = do
--    rs <- settings
--    shakespeareFileReload rs fp
--
---- | codegen is designed for generating Yesod code, including templates
---- So it uses different interpolation characters that won't clash with templates.
--codegenSettings :: Q ShakespeareSettings
--codegenSettings = do
--  toTExp <- [|toText|]
--  wrapExp <- [|id|]
--  unWrapExp <- [|id|]
--  return $ defaultShakespeareSettings { toBuilder = toTExp
--  , wrap = wrapExp
--  , unwrap = unWrapExp
--  , varChar = '~'
--  , urlChar = '*'
--  , intChar = '&'
--  , justVarInterpolation = True -- always!
--  }
--
---- | codegen is designed for generating Yesod code, including templates
---- So it uses different interpolation characters that won't clash with templates.
---- You can use the normal text quasiquoters to generate code
--codegen :: QuasiQuoter
--codegen =
--  QuasiQuoter { quoteExp = \s -> do
--    rs <- codegenSettings
--    render <- [|toLazyText|]
--    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
--    return (render `AppE` rendered)
--    }
--
---- | Generates strict Text
---- codegen is designed for generating Yesod code, including templates
---- So it uses different interpolation characters that won't clash with templates.
--codegenSt :: QuasiQuoter
--codegenSt =
--  QuasiQuoter { quoteExp = \s -> do
--    rs <- codegenSettings
--    render <- [|TL.toStrict . toLazyText|]
--    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
--    return (render `AppE` rendered)
--    }
--
--codegenFileReload :: FilePath -> Q Exp
--codegenFileReload fp = do
--    rs <- codegenSettings
--    render <- [|TL.toStrict . toLazyText|]
--    rendered <- shakespeareFileReload rs{ justVarInterpolation = True } fp
--    return (render `AppE` rendered)
--
--codegenFile :: FilePath -> Q Exp
--codegenFile fp = do
--    rs <- codegenSettings
--    render <- [|TL.toStrict . toLazyText|]
--    rendered <- shakespeareFile rs{ justVarInterpolation = True } fp
--    return (render `AppE` rendered)
--- 
-1.8.5.1
-
diff --git a/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch b/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch
new file mode 100644
--- /dev/null
+++ b/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch
@@ -0,0 +1,1312 @@
+From a4b8a90dbb97392378a3c5980cbb9c033702dfb2 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Tue, 20 May 2014 21:17:27 +0000
+Subject: [PATCH] remove TN
+
+---
+ Text/Cassius.hs          |  23 ------
+ Text/Coffee.hs           |  56 ++-------------
+ Text/Css.hs              | 151 ----------------------------------------
+ Text/CssCommon.hs        |   4 --
+ Text/Hamlet.hs           |  86 +++++++----------------
+ Text/Hamlet/Parse.hs     |   3 +-
+ Text/Julius.hs           |  67 +++---------------
+ Text/Lucius.hs           |  46 +-----------
+ Text/Roy.hs              |  51 ++------------
+ Text/Shakespeare.hs      |  70 +++----------------
+ Text/Shakespeare/Base.hs |  28 --------
+ Text/Shakespeare/I18N.hs | 178 ++---------------------------------------------
+ Text/Shakespeare/Text.hs | 125 +++------------------------------
+ shakespeare.cabal        |   2 +-
+ 14 files changed, 78 insertions(+), 812 deletions(-)
+
+diff --git a/Text/Cassius.hs b/Text/Cassius.hs
+index 91fc90f..c515807 100644
+--- a/Text/Cassius.hs
++++ b/Text/Cassius.hs
+@@ -13,10 +13,6 @@ module Text.Cassius
+     , renderCss
+     , renderCssUrl
+       -- * Parsing
+-    , cassius
+-    , cassiusFile
+-    , cassiusFileDebug
+-    , cassiusFileReload
+       -- * ToCss instances
+       -- ** Color
+     , Color (..)
+@@ -27,11 +23,8 @@ module Text.Cassius
+     , AbsoluteUnit (..)
+     , AbsoluteSize (..)
+     , absoluteSize
+-    , EmSize (..)
+-    , ExSize (..)
+     , PercentageSize (..)
+     , percentageSize
+-    , PixelSize (..)
+       -- * Internal
+     , cassiusUsedIdentifiers
+     ) where
+@@ -43,25 +36,9 @@ import Language.Haskell.TH.Quote (QuasiQuoter (..))
+ import Language.Haskell.TH.Syntax
+ import qualified Data.Text.Lazy as TL
+ import Text.CssCommon
+-import Text.Lucius (lucius)
+ import qualified Text.Lucius
+ import Text.IndentToBrace (i2b)
+ 
+-cassius :: QuasiQuoter
+-cassius = QuasiQuoter { quoteExp = quoteExp lucius . i2b }
+-
+-cassiusFile :: FilePath -> Q Exp
+-cassiusFile fp = do
+-#ifdef GHC_7_4
+-    qAddDependentFile fp
+-#endif
+-    contents <- fmap TL.unpack $ qRunIO $ readUtf8File fp
+-    quoteExp cassius contents
+-
+-cassiusFileDebug, cassiusFileReload :: FilePath -> Q Exp
+-cassiusFileDebug = cssFileDebug True [|Text.Lucius.parseTopLevels|] Text.Lucius.parseTopLevels
+-cassiusFileReload = cassiusFileDebug
+-
+ -- | Determine which identifiers are used by the given template, useful for
+ -- creating systems like yesod devel.
+ cassiusUsedIdentifiers :: String -> [(Deref, VarType)]
+diff --git a/Text/Coffee.hs b/Text/Coffee.hs
+index 488c81b..61db85b 100644
+--- a/Text/Coffee.hs
++++ b/Text/Coffee.hs
+@@ -51,13 +51,13 @@ module Text.Coffee
+       -- ** Template-Reading Functions
+       -- | These QuasiQuoter and Template Haskell methods return values of
+       -- type @'JavascriptUrl' url@. See the Yesod book for details.
+-      coffee
+-    , coffeeFile
+-    , coffeeFileReload
+-    , coffeeFileDebug
++    --  coffee
++    --, coffeeFile
++    --, coffeeFileReload
++    --, coffeeFileDebug
+ 
+ #ifdef TEST_EXPORT
+-    , coffeeSettings
++    --, coffeeSettings
+ #endif
+     ) where
+ 
+@@ -65,49 +65,3 @@ import Language.Haskell.TH.Quote (QuasiQuoter (..))
+ import Language.Haskell.TH.Syntax
+ import Text.Shakespeare
+ import Text.Julius
+-
+-coffeeSettings :: Q ShakespeareSettings
+-coffeeSettings = do
+-  jsettings <- javascriptSettings
+-  return $ jsettings { varChar = '%'
+-  , preConversion = Just PreConvert {
+-      preConvert = ReadProcess "coffee" ["-spb"]
+-    , preEscapeIgnoreBalanced = "'\"`"     -- don't insert backtacks for variable already inside strings or backticks.
+-    , preEscapeIgnoreLine = "#"            -- ignore commented lines
+-    , wrapInsertion = Just WrapInsertion { 
+-        wrapInsertionIndent = Just "  "
+-      , wrapInsertionStartBegin = "("
+-      , wrapInsertionSeparator = ", "
+-      , wrapInsertionStartClose = ") =>"
+-      , wrapInsertionEnd = ""
+-      , wrapInsertionAddParens = False
+-      }
+-    }
+-  }
+-
+--- | Read inline, quasiquoted CoffeeScript.
+-coffee :: QuasiQuoter
+-coffee = QuasiQuoter { quoteExp = \s -> do
+-    rs <- coffeeSettings
+-    quoteExp (shakespeare rs) s
+-    }
+-
+--- | Read in a CoffeeScript template file. This function reads the file once, at
+--- compile time.
+-coffeeFile :: FilePath -> Q Exp
+-coffeeFile fp = do
+-    rs <- coffeeSettings
+-    shakespeareFile rs fp
+-
+--- | Read in a CoffeeScript template file. This impure function uses
+--- unsafePerformIO to re-read the file on every call, allowing for rapid
+--- iteration.
+-coffeeFileReload :: FilePath -> Q Exp
+-coffeeFileReload fp = do
+-    rs <- coffeeSettings
+-    shakespeareFileReload rs fp
+-
+--- | Deprecated synonym for 'coffeeFileReload'
+-coffeeFileDebug :: FilePath -> Q Exp
+-coffeeFileDebug = coffeeFileReload
+-{-# DEPRECATED coffeeFileDebug "Please use coffeeFileReload instead." #-}
+diff --git a/Text/Css.hs b/Text/Css.hs
+index 75dc549..20c206c 100644
+--- a/Text/Css.hs
++++ b/Text/Css.hs
+@@ -166,22 +166,6 @@ cssUsedIdentifiers toi2b parseBlocks s' =
+         (scope, rest') = go rest
+     go' (Attr k v) = k ++ v
+ 
+-cssFileDebug :: Bool -- ^ perform the indent-to-brace conversion
+-             -> Q Exp
+-             -> Parser [TopLevel Unresolved]
+-             -> FilePath
+-             -> Q Exp
+-cssFileDebug toi2b parseBlocks' parseBlocks fp = do
+-    s <- fmap TL.unpack $ qRunIO $ readUtf8File fp
+-#ifdef GHC_7_4
+-    qAddDependentFile fp
+-#endif
+-    let vs = cssUsedIdentifiers toi2b parseBlocks s
+-    c <- mapM vtToExp vs
+-    cr <- [|cssRuntime toi2b|]
+-    parseBlocks'' <- parseBlocks'
+-    return $ cr `AppE` parseBlocks'' `AppE` (LitE $ StringL fp) `AppE` ListE c
+-
+ combineSelectors :: HasLeadingSpace
+                  -> [Contents]
+                  -> [Contents]
+@@ -287,18 +271,6 @@ cssRuntime toi2b parseBlocks fp cd render' = unsafePerformIO $ do
+ 
+     addScope scope = map (DerefIdent . Ident *** CDPlain . fromString) scope ++ cd
+ 
+-vtToExp :: (Deref, VarType) -> Q Exp
+-vtToExp (d, vt) = do
+-    d' <- lift d
+-    c' <- c vt
+-    return $ TupE [d', c' `AppE` derefToExp [] d]
+-  where
+-    c :: VarType -> Q Exp
+-    c VTPlain = [|CDPlain . toCss|]
+-    c VTUrl = [|CDUrl|]
+-    c VTUrlParam = [|CDUrlParam|]
+-    c VTMixin = [|CDMixin|]
+-
+ getVars :: Monad m => [(String, String)] -> Content -> m [(Deref, VarType)]
+ getVars _ ContentRaw{} = return []
+ getVars scope (ContentVar d) =
+@@ -342,111 +314,8 @@ compressBlock (Block x y blocks mixins) =
+     cc (ContentRaw a:ContentRaw b:c) = cc $ ContentRaw (a ++ b) : c
+     cc (a:b) = a : cc b
+ 
+-blockToMixin :: Name
+-             -> Scope
+-             -> Block Unresolved
+-             -> Q Exp
+-blockToMixin r scope (Block _sel props subblocks mixins) =
+-    [|Mixin
+-        { mixinAttrs    = concat
+-                        $ $(listE $ map go props)
+-                        : map mixinAttrs $mixinsE
+-        -- FIXME too many complications to implement sublocks for now...
+-        , mixinBlocks   = [] -- foldr (.) id $(listE $ map subGo subblocks) []
+-        }|]
+-      {-
+-      . foldr (.) id $(listE $ map subGo subblocks)
+-      . (concatMap mixinBlocks $mixinsE ++)
+-    |]
+-    -}
+-  where
+-    mixinsE = return $ ListE $ map (derefToExp []) mixins
+-    go (Attr x y) = conE 'Attr
+-        `appE` (contentsToBuilder r scope x)
+-        `appE` (contentsToBuilder r scope y)
+-    subGo (Block sel' b c d) = blockToCss r scope $ Block sel' b c d
+-
+-blockToCss :: Name
+-           -> Scope
+-           -> Block Unresolved
+-           -> Q Exp
+-blockToCss r scope (Block sel props subblocks mixins) =
+-    [|((Block
+-        { blockSelector = $(selectorToBuilder r scope sel)
+-        , blockAttrs    = concat
+-                        $ $(listE $ map go props)
+-                        : map mixinAttrs $mixinsE
+-        , blockBlocks   = ()
+-        , blockMixins   = ()
+-        } :: Block Resolved):)
+-      . foldr (.) id $(listE $ map subGo subblocks)
+-      . (concatMap mixinBlocks $mixinsE ++)
+-    |]
+-  where
+-    mixinsE = return $ ListE $ map (derefToExp []) mixins
+-    go (Attr x y) = conE 'Attr
+-        `appE` (contentsToBuilder r scope x)
+-        `appE` (contentsToBuilder r scope y)
+-    subGo (hls, Block sel' b c d) =
+-        blockToCss r scope $ Block sel'' b c d
+-      where
+-        sel'' = combineSelectors hls sel sel'
+-
+-selectorToBuilder :: Name -> Scope -> [Contents] -> Q Exp
+-selectorToBuilder r scope sels =
+-    contentsToBuilder r scope $ intercalate [ContentRaw ","] sels
+-
+-contentsToBuilder :: Name -> Scope -> [Content] -> Q Exp
+-contentsToBuilder r scope contents =
+-    appE [|mconcat|] $ listE $ map (contentToBuilder r scope) contents
+-
+-contentToBuilder :: Name -> Scope -> Content -> Q Exp
+-contentToBuilder _ _ (ContentRaw x) =
+-    [|fromText . pack|] `appE` litE (StringL x)
+-contentToBuilder _ scope (ContentVar d) =
+-    case d of
+-        DerefIdent (Ident s)
+-            | Just val <- lookup s scope -> [|fromText . pack|] `appE` litE (StringL val)
+-        _ -> [|toCss|] `appE` return (derefToExp [] d)
+-contentToBuilder r _ (ContentUrl u) =
+-    [|fromText|] `appE`
+-        (varE r `appE` return (derefToExp [] u) `appE` listE [])
+-contentToBuilder r _ (ContentUrlParam u) =
+-    [|fromText|] `appE`
+-        ([|uncurry|] `appE` varE r `appE` return (derefToExp [] u))
+-contentToBuilder _ _ ContentMixin{} = error "contentToBuilder on ContentMixin"
+-
+ type Scope = [(String, String)]
+ 
+-topLevelsToCassius :: [TopLevel Unresolved]
+-                   -> Q Exp
+-topLevelsToCassius a = do
+-    r <- newName "_render"
+-    lamE [varP r] $ appE [|CssNoWhitespace . foldr ($) []|] $ fmap ListE $ go r [] a
+-  where
+-    go _ _ [] = return []
+-    go r scope (TopBlock b:rest) = do
+-        e <- [|(++) $ map TopBlock ($(blockToCss r scope b) [])|]
+-        es <- go r scope rest
+-        return $ e : es
+-    go r scope (TopAtBlock name s b:rest) = do
+-        let s' = contentsToBuilder r scope s
+-        e <- [|(:) $ TopAtBlock $(lift name) $(s') $(blocksToCassius r scope b)|]
+-        es <- go r scope rest
+-        return $ e : es
+-    go r scope (TopAtDecl dec cs:rest) = do
+-        e <- [|(:) $ TopAtDecl $(lift dec) $(contentsToBuilder r scope cs)|]
+-        es <- go r scope rest
+-        return $ e : es
+-    go r scope (TopVar k v:rest) = go r ((k, v) : scope) rest
+-
+-blocksToCassius :: Name
+-                -> Scope
+-                -> [Block Unresolved]
+-                -> Q Exp
+-blocksToCassius r scope a = do
+-    appE [|foldr ($) []|] $ listE $ map (blockToCss r scope) a
+-
+ renderCss :: Css -> TL.Text
+ renderCss css =
+     toLazyText $ mconcat $ map go tops
+@@ -515,23 +384,3 @@ renderBlock haveWhiteSpace indent (Block sel attrs () ())
+         | haveWhiteSpace = fromString ";\n"
+         | otherwise = singleton ';'
+ 
+-instance Lift Mixin where
+-    lift (Mixin a b) = [|Mixin a b|]
+-instance Lift (Attr Unresolved) where
+-    lift (Attr k v) = [|Attr k v :: Attr Unresolved |]
+-instance Lift (Attr Resolved) where
+-    lift (Attr k v) = [|Attr $(liftBuilder k) $(liftBuilder v) :: Attr Resolved |]
+-
+-liftBuilder :: Builder -> Q Exp
+-liftBuilder b = [|fromText $ pack $(lift $ TL.unpack $ toLazyText b)|]
+-
+-instance Lift Content where
+-    lift (ContentRaw s) = [|ContentRaw s|]
+-    lift (ContentVar d) = [|ContentVar d|]
+-    lift (ContentUrl d) = [|ContentUrl d|]
+-    lift (ContentUrlParam d) = [|ContentUrlParam d|]
+-    lift (ContentMixin m) = [|ContentMixin m|]
+-instance Lift (Block Unresolved) where
+-    lift (Block a b c d) = [|Block a b c d|]
+-instance Lift (Block Resolved) where
+-    lift (Block a b () ()) = [|Block $(liftBuilder a) b () ()|]
+diff --git a/Text/CssCommon.hs b/Text/CssCommon.hs
+index 719e0a8..8c40e8c 100644
+--- a/Text/CssCommon.hs
++++ b/Text/CssCommon.hs
+@@ -1,4 +1,3 @@
+-{-# LANGUAGE TemplateHaskell #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE FlexibleInstances #-}
+ {-# LANGUAGE CPP #-}
+@@ -156,6 +155,3 @@ showSize :: Rational -> String -> String
+ showSize value' unit = printf "%f" value ++ unit
+   where value = fromRational value' :: Double
+ 
+-mkSizeType "EmSize" "em"
+-mkSizeType "ExSize" "ex"
+-mkSizeType "PixelSize" "px"
+diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
+index 9500ecb..ec8471a 100644
+--- a/Text/Hamlet.hs
++++ b/Text/Hamlet.hs
+@@ -11,36 +11,36 @@
+ module Text.Hamlet
+     ( -- * Plain HTML
+       Html
+-    , shamlet
+-    , shamletFile
+-    , xshamlet
+-    , xshamletFile
++    --, shamlet
++    --, shamletFile
++    --, xshamlet
++    --, xshamletFile
+       -- * Hamlet
+     , HtmlUrl
+-    , hamlet
+-    , hamletFile
+-    , hamletFileReload
+-    , ihamletFileReload
+-    , xhamlet
+-    , xhamletFile
++    --, hamlet
++    --, hamletFile
++    --, hamletFileReload
++    --, ihamletFileReload
++    --, xhamlet
++    --, xhamletFile
+       -- * I18N Hamlet
+     , HtmlUrlI18n
+-    , ihamlet
+-    , ihamletFile
++    --, ihamlet
++    --, ihamletFile
+       -- * Type classes
+     , ToAttributes (..)
+       -- * Internal, for making more
+     , HamletSettings (..)
+     , NewlineStyle (..)
+-    , hamletWithSettings
+-    , hamletFileWithSettings
++    --, hamletWithSettings
++    --, hamletFileWithSettings
+     , defaultHamletSettings
+     , xhtmlHamletSettings
+-    , Env (..)
+-    , HamletRules (..)
+-    , hamletRules
+-    , ihamletRules
+-    , htmlRules
++    --, Env (..)
++    --, HamletRules (..)
++    --, hamletRules
++    --, ihamletRules
++    --, htmlRules
+     , CloseStyle (..)
+       -- * Used by generated code
+     , condH
+@@ -110,47 +110,9 @@ type HtmlUrl url = Render url -> Html
+ -- | A function generating an 'Html' given a message translator and a URL rendering function.
+ type HtmlUrlI18n msg url = Translate msg -> Render url -> Html
+ 
+-docsToExp :: Env -> HamletRules -> Scope -> [Doc] -> Q Exp
+-docsToExp env hr scope docs = do
+-    exps <- mapM (docToExp env hr scope) docs
+-    case exps of
+-        [] -> [|return ()|]
+-        [x] -> return x
+-        _ -> return $ DoE $ map NoBindS exps
+-
+ unIdent :: Ident -> String
+ unIdent (Ident s) = s
+ 
+-bindingPattern :: Binding -> Q (Pat, [(Ident, Exp)])
+-bindingPattern (BindAs i@(Ident s) b) = do
+-    name <- newName s
+-    (pattern, scope) <- bindingPattern b
+-    return (AsP name pattern, (i, VarE name):scope)
+-bindingPattern (BindVar i@(Ident s))
+-    | all isDigit s = do
+-        return (LitP $ IntegerL $ read s, [])
+-    | otherwise = do
+-        name <- newName s
+-        return (VarP name, [(i, VarE name)])
+-bindingPattern (BindTuple is) = do
+-    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
+-    return (TupP patterns, concat scopes)
+-bindingPattern (BindList is) = do
+-    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
+-    return (ListP patterns, concat scopes)
+-bindingPattern (BindConstr con is) = do
+-    (patterns, scopes) <- fmap unzip $ mapM bindingPattern is
+-    return (ConP (mkConName con) patterns, concat scopes)
+-bindingPattern (BindRecord con fields wild) = do
+-    let f (Ident field,b) =
+-           do (p,s) <- bindingPattern b
+-              return ((mkName field,p),s)
+-    (patterns, scopes) <- fmap unzip $ mapM f fields
+-    (patterns1, scopes1) <- if wild
+-       then bindWildFields con $ map fst fields
+-       else return ([],[])
+-    return (RecP (mkConName con) (patterns++patterns1), concat scopes ++ scopes1)
+-
+ mkConName :: DataConstr -> Name
+ mkConName = mkName . conToStr
+ 
+@@ -158,6 +120,7 @@ conToStr :: DataConstr -> String
+ conToStr (DCUnqualified (Ident x)) = x
+ conToStr (DCQualified (Module xs) (Ident x)) = intercalate "." $ xs ++ [x]
+ 
++{-
+ -- Wildcards bind all of the unbound fields to variables whose name
+ -- matches the field name.
+ --
+@@ -296,10 +259,12 @@ hamlet = hamletWithSettings hamletRules defaultHamletSettings
+ 
+ xhamlet :: QuasiQuoter
+ xhamlet = hamletWithSettings hamletRules xhtmlHamletSettings
++-}
+ 
+ asHtmlUrl :: HtmlUrl url -> HtmlUrl url
+ asHtmlUrl = id
+ 
++{-
+ hamletRules :: Q HamletRules
+ hamletRules = do
+     i <- [|id|]
+@@ -360,6 +325,7 @@ hamletFromString :: Q HamletRules -> HamletSettings -> String -> Q Exp
+ hamletFromString qhr set s = do
+     hr <- qhr
+     hrWithEnv hr $ \env -> docsToExp env hr [] $ docFromString set s
++-}
+ 
+ docFromString :: HamletSettings -> String -> [Doc]
+ docFromString set s =
+@@ -367,6 +333,7 @@ docFromString set s =
+         Error s' -> error s'
+         Ok (_, d) -> d
+ 
++{-
+ hamletFileWithSettings :: Q HamletRules -> HamletSettings -> FilePath -> Q Exp
+ hamletFileWithSettings qhr set fp = do
+ #ifdef GHC_7_4
+@@ -408,6 +375,7 @@ strToExp s@(c:_)
+     | isUpper c = ConE $ mkName s
+     | otherwise = VarE $ mkName s
+ strToExp "" = error "strToExp on empty string"
++-}
+ 
+ -- | Checks for truth in the left value in each pair in the first argument. If
+ -- a true exists, then the corresponding right action is performed. Only the
+@@ -452,7 +420,7 @@ hamletUsedIdentifiers settings =
+ data HamletRuntimeRules = HamletRuntimeRules {
+                             hrrI18n :: Bool
+                           }
+-
++{-
+ hamletFileReloadWithSettings :: HamletRuntimeRules
+                              -> HamletSettings -> FilePath -> Q Exp
+ hamletFileReloadWithSettings hrr settings fp = do
+@@ -479,7 +447,7 @@ hamletFileReloadWithSettings hrr settings fp = do
+             c VTUrlParam = [|EUrlParam|]
+             c VTMixin = [|\r -> EMixin $ \c -> r c|]
+             c VTMsg = [|EMsg|]
+-
++-}
+ -- move to Shakespeare.Base?
+ readFileUtf8 :: FilePath -> IO String
+ readFileUtf8 fp = fmap TL.unpack $ readUtf8File fp
+diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
+index b7e2954..1f14946 100644
+--- a/Text/Hamlet/Parse.hs
++++ b/Text/Hamlet/Parse.hs
+@@ -616,6 +616,7 @@ data NewlineStyle = NoNewlines -- ^ never add newlines
+                   | DefaultNewlineStyle
+     deriving Show
+ 
++{-
+ instance Lift NewlineStyle where
+     lift NoNewlines = [|NoNewlines|]
+     lift NewlinesText = [|NewlinesText|]
+@@ -627,7 +628,7 @@ instance Lift (String -> CloseStyle) where
+ 
+ instance Lift HamletSettings where
+     lift (HamletSettings a b c d) = [|HamletSettings $(lift a) $(lift b) $(lift c) $(lift d)|]
+-
++-}
+ 
+ htmlEmptyTags :: Set String
+ htmlEmptyTags = Set.fromAscList
+diff --git a/Text/Julius.hs b/Text/Julius.hs
+index ec30690..5b5a075 100644
+--- a/Text/Julius.hs
++++ b/Text/Julius.hs
+@@ -14,17 +14,17 @@ module Text.Julius
+       -- ** Template-Reading Functions
+       -- | These QuasiQuoter and Template Haskell methods return values of
+       -- type @'JavascriptUrl' url@. See the Yesod book for details.
+-      js
+-    , julius
+-    , juliusFile
+-    , jsFile
+-    , juliusFileDebug
+-    , jsFileDebug
+-    , juliusFileReload
+-    , jsFileReload
++    -- js
++    -- julius
++    -- juliusFile
++    -- jsFile
++    --, juliusFileDebug
++    --, jsFileDebug
++    --, juliusFileReload
++    --, jsFileReload
+ 
+       -- * Datatypes
+-    , JavascriptUrl
++      JavascriptUrl
+     , Javascript (..)
+     , RawJavascript (..)
+ 
+@@ -37,9 +37,9 @@ module Text.Julius
+     , renderJavascriptUrl
+ 
+       -- ** internal, used by 'Text.Coffee'
+-    , javascriptSettings
++    --, javascriptSettings
+       -- ** internal
+-    , juliusUsedIdentifiers
++    --, juliusUsedIdentifiers
+     , asJavascriptUrl
+     ) where
+ 
+@@ -102,48 +102,3 @@ instance RawJS TL.Text where rawJS = RawJavascript . fromLazyText
+ instance RawJS Builder where rawJS = RawJavascript
+ instance RawJS Bool where rawJS = RawJavascript . unJavascript . toJavascript
+ 
+-javascriptSettings :: Q ShakespeareSettings
+-javascriptSettings = do
+-  toJExp <- [|toJavascript|]
+-  wrapExp <- [|Javascript|]
+-  unWrapExp <- [|unJavascript|]
+-  asJavascriptUrl' <- [|asJavascriptUrl|]
+-  return $ defaultShakespeareSettings { toBuilder = toJExp
+-  , wrap = wrapExp
+-  , unwrap = unWrapExp
+-  , modifyFinalValue = Just asJavascriptUrl'
+-  }
+-
+-js, julius :: QuasiQuoter
+-js = QuasiQuoter { quoteExp = \s -> do
+-    rs <- javascriptSettings
+-    quoteExp (shakespeare rs) s
+-    }
+-
+-julius = js
+-
+-jsFile, juliusFile :: FilePath -> Q Exp
+-jsFile fp = do
+-    rs <- javascriptSettings
+-    shakespeareFile rs fp
+-
+-juliusFile = jsFile
+-
+-
+-jsFileReload, juliusFileReload :: FilePath -> Q Exp
+-jsFileReload fp = do
+-    rs <- javascriptSettings
+-    shakespeareFileReload rs fp
+-
+-juliusFileReload = jsFileReload
+-
+-jsFileDebug, juliusFileDebug :: FilePath -> Q Exp
+-juliusFileDebug = jsFileReload
+-{-# DEPRECATED juliusFileDebug "Please use juliusFileReload instead." #-}
+-jsFileDebug = jsFileReload
+-{-# DEPRECATED jsFileDebug "Please use jsFileReload instead." #-}
+-
+--- | Determine which identifiers are used by the given template, useful for
+--- creating systems like yesod devel.
+-juliusUsedIdentifiers :: String -> [(Deref, VarType)]
+-juliusUsedIdentifiers = shakespeareUsedIdentifiers defaultShakespeareSettings
+diff --git a/Text/Lucius.hs b/Text/Lucius.hs
+index 346883d..f38492b 100644
+--- a/Text/Lucius.hs
++++ b/Text/Lucius.hs
+@@ -8,13 +8,9 @@
+ {-# OPTIONS_GHC -fno-warn-missing-fields #-}
+ module Text.Lucius
+     ( -- * Parsing
+-      lucius
+-    , luciusFile
+-    , luciusFileDebug
+-    , luciusFileReload
+       -- ** Mixins
+-    , luciusMixin
+-    , Mixin
++    -- luciusMixin
++      Mixin
+       -- ** Runtime
+     , luciusRT
+     , luciusRT'
+@@ -40,11 +36,8 @@ module Text.Lucius
+     , AbsoluteUnit (..)
+     , AbsoluteSize (..)
+     , absoluteSize
+-    , EmSize (..)
+-    , ExSize (..)
+     , PercentageSize (..)
+     , percentageSize
+-    , PixelSize (..)
+       -- * Internal
+     , parseTopLevels
+     , luciusUsedIdentifiers
+@@ -67,18 +60,6 @@ import Data.List (isSuffixOf)
+ import Control.Arrow (second)
+ import Text.Shakespeare (VarType)
+ 
+--- |
+---
+--- >>> renderCss ([lucius|foo{bar:baz}|] undefined)
+--- "foo{bar:baz}"
+-lucius :: QuasiQuoter
+-lucius = QuasiQuoter { quoteExp = luciusFromString }
+-
+-luciusFromString :: String -> Q Exp
+-luciusFromString s =
+-    topLevelsToCassius
+-  $ either (error . show) id $ parse parseTopLevels s s
+-
+ whiteSpace :: Parser ()
+ whiteSpace = many whiteSpace1 >> return ()
+ 
+@@ -218,17 +199,6 @@ parseComment = do
+     _ <- manyTill anyChar $ try $ string "*/"
+     return $ ContentRaw ""
+ 
+-luciusFile :: FilePath -> Q Exp
+-luciusFile fp = do
+-#ifdef GHC_7_4
+-    qAddDependentFile fp
+-#endif
+-    contents <- fmap TL.unpack $ qRunIO $ readUtf8File fp
+-    luciusFromString contents
+-
+-luciusFileDebug, luciusFileReload :: FilePath -> Q Exp
+-luciusFileDebug = cssFileDebug False [|parseTopLevels|] parseTopLevels
+-luciusFileReload = luciusFileDebug
+ 
+ parseTopLevels :: Parser [TopLevel Unresolved]
+ parseTopLevels =
+@@ -377,15 +347,3 @@ luciusRTMinified tl scope = either Left (Right . renderCss . CssNoWhitespace) $
+ -- creating systems like yesod devel.
+ luciusUsedIdentifiers :: String -> [(Deref, VarType)]
+ luciusUsedIdentifiers = cssUsedIdentifiers False parseTopLevels
+-
+-luciusMixin :: QuasiQuoter
+-luciusMixin = QuasiQuoter { quoteExp = luciusMixinFromString }
+-
+-luciusMixinFromString :: String -> Q Exp
+-luciusMixinFromString s' = do
+-    r <- newName "_render"
+-    case fmap compressBlock $ parse parseBlock s s of
+-        Left e -> error $ show e
+-        Right block -> blockToMixin r [] block
+-  where
+-    s = concat ["mixin{", s', "}"]
+diff --git a/Text/Roy.hs b/Text/Roy.hs
+index 6e5e246..9ab0dbc 100644
+--- a/Text/Roy.hs
++++ b/Text/Roy.hs
+@@ -39,12 +39,12 @@ module Text.Roy
+       -- ** Template-Reading Functions
+       -- | These QuasiQuoter and Template Haskell methods return values of
+       -- type @'JavascriptUrl' url@. See the Yesod book for details.
+-      roy
+-    , royFile
+-    , royFileReload
++    --  roy
++    --, royFile
++    --, royFileReload
+ 
+ #ifdef TEST_EXPORT
+-    , roySettings
++    --, roySettings
+ #endif
+     ) where
+ 
+@@ -53,46 +53,3 @@ import Language.Haskell.TH.Syntax
+ import Text.Shakespeare
+ import Text.Julius
+ 
+--- | The Roy language compiles down to Javascript.
+--- We do this compilation once at compile time to avoid needing to do it during the request.
+--- We call this a preConversion because other shakespeare modules like Lucius use Haskell to compile during the request instead rather than a system call.
+-roySettings :: Q ShakespeareSettings
+-roySettings = do
+-  jsettings <- javascriptSettings
+-  return $ jsettings { varChar = '#'
+-  , preConversion = Just PreConvert {
+-      preConvert = ReadProcess "roy" ["--stdio", "--browser"]
+-    , preEscapeIgnoreBalanced = "'\""
+-    , preEscapeIgnoreLine = "//"
+-    , wrapInsertion = Just WrapInsertion {
+-        wrapInsertionIndent = Just "  "
+-      , wrapInsertionStartBegin = "(\\"
+-      , wrapInsertionSeparator = " "
+-      , wrapInsertionStartClose = " ->\n"
+-      , wrapInsertionEnd = ")"
+-      , wrapInsertionAddParens = True
+-      }
+-    }
+-  }
+-
+--- | Read inline, quasiquoted Roy.
+-roy :: QuasiQuoter
+-roy = QuasiQuoter { quoteExp = \s -> do
+-    rs <- roySettings
+-    quoteExp (shakespeare rs) s
+-    }
+-
+--- | Read in a Roy template file. This function reads the file once, at
+--- compile time.
+-royFile :: FilePath -> Q Exp
+-royFile fp = do
+-    rs <- roySettings
+-    shakespeareFile rs fp
+-
+--- | Read in a Roy template file. This impure function uses
+--- unsafePerformIO to re-read the file on every call, allowing for rapid
+--- iteration.
+-royFileReload :: FilePath -> Q Exp
+-royFileReload fp = do
+-    rs <- roySettings
+-    shakespeareFileReload rs fp
+diff --git a/Text/Shakespeare.hs b/Text/Shakespeare.hs
+index 67d7dde..a510215 100644
+--- a/Text/Shakespeare.hs
++++ b/Text/Shakespeare.hs
+@@ -15,12 +15,12 @@ module Text.Shakespeare
+     , WrapInsertion (..)
+     , PreConversion (..)
+     , defaultShakespeareSettings
+-    , shakespeare
+-    , shakespeareFile
+-    , shakespeareFileReload
++    -- , shakespeare
++    -- , shakespeareFile
++    -- , shakespeareFileReload
+     -- * low-level
+-    , shakespeareFromString
+-    , shakespeareUsedIdentifiers
++    -- , shakespeareFromString
++    -- , shakespeareUsedIdentifiers
+     , RenderUrl
+     , VarType (..)
+     , Deref
+@@ -153,38 +153,6 @@ defaultShakespeareSettings = ShakespeareSettings {
+   , modifyFinalValue = Nothing
+ }
+ 
+-instance Lift PreConvert where
+-    lift (PreConvert convert ignore comment wrapInsertion) =
+-        [|PreConvert $(lift convert) $(lift ignore) $(lift comment) $(lift wrapInsertion)|]
+-
+-instance Lift WrapInsertion where
+-    lift (WrapInsertion indent sb sep sc e wp) =
+-        [|WrapInsertion $(lift indent) $(lift sb) $(lift sep) $(lift sc) $(lift e) $(lift wp)|]
+-
+-instance Lift PreConversion where
+-    lift (ReadProcess command args) =
+-        [|ReadProcess $(lift command) $(lift args)|]
+-    lift Id = [|Id|]
+-
+-instance Lift ShakespeareSettings where
+-    lift (ShakespeareSettings x1 x2 x3 x4 x5 x6 x7 x8 x9) =
+-        [|ShakespeareSettings
+-            $(lift x1) $(lift x2) $(lift x3)
+-            $(liftExp x4) $(liftExp x5) $(liftExp x6) $(lift x7) $(lift x8) $(liftMExp x9)|]
+-      where
+-        liftExp (VarE n) = [|VarE $(liftName n)|]
+-        liftExp (ConE n) = [|ConE $(liftName n)|]
+-        liftExp _ = error "liftExp only supports VarE and ConE"
+-        liftMExp Nothing = [|Nothing|]
+-        liftMExp (Just e) = [|Just|] `appE` liftExp e
+-        liftName (Name (OccName a) b) = [|Name (OccName $(lift a)) $(liftFlavour b)|]
+-        liftFlavour NameS = [|NameS|]
+-        liftFlavour (NameQ (ModName a)) = [|NameQ (ModName $(lift a))|]
+-        liftFlavour (NameU _) = error "liftFlavour NameU" -- [|NameU $(lift $ fromIntegral a)|]
+-        liftFlavour (NameL _) = error "liftFlavour NameL" -- [|NameU $(lift $ fromIntegral a)|]
+-        liftFlavour (NameG ns (PkgName p) (ModName m)) = [|NameG $(liftNS ns) (PkgName $(lift p)) (ModName $(lift m))|]
+-        liftNS VarName = [|VarName|]
+-        liftNS DataName = [|DataName|]
+ 
+ type QueryParameters = [(TS.Text, TS.Text)]
+ type RenderUrl url = (url -> QueryParameters -> TS.Text)
+@@ -348,6 +316,7 @@ pack' = TS.pack
+ {-# NOINLINE pack' #-}
+ #endif
+ 
++{-
+ contentsToShakespeare :: ShakespeareSettings -> [Content] -> Q Exp
+ contentsToShakespeare rs a = do
+     r <- newName "_render"
+@@ -399,16 +368,19 @@ shakespeareFile r fp =
+     qAddDependentFile fp >>
+ #endif
+         readFileQ fp >>= shakespeareFromString r
++-}
+ 
+ data VarType = VTPlain | VTUrl | VTUrlParam | VTMixin
+     deriving (Show, Eq, Ord, Enum, Bounded, Typeable, Data, Generic)
+ 
++{-
+ getVars :: Content -> [(Deref, VarType)]
+ getVars ContentRaw{} = []
+ getVars (ContentVar d) = [(d, VTPlain)]
+ getVars (ContentUrl d) = [(d, VTUrl)]
+ getVars (ContentUrlParam d) = [(d, VTUrlParam)]
+ getVars (ContentMix d) = [(d, VTMixin)]
++-}
+ 
+ data VarExp url = EPlain Builder
+                 | EUrl url
+@@ -417,8 +389,10 @@ data VarExp url = EPlain Builder
+ 
+ -- | Determine which identifiers are used by the given template, useful for
+ -- creating systems like yesod devel.
++{-
+ shakespeareUsedIdentifiers :: ShakespeareSettings -> String -> [(Deref, VarType)]
+ shakespeareUsedIdentifiers settings = concatMap getVars . contentFromString settings
++-}
+ 
+ type MTime = UTCTime
+ 
+@@ -435,28 +409,6 @@ insertReloadMap :: FilePath -> (MTime, [Content]) -> IO [Content]
+ insertReloadMap fp (mt, content) = atomicModifyIORef reloadMapRef
+   (\reloadMap -> (M.insert fp (mt, content) reloadMap, content))
+ 
+-shakespeareFileReload :: ShakespeareSettings -> FilePath -> Q Exp
+-shakespeareFileReload settings fp = do
+-    str <- readFileQ fp
+-    s <- qRunIO $ preFilter (Just fp) settings str
+-    let b = shakespeareUsedIdentifiers settings s
+-    c <- mapM vtToExp b
+-    rt <- [|shakespeareRuntime settings fp|]
+-    wrap' <- [|\x -> $(return $ wrap settings) . x|]
+-    return $ wrap' `AppE` (rt `AppE` ListE c)
+-  where
+-    vtToExp :: (Deref, VarType) -> Q Exp
+-    vtToExp (d, vt) = do
+-        d' <- lift d
+-        c' <- c vt
+-        return $ TupE [d', c' `AppE` derefToExp [] d]
+-      where
+-        c :: VarType -> Q Exp
+-        c VTPlain = [|EPlain . $(return $
+-          InfixE (Just $ unwrap settings) (VarE '(.)) (Just $ toBuilder settings))|]
+-        c VTUrl = [|EUrl|]
+-        c VTUrlParam = [|EUrlParam|]
+-        c VTMixin = [|\x -> EMixin $ \r -> $(return $ unwrap settings) $ x r|]
+ 
+ 
+ 
+diff --git a/Text/Shakespeare/Base.hs b/Text/Shakespeare/Base.hs
+index a0e983c..23b4692 100644
+--- a/Text/Shakespeare/Base.hs
++++ b/Text/Shakespeare/Base.hs
+@@ -52,34 +52,6 @@ data Deref = DerefModulesIdent [String] Ident
+            | DerefTuple [Deref]
+     deriving (Show, Eq, Read, Data, Typeable, Ord)
+ 
+-instance Lift Ident where
+-    lift (Ident s) = [|Ident|] `appE` lift s
+-instance Lift Deref where
+-    lift (DerefModulesIdent v s) = do
+-        dl <- [|DerefModulesIdent|]
+-        v' <- lift v
+-        s' <- lift s
+-        return $ dl `AppE` v' `AppE` s'
+-    lift (DerefIdent s) = do
+-        dl <- [|DerefIdent|]
+-        s' <- lift s
+-        return $ dl `AppE` s'
+-    lift (DerefBranch x y) = do
+-        x' <- lift x
+-        y' <- lift y
+-        db <- [|DerefBranch|]
+-        return $ db `AppE` x' `AppE` y'
+-    lift (DerefIntegral i) = [|DerefIntegral|] `appE` lift i
+-    lift (DerefRational r) = do
+-        n <- lift $ numerator r
+-        d <- lift $ denominator r
+-        per <- [|(%) :: Int -> Int -> Ratio Int|]
+-        dr <- [|DerefRational|]
+-        return $ dr `AppE` InfixE (Just n) per (Just d)
+-    lift (DerefString s) = [|DerefString|] `appE` lift s
+-    lift (DerefList x) = [|DerefList $(lift x)|]
+-    lift (DerefTuple x) = [|DerefTuple $(lift x)|]
+-
+ derefParens, derefCurlyBrackets :: UserParser a Deref
+ derefParens        = between (char '(') (char ')') parseDeref
+ derefCurlyBrackets = between (char '{') (char '}') parseDeref
+diff --git a/Text/Shakespeare/I18N.hs b/Text/Shakespeare/I18N.hs
+index a39a614..753cba7 100644
+--- a/Text/Shakespeare/I18N.hs
++++ b/Text/Shakespeare/I18N.hs
+@@ -52,10 +52,10 @@
+ --
+ -- You can also adapt those instructions for use with other systems.
+ module Text.Shakespeare.I18N
+-    ( mkMessage
+-    , mkMessageFor
+-    , mkMessageVariant
+-    , RenderMessage (..)
++    --( mkMessage
++    --, mkMessageFor
++    ---, mkMessageVariant
++    ( RenderMessage (..)
+     , ToMessage (..)
+     , SomeMessage (..)
+     , Lang
+@@ -106,143 +106,6 @@ instance RenderMessage master Text where
+ -- | an RFC1766 / ISO 639-1 language code (eg, @fr@, @en-GB@, etc).
+ type Lang = Text
+ 
+--- |generate translations from translation files
+---
+--- This function will:
+---
+---  1. look in the supplied subdirectory for files ending in @.msg@
+---
+---  2. generate a type based on the constructors found
+---
+---  3. create a 'RenderMessage' instance
+---
+-mkMessage :: String   -- ^ base name to use for translation type
+-          -> FilePath -- ^ subdirectory which contains the translation files
+-          -> Lang     -- ^ default translation language
+-          -> Q [Dec]
+-mkMessage dt folder lang =
+-    mkMessageCommon True "Msg" "Message" dt dt folder lang
+-
+-
+--- | create 'RenderMessage' instance for an existing data-type
+-mkMessageFor :: String     -- ^ master translation data type
+-             -> String     -- ^ existing type to add translations for
+-             -> FilePath   -- ^ path to translation folder
+-             -> Lang       -- ^ default language
+-             -> Q [Dec]
+-mkMessageFor master dt folder lang = mkMessageCommon False "" "" master dt folder lang
+-
+--- | create an additional set of translations for a type created by `mkMessage`
+-mkMessageVariant :: String     -- ^ master translation data type
+-                 -> String     -- ^ existing type to add translations for
+-                 -> FilePath   -- ^ path to translation folder
+-                 -> Lang       -- ^ default language
+-                 -> Q [Dec]
+-mkMessageVariant master dt folder lang = mkMessageCommon False "Msg" "Message" master dt folder lang
+-
+--- |used by 'mkMessage' and 'mkMessageFor' to generate a 'RenderMessage' and possibly a message data type
+-mkMessageCommon :: Bool      -- ^ generate a new datatype from the constructors found in the .msg files
+-                -> String    -- ^ string to append to constructor names
+-                -> String    -- ^ string to append to datatype name
+-                -> String    -- ^ base name of master datatype
+-                -> String    -- ^ base name of translation datatype
+-                -> FilePath  -- ^ path to translation folder
+-                -> Lang      -- ^ default lang
+-                -> Q [Dec]
+-mkMessageCommon genType prefix postfix master dt folder lang = do
+-    files <- qRunIO $ getDirectoryContents folder
+-    (_files', contents) <- qRunIO $ fmap (unzip . catMaybes) $ mapM (loadLang folder) files
+-#ifdef GHC_7_4
+-    mapM_ qAddDependentFile _files'
+-#endif
+-    sdef <-
+-        case lookup lang contents of
+-            Nothing -> error $ "Did not find main language file: " ++ unpack lang
+-            Just def -> toSDefs def
+-    mapM_ (checkDef sdef) $ map snd contents
+-    let mname = mkName $ dt ++ postfix
+-    c1 <- fmap concat $ mapM (toClauses prefix dt) contents
+-    c2 <- mapM (sToClause prefix dt) sdef
+-    c3 <- defClause
+-    return $
+-     ( if genType 
+-       then ((DataD [] mname [] (map (toCon dt) sdef) []) :)
+-       else id)
+-        [ InstanceD
+-            []
+-            (ConT ''RenderMessage `AppT` (ConT $ mkName master) `AppT` ConT mname)
+-            [ FunD (mkName "renderMessage") $ c1 ++ c2 ++ [c3]
+-            ]
+-        ]
+-
+-toClauses :: String -> String -> (Lang, [Def]) -> Q [Clause]
+-toClauses prefix dt (lang, defs) =
+-    mapM go defs
+-  where
+-    go def = do
+-        a <- newName "lang"
+-        (pat, bod) <- mkBody dt (prefix ++ constr def) (map fst $ vars def) (content def)
+-        guard <- fmap NormalG [|$(return $ VarE a) == pack $(lift $ unpack lang)|]
+-        return $ Clause
+-            [WildP, ConP (mkName ":") [VarP a, WildP], pat]
+-            (GuardedB [(guard, bod)])
+-            []
+-
+-mkBody :: String -- ^ datatype
+-       -> String -- ^ constructor
+-       -> [String] -- ^ variable names
+-       -> [Content]
+-       -> Q (Pat, Exp)
+-mkBody dt cs vs ct = do
+-    vp <- mapM go vs
+-    let pat = RecP (mkName cs) (map (varName dt *** VarP) vp)
+-    let ct' = map (fixVars vp) ct
+-    pack' <- [|Data.Text.pack|]
+-    tomsg <- [|toMessage|]
+-    let ct'' = map (toH pack' tomsg) ct'
+-    mapp <- [|mappend|]
+-    let app a b = InfixE (Just a) mapp (Just b)
+-    e <-
+-        case ct'' of
+-            [] -> [|mempty|]
+-            [x] -> return x
+-            (x:xs) -> return $ foldl' app x xs
+-    return (pat, e)
+-  where
+-    toH pack' _ (Raw s) = pack' `AppE` SigE (LitE (StringL s)) (ConT ''String)
+-    toH _ tomsg (Var d) = tomsg `AppE` derefToExp [] d
+-    go x = do
+-        let y = mkName $ '_' : x
+-        return (x, y)
+-    fixVars vp (Var d) = Var $ fixDeref vp d
+-    fixVars _ (Raw s) = Raw s
+-    fixDeref vp (DerefIdent (Ident i)) = DerefIdent $ Ident $ fixIdent vp i
+-    fixDeref vp (DerefBranch a b) = DerefBranch (fixDeref vp a) (fixDeref vp b)
+-    fixDeref _ d = d
+-    fixIdent vp i =
+-        case lookup i vp of
+-            Nothing -> i
+-            Just y -> nameBase y
+-
+-sToClause :: String -> String -> SDef -> Q Clause
+-sToClause prefix dt sdef = do
+-    (pat, bod) <- mkBody dt (prefix ++ sconstr sdef) (map fst $ svars sdef) (scontent sdef)
+-    return $ Clause
+-        [WildP, ConP (mkName "[]") [], pat]
+-        (NormalB bod)
+-        []
+-
+-defClause :: Q Clause
+-defClause = do
+-    a <- newName "sub"
+-    c <- newName "langs"
+-    d <- newName "msg"
+-    rm <- [|renderMessage|]
+-    return $ Clause
+-        [VarP a, ConP (mkName ":") [WildP, VarP c], VarP d]
+-        (NormalB $ rm `AppE` VarE a `AppE` VarE c `AppE` VarE d)
+-        []
+-
+ toCon :: String -> SDef -> Con
+ toCon dt (SDef c vs _) =
+     RecC (mkName $ "Msg" ++ c) $ map go vs
+@@ -258,39 +121,6 @@ varName a y =
+     upper (x:xs) = toUpper x : xs
+     upper [] = []
+ 
+-checkDef :: [SDef] -> [Def] -> Q ()
+-checkDef x y =
+-    go (sortBy (comparing sconstr) x) (sortBy (comparing constr) y)
+-  where
+-    go _ [] = return ()
+-    go [] (b:_) = error $ "Extra message constructor: " ++ constr b
+-    go (a:as) (b:bs)
+-        | sconstr a < constr b = go as (b:bs)
+-        | sconstr a > constr b = error $ "Extra message constructor: " ++ constr b
+-        | otherwise = do
+-            go' (svars a) (vars b)
+-            go as bs
+-    go' ((an, at):as) ((bn, mbt):bs)
+-        | an /= bn = error "Mismatched variable names"
+-        | otherwise =
+-            case mbt of
+-                Nothing -> go' as bs
+-                Just bt
+-                    | at == bt -> go' as bs
+-                    | otherwise -> error "Mismatched variable types"
+-    go' [] [] = return ()
+-    go' _ _ = error "Mistmached variable count"
+-
+-toSDefs :: [Def] -> Q [SDef]
+-toSDefs = mapM toSDef
+-
+-toSDef :: Def -> Q SDef
+-toSDef d = do
+-    vars' <- mapM go $ vars d
+-    return $ SDef (constr d) vars' (content d)
+-  where
+-    go (a, Just b) = return (a, b)
+-    go (a, Nothing) = error $ "Main language missing type for " ++ show (constr d, a)
+ 
+ data SDef = SDef
+     { sconstr :: String
+diff --git a/Text/Shakespeare/Text.hs b/Text/Shakespeare/Text.hs
+index 6865a5a..e25a8be 100644
+--- a/Text/Shakespeare/Text.hs
++++ b/Text/Shakespeare/Text.hs
+@@ -7,18 +7,18 @@ module Text.Shakespeare.Text
+     ( TextUrl
+     , ToText (..)
+     , renderTextUrl
+-    , stext
+-    , text
+-    , textFile
+-    , textFileDebug
+-    , textFileReload
+-    , st -- | strict text
+-    , lt -- | lazy text, same as stext :)
++    --, stext
++    --, text
++    --, textFile
++    --, textFileDebug
++    --, textFileReload
++    --, st -- | strict text
++    --, lt -- | lazy text, same as stext :)
+     -- * Yesod code generation
+-    , codegen
+-    , codegenSt
+-    , codegenFile
+-    , codegenFileReload
++    --, codegen
++    --, codegenSt
++    --, codegenFile
++    --, codegenFileReload
+     ) where
+ 
+ import Language.Haskell.TH.Quote (QuasiQuoter (..))
+@@ -45,106 +45,3 @@ instance ToText Int32 where toText = toText . show
+ instance ToText Int64 where toText = toText . show
+ instance ToText Int   where toText = toText . show
+ 
+-settings :: Q ShakespeareSettings
+-settings = do
+-  toTExp <- [|toText|]
+-  wrapExp <- [|id|]
+-  unWrapExp <- [|id|]
+-  return $ defaultShakespeareSettings { toBuilder = toTExp
+-  , wrap = wrapExp
+-  , unwrap = unWrapExp
+-  }
+-
+-
+-stext, lt, st, text :: QuasiQuoter
+-stext = 
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    render <- [|toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-lt = stext
+-
+-st = 
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+-text = QuasiQuoter { quoteExp = \s -> do
+-    rs <- settings
+-    quoteExp (shakespeare rs) $ filter (/='\r') s
+-    }
+-
+-
+-textFile :: FilePath -> Q Exp
+-textFile fp = do
+-    rs <- settings
+-    shakespeareFile rs fp
+-
+-
+-textFileDebug :: FilePath -> Q Exp
+-textFileDebug = textFileReload
+-{-# DEPRECATED textFileDebug "Please use textFileReload instead" #-}
+-
+-textFileReload :: FilePath -> Q Exp
+-textFileReload fp = do
+-    rs <- settings
+-    shakespeareFileReload rs fp
+-
+--- | codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+-codegenSettings :: Q ShakespeareSettings
+-codegenSettings = do
+-  toTExp <- [|toText|]
+-  wrapExp <- [|id|]
+-  unWrapExp <- [|id|]
+-  return $ defaultShakespeareSettings { toBuilder = toTExp
+-  , wrap = wrapExp
+-  , unwrap = unWrapExp
+-  , varChar = '~'
+-  , urlChar = '*'
+-  , intChar = '&'
+-  , justVarInterpolation = True -- always!
+-  }
+-
+--- | codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+--- You can use the normal text quasiquoters to generate code
+-codegen :: QuasiQuoter
+-codegen =
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- codegenSettings
+-    render <- [|toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+--- | Generates strict Text
+--- codegen is designed for generating Yesod code, including templates
+--- So it uses different interpolation characters that won't clash with templates.
+-codegenSt :: QuasiQuoter
+-codegenSt =
+-  QuasiQuoter { quoteExp = \s -> do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFromString rs { justVarInterpolation = True } s
+-    return (render `AppE` rendered)
+-    }
+-
+-codegenFileReload :: FilePath -> Q Exp
+-codegenFileReload fp = do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFileReload rs{ justVarInterpolation = True } fp
+-    return (render `AppE` rendered)
+-
+-codegenFile :: FilePath -> Q Exp
+-codegenFile fp = do
+-    rs <- codegenSettings
+-    render <- [|TL.toStrict . toLazyText|]
+-    rendered <- shakespeareFile rs{ justVarInterpolation = True } fp
+-    return (render `AppE` rendered)
+diff --git a/shakespeare.cabal b/shakespeare.cabal
+index a555c24..d73da26 100644
+--- a/shakespeare.cabal
++++ b/shakespeare.cabal
+@@ -62,8 +62,8 @@ library
+                      Text.Cassius
+                      Text.Shakespeare.Base
+                      Text.Shakespeare
+-    other-modules:   Text.Hamlet.Parse
+                      Text.Css
++    other-modules:   Text.Hamlet.Parse
+                      Text.MkSizeType
+                      Text.IndentToBrace
+                      Text.CssCommon
+-- 
+2.0.0.rc2
+
diff --git a/standalone/no-th/haskell-patches/shakespeare_remove-th.patch b/standalone/no-th/haskell-patches/shakespeare_remove-th.patch
deleted file mode 100644
--- a/standalone/no-th/haskell-patches/shakespeare_remove-th.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 753f8ce37e096a343f1dd02a696a287bc91c24a0 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Thu, 6 Mar 2014 22:34:03 +0000
-Subject: [PATCH] remove TH
-
----
- Text/Shakespeare.hs      | 73 ++++++++++--------------------------------------
- Text/Shakespeare/Base.hs | 28 -------------------
- 2 files changed, 14 insertions(+), 87 deletions(-)
-
-diff --git a/Text/Shakespeare.hs b/Text/Shakespeare.hs
-index 68e344f..aef741c 100644
---- a/Text/Shakespeare.hs
-+++ b/Text/Shakespeare.hs
-@@ -14,17 +14,20 @@ module Text.Shakespeare
-     , WrapInsertion (..)
-     , PreConversion (..)
-     , defaultShakespeareSettings
--    , shakespeare
--    , shakespeareFile
--    , shakespeareFileReload
-+    -- , shakespeare
-+    -- , shakespeareFile
-+    -- , shakespeareFileReload
-     -- * low-level
--    , shakespeareFromString
--    , shakespeareUsedIdentifiers
-+    -- , shakespeareFromString
-+    -- , shakespeareUsedIdentifiers
-     , RenderUrl
-     , VarType (..)
-     , Deref
-     , Parser
- 
-+    -- used by TH
-+    , pack'
-+
- #ifdef TEST_EXPORT
-     , preFilter
- #endif
-@@ -154,38 +157,6 @@ defaultShakespeareSettings = ShakespeareSettings {
-   , modifyFinalValue = Nothing
- }
- 
--instance Lift PreConvert where
--    lift (PreConvert convert ignore comment wrapInsertion) =
--        [|PreConvert $(lift convert) $(lift ignore) $(lift comment) $(lift wrapInsertion)|]
--
--instance Lift WrapInsertion where
--    lift (WrapInsertion indent sb sep sc e wp) =
--        [|WrapInsertion $(lift indent) $(lift sb) $(lift sep) $(lift sc) $(lift e) $(lift wp)|]
--
--instance Lift PreConversion where
--    lift (ReadProcess command args) =
--        [|ReadProcess $(lift command) $(lift args)|]
--    lift Id = [|Id|]
--
--instance Lift ShakespeareSettings where
--    lift (ShakespeareSettings x1 x2 x3 x4 x5 x6 x7 x8 x9) =
--        [|ShakespeareSettings
--            $(lift x1) $(lift x2) $(lift x3)
--            $(liftExp x4) $(liftExp x5) $(liftExp x6) $(lift x7) $(lift x8) $(liftMExp x9)|]
--      where
--        liftExp (VarE n) = [|VarE $(liftName n)|]
--        liftExp (ConE n) = [|ConE $(liftName n)|]
--        liftExp _ = error "liftExp only supports VarE and ConE"
--        liftMExp Nothing = [|Nothing|]
--        liftMExp (Just e) = [|Just|] `appE` liftExp e
--        liftName (Name (OccName a) b) = [|Name (OccName $(lift a)) $(liftFlavour b)|]
--        liftFlavour NameS = [|NameS|]
--        liftFlavour (NameQ (ModName a)) = [|NameQ (ModName $(lift a))|]
--        liftFlavour (NameU _) = error "liftFlavour NameU" -- [|NameU $(lift $ fromIntegral a)|]
--        liftFlavour (NameL _) = error "liftFlavour NameL" -- [|NameU $(lift $ fromIntegral a)|]
--        liftFlavour (NameG ns (PkgName p) (ModName m)) = [|NameG $(liftNS ns) (PkgName $(lift p)) (ModName $(lift m))|]
--        liftNS VarName = [|VarName|]
--        liftNS DataName = [|DataName|]
- 
- type QueryParameters = [(TS.Text, TS.Text)]
- type RenderUrl url = (url -> QueryParameters -> TS.Text)
-@@ -349,6 +320,7 @@ pack' = TS.pack
- {-# NOINLINE pack' #-}
- #endif
- 
-+{-
- contentsToShakespeare :: ShakespeareSettings -> [Content] -> Q Exp
- contentsToShakespeare rs a = do
-     r <- newName "_render"
-@@ -400,16 +372,19 @@ shakespeareFile r fp =
-     qAddDependentFile fp >>
- #endif
-         readFileQ fp >>= shakespeareFromString r
-+-}
- 
- data VarType = VTPlain | VTUrl | VTUrlParam | VTMixin
-     deriving (Show, Eq, Ord, Enum, Bounded, Typeable, Data, Generic)
- 
-+{-
- getVars :: Content -> [(Deref, VarType)]
- getVars ContentRaw{} = []
- getVars (ContentVar d) = [(d, VTPlain)]
- getVars (ContentUrl d) = [(d, VTUrl)]
- getVars (ContentUrlParam d) = [(d, VTUrlParam)]
- getVars (ContentMix d) = [(d, VTMixin)]
-+-}
- 
- data VarExp url = EPlain Builder
-                 | EUrl url
-@@ -418,8 +393,10 @@ data VarExp url = EPlain Builder
- 
- -- | Determine which identifiers are used by the given template, useful for
- -- creating systems like yesod devel.
-+{-
- shakespeareUsedIdentifiers :: ShakespeareSettings -> String -> [(Deref, VarType)]
- shakespeareUsedIdentifiers settings = concatMap getVars . contentFromString settings
-+-}
- 
- type MTime = UTCTime
- 
-@@ -436,28 +413,6 @@ insertReloadMap :: FilePath -> (MTime, [Content]) -> IO [Content]
- insertReloadMap fp (mt, content) = atomicModifyIORef reloadMapRef
-   (\reloadMap -> (M.insert fp (mt, content) reloadMap, content))
- 
--shakespeareFileReload :: ShakespeareSettings -> FilePath -> Q Exp
--shakespeareFileReload settings fp = do
--    str <- readFileQ fp
--    s <- qRunIO $ preFilter (Just fp) settings str
--    let b = shakespeareUsedIdentifiers settings s
--    c <- mapM vtToExp b
--    rt <- [|shakespeareRuntime settings fp|]
--    wrap' <- [|\x -> $(return $ wrap settings) . x|]
--    return $ wrap' `AppE` (rt `AppE` ListE c)
--  where
--    vtToExp :: (Deref, VarType) -> Q Exp
--    vtToExp (d, vt) = do
--        d' <- lift d
--        c' <- c vt
--        return $ TupE [d', c' `AppE` derefToExp [] d]
--      where
--        c :: VarType -> Q Exp
--        c VTPlain = [|EPlain . $(return $
--          InfixE (Just $ unwrap settings) (VarE '(.)) (Just $ toBuilder settings))|]
--        c VTUrl = [|EUrl|]
--        c VTUrlParam = [|EUrlParam|]
--        c VTMixin = [|\x -> EMixin $ \r -> $(return $ unwrap settings) $ x r|]
- 
- 
- 
-diff --git a/Text/Shakespeare/Base.hs b/Text/Shakespeare/Base.hs
-index a0e983c..23b4692 100644
---- a/Text/Shakespeare/Base.hs
-+++ b/Text/Shakespeare/Base.hs
-@@ -52,34 +52,6 @@ data Deref = DerefModulesIdent [String] Ident
-            | DerefTuple [Deref]
-     deriving (Show, Eq, Read, Data, Typeable, Ord)
- 
--instance Lift Ident where
--    lift (Ident s) = [|Ident|] `appE` lift s
--instance Lift Deref where
--    lift (DerefModulesIdent v s) = do
--        dl <- [|DerefModulesIdent|]
--        v' <- lift v
--        s' <- lift s
--        return $ dl `AppE` v' `AppE` s'
--    lift (DerefIdent s) = do
--        dl <- [|DerefIdent|]
--        s' <- lift s
--        return $ dl `AppE` s'
--    lift (DerefBranch x y) = do
--        x' <- lift x
--        y' <- lift y
--        db <- [|DerefBranch|]
--        return $ db `AppE` x' `AppE` y'
--    lift (DerefIntegral i) = [|DerefIntegral|] `appE` lift i
--    lift (DerefRational r) = do
--        n <- lift $ numerator r
--        d <- lift $ denominator r
--        per <- [|(%) :: Int -> Int -> Ratio Int|]
--        dr <- [|DerefRational|]
--        return $ dr `AppE` InfixE (Just n) per (Just d)
--    lift (DerefString s) = [|DerefString|] `appE` lift s
--    lift (DerefList x) = [|DerefList $(lift x)|]
--    lift (DerefTuple x) = [|DerefTuple $(lift x)|]
--
- derefParens, derefCurlyBrackets :: UserParser a Deref
- derefParens        = between (char '(') (char ')') parseDeref
- derefCurlyBrackets = between (char '{') (char '}') parseDeref
--- 
-1.9.0
-
diff --git a/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch b/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
--- a/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
+++ b/standalone/no-th/haskell-patches/wai-app-static_deal-with-TH.patch
@@ -1,6 +1,6 @@
-From 8cc398092892377d5fdbda990a2e860155422afa Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 07:29:39 +0000
+From 685d4d9fbb929ed1356f8346f573e187746aee4b Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Thu, 22 May 2014 16:29:20 -0400
 Subject: [PATCH] deal with TH
 
 Export modules referenced by it.
@@ -55,7 +55,7 @@
 -import WaiAppStatic.Storage.Embedded.TH
 +--import WaiAppStatic.Storage.Embedded.TH
 diff --git a/wai-app-static.cabal b/wai-app-static.cabal
-index 5d81150..8f8c144 100644
+index 925d350..e5d11a6 100644
 --- a/wai-app-static.cabal
 +++ b/wai-app-static.cabal
 @@ -33,7 +33,6 @@ library
@@ -66,10 +66,10 @@
                     , text                      >= 0.7
                     , blaze-builder             >= 0.2.1.4
                     , base64-bytestring         >= 0.1
-@@ -57,9 +56,8 @@ library
-                      WaiAppStatic.Storage.Embedded
+@@ -60,9 +59,8 @@ library
                       WaiAppStatic.Listing
                       WaiAppStatic.Types
+                      WaiAppStatic.CmdLine
 -    other-modules:   Util
                       WaiAppStatic.Storage.Embedded.Runtime
 -                     WaiAppStatic.Storage.Embedded.TH
@@ -78,5 +78,5 @@
      extensions:     CPP
  
 -- 
-1.8.5.1
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch b/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
--- a/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
+++ b/standalone/no-th/haskell-patches/yesod-auth_don-t-really-build.patch
@@ -1,19 +1,19 @@
-From 3eb7b0a42099721dc19363ac41319efeed4ac5f9 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 05:19:53 +0000
+From 9a8637661270d3c6a15e6aeca5e8983fe126bd27 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Wed, 21 May 2014 05:27:36 +0000
 Subject: [PATCH] don't really build
 
 ---
- yesod-auth.cabal |   11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
+ yesod-auth.cabal | 10 ----------
+ 1 file changed, 10 deletions(-)
 
 diff --git a/yesod-auth.cabal b/yesod-auth.cabal
-index 591ced5..11217be 100644
+index 0872581..723cde0 100644
 --- a/yesod-auth.cabal
 +++ b/yesod-auth.cabal
-@@ -52,16 +52,7 @@ library
-                    , safe
-                    , time
+@@ -60,16 +60,6 @@ library
+                    , byteable
+                    , binary
  
 -    exposed-modules: Yesod.Auth
 -                     Yesod.Auth.BrowserId
@@ -21,14 +21,13 @@
 -                     Yesod.Auth.Email
 -                     Yesod.Auth.OpenId
 -                     Yesod.Auth.Rpxnow
--                     Yesod.Auth.HashDB
 -                     Yesod.Auth.Message
 -                     Yesod.Auth.GoogleEmail
 -    other-modules:   Yesod.Auth.Routes
-+    exposed-modules: 
+-                     Yesod.PasswordStore
      ghc-options:     -Wall
  
  source-repository head
 -- 
-1.7.10.4
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch b/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
--- a/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
+++ b/standalone/no-th/haskell-patches/yesod-core_expand_TH.patch
@@ -1,25 +1,24 @@
-From be8d5895522da0397fd594d5553ed7d3641eb399 Mon Sep 17 00:00:00 2001
+From ccea70b3cb02c3a9e7fa43ebfbfcfdda76f9307f Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 7 Mar 2014 01:40:29 +0000
-Subject: [PATCH] remove and expand TH
+Date: Wed, 21 May 2014 03:51:16 +0000
+Subject: [PATCH] expand and remove TH
 
-fix Loc from MonadLogger
 ---
  Yesod/Core.hs              |  30 +++---
  Yesod/Core/Class/Yesod.hs  | 257 ++++++++++++++++++++++++++++++---------------
- Yesod/Core/Dispatch.hs     |  37 ++-----
+ Yesod/Core/Dispatch.hs     |  38 ++-----
  Yesod/Core/Handler.hs      |  25 ++---
  Yesod/Core/Internal/Run.hs |   8 +-
  Yesod/Core/Internal/TH.hs  | 111 --------------------
  Yesod/Core/Types.hs        |   3 +-
  Yesod/Core/Widget.hs       |  32 +-----
- 8 files changed, 215 insertions(+), 288 deletions(-)
+ 8 files changed, 215 insertions(+), 289 deletions(-)
 
 diff --git a/Yesod/Core.hs b/Yesod/Core.hs
-index 12e59d5..2817a69 100644
+index 9b29317..7c0792d 100644
 --- a/Yesod/Core.hs
 +++ b/Yesod/Core.hs
-@@ -29,16 +29,16 @@ module Yesod.Core
+@@ -31,16 +31,16 @@ module Yesod.Core
      , unauthorizedI
        -- * Logging
      , LogLevel (..)
@@ -46,7 +45,7 @@
        -- * Sessions
      , SessionBackend (..)
      , customizeSessionCookies
-@@ -85,17 +85,15 @@ module Yesod.Core
+@@ -87,17 +87,15 @@ module Yesod.Core
      , readIntegral
        -- * Shakespeare
        -- ** Hamlet
@@ -409,7 +408,7 @@
 -    char = show . snd . loc_start
 +fileLocationToString loc = "unknown"
 diff --git a/Yesod/Core/Dispatch.hs b/Yesod/Core/Dispatch.hs
-index e6f489d..3ff37c1 100644
+index 59663a8..9408a95 100644
 --- a/Yesod/Core/Dispatch.hs
 +++ b/Yesod/Core/Dispatch.hs
 @@ -1,4 +1,3 @@
@@ -446,7 +445,7 @@
      , PathMultiPiece (..)
      , Texts
        -- * Convert to WAI
-@@ -128,13 +127,6 @@ toWaiAppLogger logger site = do
+@@ -130,13 +129,6 @@ toWaiAppLogger logger site = do
                  , yreSite = site
                  , yreSessionBackend = sb
                  }
@@ -460,10 +459,11 @@
      middleware <- mkDefaultMiddlewares logger
      return $ middleware $ toWaiAppYre yre
  
-@@ -163,13 +155,7 @@ warp port site = do
+@@ -165,14 +157,7 @@ warp port site = do
                  ]
              -}
              , Network.Wai.Handler.Warp.settingsOnException = const $ \e ->
+-                when (shouldLog' e) $
 -                messageLoggerSource
 -                    site
 -                    logger
@@ -471,11 +471,11 @@
 -                    "yesod-core"
 -                    LevelError
 -                    (toLogStr $ "Exception from Warp: " ++ show e)
-+		error (show e)
++                when (shouldLog' e) $ error (show e)
              }
- 
- -- | A default set of middlewares.
-@@ -194,7 +180,6 @@ mkDefaultMiddlewares logger = do
+   where
+     shouldLog' =
+@@ -206,7 +191,6 @@ defaultMiddlewaresNoLogging = acceptOverride . autohead . gzip def . methodOverr
  -- | Deprecated synonym for 'warp'.
  warpDebug :: YesodDispatch site => Int -> site -> IO ()
  warpDebug = warp
@@ -484,10 +484,10 @@
  -- | Runs your application using default middlewares (i.e., via 'toWaiApp'). It
  -- reads port information from the PORT environment variable, as used by tools
 diff --git a/Yesod/Core/Handler.hs b/Yesod/Core/Handler.hs
-index 7c561c5..847d475 100644
+index e5cbc44..db7c097 100644
 --- a/Yesod/Core/Handler.hs
 +++ b/Yesod/Core/Handler.hs
-@@ -164,7 +164,7 @@ import           Data.Text.Encoding            (decodeUtf8With, encodeUtf8)
+@@ -169,7 +169,7 @@ import           Data.Text.Encoding            (decodeUtf8With, encodeUtf8)
  import           Data.Text.Encoding.Error      (lenientDecode)
  import qualified Data.Text.Lazy                as TL
  import qualified Text.Blaze.Html.Renderer.Text as RenderText
@@ -496,15 +496,15 @@
  
  import qualified Data.ByteString               as S
  import qualified Data.ByteString.Lazy          as L
-@@ -198,6 +198,7 @@ import Data.CaseInsensitive (CI)
- #if MIN_VERSION_wai(2, 0, 0)
- import qualified System.PosixCompat.Files as PC
- #endif
+@@ -198,6 +198,7 @@ import Control.Exception (throwIO)
+ import Blaze.ByteString.Builder (Builder)
+ import Safe (headMay)
+ import Data.CaseInsensitive (CI)
 +import qualified Text.Blaze.Internal
- 
- get :: MonadHandler m => m GHState
- get = liftHandlerT $ HandlerT $ I.readIORef . handlerState
-@@ -748,19 +749,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
+ import           Control.Monad.Trans.Resource  (MonadResource, InternalState, runResourceT, withInternalState, getInternalState, liftResourceT, resourceForkIO
+ #if MIN_VERSION_wai(2, 0, 0)
+ #else
+@@ -806,19 +807,15 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
                 -> m a
  redirectToPost url = do
      urlText <- toTextUrl url
@@ -534,11 +534,11 @@
  -- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'.
  hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html
 diff --git a/Yesod/Core/Internal/Run.hs b/Yesod/Core/Internal/Run.hs
-index 10871a2..e8d1907 100644
+index 3e2e4e0..b92eadb 100644
 --- a/Yesod/Core/Internal/Run.hs
 +++ b/Yesod/Core/Internal/Run.hs
-@@ -15,8 +15,8 @@ import qualified Control.Exception            as E
- import           Control.Exception.Lifted     (catch)
+@@ -16,8 +16,8 @@ import           Control.Exception.Lifted     (catch)
+ import           Control.Monad                (mplus)
  import           Control.Monad.IO.Class       (MonadIO)
  import           Control.Monad.IO.Class       (liftIO)
 -import           Control.Monad.Logger         (LogLevel (LevelError), LogSource,
@@ -548,7 +548,7 @@
  import           Control.Monad.Trans.Resource (runResourceT, withInternalState, runInternalState, createInternalState, closeInternalState)
  import qualified Data.ByteString              as S
  import qualified Data.ByteString.Char8        as S8
-@@ -30,7 +30,7 @@ import qualified Data.Text                    as T
+@@ -31,7 +31,7 @@ import qualified Data.Text                    as T
  import           Data.Text.Encoding           (encodeUtf8)
  import           Data.Text.Encoding           (decodeUtf8With)
  import           Data.Text.Encoding.Error     (lenientDecode)
@@ -557,7 +557,7 @@
  import qualified Network.HTTP.Types           as H
  import           Network.Wai
  #if MIN_VERSION_wai(2, 0, 0)
-@@ -131,8 +131,6 @@ safeEh :: (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
+@@ -157,8 +157,6 @@ safeEh :: (Loc -> LogSource -> LogLevel -> LogStr -> IO ())
         -> ErrorResponse
         -> YesodApp
  safeEh log' er req = do
@@ -686,18 +686,18 @@
 -                ]
 -    return $ LetE [fun] (VarE helper)
 diff --git a/Yesod/Core/Types.hs b/Yesod/Core/Types.hs
-index de09f78..9183a64 100644
+index 7e3fd0d..994d322 100644
 --- a/Yesod/Core/Types.hs
 +++ b/Yesod/Core/Types.hs
-@@ -17,6 +17,7 @@ import           Control.Exception                  (Exception)
- import           Control.Monad                      (liftM, ap)
- import           Control.Monad.Base                 (MonadBase (liftBase))
+@@ -21,6 +21,7 @@ import           Control.Monad.Catch                (MonadCatch (..))
+ import           Control.Monad.Catch                (MonadMask (..))
+ #endif
  import           Control.Monad.IO.Class             (MonadIO (liftIO))
 +import qualified Control.Monad.Logger
  import           Control.Monad.Logger               (LogLevel, LogSource,
                                                       MonadLogger (..))
  import           Control.Monad.Trans.Control        (MonadBaseControl (..))
-@@ -179,7 +180,7 @@ data RunHandlerEnv site = RunHandlerEnv
+@@ -187,7 +188,7 @@ data RunHandlerEnv site = RunHandlerEnv
      , rheRoute    :: !(Maybe (Route site))
      , rheSite     :: !site
      , rheUpload   :: !(RequestBodyLength -> FileUpload)
@@ -707,7 +707,7 @@
        -- ^ How to respond when an error is thrown internally.
        --
 diff --git a/Yesod/Core/Widget.hs b/Yesod/Core/Widget.hs
-index a972efa..156cd45 100644
+index 481199e..8489fbe 100644
 --- a/Yesod/Core/Widget.hs
 +++ b/Yesod/Core/Widget.hs
 @@ -16,8 +16,8 @@ module Yesod.Core.Widget
@@ -730,7 +730,7 @@
      , asWidgetT
      ) where
  
-@@ -189,35 +189,9 @@ addScriptRemote = flip addScriptRemoteAttrs []
+@@ -207,35 +207,9 @@ addScriptRemote = flip addScriptRemoteAttrs []
  addScriptRemoteAttrs :: MonadWidget m => Text -> [(Text, Text)] -> m ()
  addScriptRemoteAttrs x y = tell $ GWData mempty mempty (toUnique $ Script (Remote x) y) mempty mempty mempty mempty
  
@@ -767,5 +767,5 @@
  ihamletToRepHtml :: (MonadHandler m, RenderMessage (HandlerSite m) message)
                   => HtmlUrlI18n message (Route (HandlerSite m))
 -- 
-1.9.0
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod-form_spliced-TH.patch b/standalone/no-th/haskell-patches/yesod-form_spliced-TH.patch
--- a/standalone/no-th/haskell-patches/yesod-form_spliced-TH.patch
+++ b/standalone/no-th/haskell-patches/yesod-form_spliced-TH.patch
@@ -1,19 +1,19 @@
-From 9f62992414f900fcafa00a838925e24c4365c50f Mon Sep 17 00:00:00 2001
+From 38834f94992679d8c4d936fec12eb32b82073553 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 7 Feb 2014 23:11:31 +0000
+Date: Wed, 21 May 2014 05:23:19 +0000
 Subject: [PATCH] splice TH
 
 ---
- Yesod/Form/Fields.hs    |  771 +++++++++++++++++++++++++++++++++++------------
- Yesod/Form/Functions.hs |  239 ++++++++++++---
- Yesod/Form/Jquery.hs    |  129 ++++++--
- Yesod/Form/MassInput.hs |  233 +++++++++++---
- Yesod/Form/Nic.hs       |   65 +++-
- yesod-form.cabal        |    1 +
- 6 files changed, 1127 insertions(+), 311 deletions(-)
+ Yesod/Form/Fields.hs    | 738 +++++++++++++++++++++++++++++++++---------------
+ Yesod/Form/Functions.hs | 289 +++++++++++++------
+ Yesod/Form/Jquery.hs    | 129 +++++++--
+ Yesod/Form/MassInput.hs | 233 ++++++++++++---
+ Yesod/Form/Nic.hs       |  65 ++++-
+ yesod-form.cabal        |   1 -
+ 6 files changed, 1054 insertions(+), 401 deletions(-)
 
 diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs
-index 97d0034..016c98b 100644
+index cd67820..46b5d96 100644
 --- a/Yesod/Form/Fields.hs
 +++ b/Yesod/Form/Fields.hs
 @@ -1,4 +1,3 @@
@@ -21,7 +21,17 @@
  {-# LANGUAGE TypeFamilies #-}
  {-# LANGUAGE OverloadedStrings #-}
  {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-@@ -36,15 +35,11 @@ module Yesod.Form.Fields
+@@ -18,9 +17,6 @@ module Yesod.Form.Fields
+     , timeField
+     , htmlField
+     , emailField
+-    , multiEmailField
+-    , searchField
+-    , AutoFocus
+     , urlField
+     , doubleField
+     , parseDate
+@@ -37,15 +33,11 @@ module Yesod.Form.Fields
      , selectFieldList
      , radioField
      , radioFieldList
@@ -37,8 +47,8 @@
      , optionsPairs
      , optionsEnum
      ) where
-@@ -70,6 +65,15 @@ import Text.HTML.SanitizeXSS (sanitizeBalance)
- import Control.Monad (when, unless)
+@@ -72,6 +64,15 @@ import Control.Monad (when, unless)
+ import Data.Either (partitionEithers)
  import Data.Maybe (listToMaybe, fromMaybe)
  
 +import qualified Text.Blaze as Text.Blaze.Internal
@@ -53,11 +63,11 @@
  import qualified Blaze.ByteString.Builder.Html.Utf8 as B
  import Blaze.ByteString.Builder (writeByteString, toLazyByteString)
  import Blaze.ByteString.Builder.Internal.Write (fromWriteList)
-@@ -82,14 +86,12 @@ import Data.Text (Text, unpack, pack)
+@@ -84,15 +85,12 @@ import Data.Text as T (Text, concat, intercalate, unpack, pack, splitOn)
  import qualified Data.Text.Read
  
  import qualified Data.Map as Map
--import Yesod.Persist (selectList, runDB, Filter, SelectOpt, Key, YesodPersist, PersistEntity, PersistQuery, YesodDB)
+-import Yesod.Persist (selectList, runDB, Filter, SelectOpt, Key, YesodPersist, PersistEntity, PersistQuery)
  import Control.Arrow ((&&&))
  
  import Control.Applicative ((<$>), (<|>))
@@ -65,10 +75,11 @@
  import Data.Attoparsec.Text (Parser, char, string, digit, skipSpace, endOfInput, parseOnly)
  
 -import Yesod.Persist.Core
- 
+-
  defaultFormMessage :: FormMessage -> Text
  defaultFormMessage = englishFormMessage
-@@ -102,10 +104,24 @@ intField = Field
+ 
+@@ -104,10 +102,24 @@ intField = Field
              Right (a, "") -> Right a
              _ -> Left $ MsgInvalidInteger s
  
@@ -97,7 +108,7 @@
      , fieldEnctype = UrlEncoded
      }
    where
-@@ -119,10 +135,24 @@ doubleField = Field
+@@ -121,10 +133,24 @@ doubleField = Field
              Right (a, "") -> Right a
              _ -> Left $ MsgInvalidNumber s
  
@@ -126,7 +137,7 @@
      , fieldEnctype = UrlEncoded
      }
    where showVal = either id (pack . show)
-@@ -130,10 +160,24 @@ $newline never
+@@ -132,10 +158,24 @@ $newline never
  dayField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Day
  dayField = Field
      { fieldParse = parseHelper $ parseDate . unpack
@@ -155,7 +166,7 @@
      , fieldEnctype = UrlEncoded
      }
    where showVal = either id (pack . show)
-@@ -141,10 +185,23 @@ $newline never
+@@ -143,10 +183,23 @@ $newline never
  timeField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m TimeOfDay
  timeField = Field
      { fieldParse = parseHelper parseTime
@@ -183,7 +194,7 @@
      , fieldEnctype = UrlEncoded
      }
    where
-@@ -157,10 +214,18 @@ $newline never
+@@ -159,10 +212,18 @@ $newline never
  htmlField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Html
  htmlField = Field
      { fieldParse = parseHelper $ Right . preEscapedText . sanitizeBalance
@@ -206,16 +217,16 @@
      , fieldEnctype = UrlEncoded
      }
    where showVal = either id (pack . renderHtml)
-@@ -169,8 +234,6 @@ $newline never
+@@ -171,8 +232,6 @@ $newline never
  -- br-tags.
  newtype Textarea = Textarea { unTextarea :: Text }
-     deriving (Show, Read, Eq, PersistField, Ord)
+     deriving (Show, Read, Eq, PersistField, Ord, ToJSON, FromJSON)
 -instance PersistFieldSql Textarea where
 -    sqlType _ = SqlString
  instance ToHtml Textarea where
      toHtml =
          unsafeByteString
-@@ -188,10 +251,18 @@ instance ToHtml Textarea where
+@@ -190,10 +249,18 @@ instance ToHtml Textarea where
  textareaField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Textarea
  textareaField = Field
      { fieldParse = parseHelper $ Right . Textarea
@@ -238,7 +249,7 @@
      , fieldEnctype = UrlEncoded
      }
  
-@@ -199,10 +270,19 @@ hiddenField :: (Monad m, PathPiece p, RenderMessage (HandlerSite m) FormMessage)
+@@ -201,10 +268,19 @@ hiddenField :: (Monad m, PathPiece p, RenderMessage (HandlerSite m) FormMessage)
              => Field m p
  hiddenField = Field
      { fieldParse = parseHelper $ maybe (Left MsgValueRequired) Right . fromPathPiece
@@ -262,7 +273,7 @@
      , fieldEnctype = UrlEncoded
      }
  
-@@ -210,20 +290,55 @@ textField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Tex
+@@ -212,20 +288,55 @@ textField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Tex
  textField = Field
      { fieldParse = parseHelper $ Right
      , fieldView = \theId name attrs val isReq ->
@@ -326,7 +337,7 @@
      , fieldEnctype = UrlEncoded
      }
  
-@@ -295,10 +410,24 @@ emailField = Field
+@@ -297,57 +408,24 @@ emailField = Field
              case Email.canonicalizeEmail $ encodeUtf8 s of
                  Just e -> Right $ decodeUtf8With lenientDecode e
                  Nothing -> Left $ MsgInvalidEmail s
@@ -334,6 +345,8 @@
 -$newline never
 -<input id="#{theId}" name="#{name}" *{attrs} type="email" :isReq:required="" value="#{either id id val}">
 -|]
+-    , fieldEnctype = UrlEncoded
+-    }
 +    , fieldView = \theId name attrs val isReq -> toWidget  $     \ _render_arQe
 +      -> do { id
 +                ((Text.Blaze.Internal.preEscapedText . pack) "<input id=\"");
@@ -351,49 +364,43 @@
 +              id ((Text.Blaze.Internal.preEscapedText . pack) "\"");
 +              id ((Text.Hamlet.attrsToHtml . toAttributes) attrs);
 +              id ((Text.Blaze.Internal.preEscapedText . pack) ">") }
-+
-     , fieldEnctype = UrlEncoded
-     }
  
-@@ -307,20 +436,78 @@ searchField :: Monad m => RenderMessage (HandlerSite m) FormMessage => AutoFocus
- searchField autoFocus = Field
-     { fieldParse = parseHelper Right
-     , fieldView = \theId name attrs val isReq -> do
--        [whamlet|\
+--- |
+---
+--- Since 1.3.7
+-multiEmailField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m [Text]
+-multiEmailField = Field
+-    { fieldParse = parseHelper $
+-        \s ->
+-            let addrs = map validate $ splitOn "," s
+-            in case partitionEithers addrs of
+-                ([], good) -> Right good
+-                (bad, _) -> Left $ MsgInvalidEmail $ cat bad
+-    , fieldView = \theId name attrs val isReq -> toWidget [hamlet|
 -$newline never
+-<input id="#{theId}" name="#{name}" *{attrs} type="email" multiple :isReq:required="" value="#{either id cat val}">
+-|]
+-    , fieldEnctype = UrlEncoded
+-    }
+-    where
+-        -- report offending address along with error
+-        validate a = case Email.validate $ encodeUtf8 a of
+-                        Left e -> Left $ T.concat [a, " (",  pack e, ")"]
+-                        Right r -> Right $ emailToText r
+-        cat = intercalate ", "
+-        emailToText = decodeUtf8With lenientDecode . Email.toByteString
+-
+-type AutoFocus = Bool
+-searchField :: Monad m => RenderMessage (HandlerSite m) FormMessage => AutoFocus -> Field m Text
+-searchField autoFocus = Field
+-    { fieldParse = parseHelper Right
+-    , fieldView = \theId name attrs val isReq -> do
+-        [whamlet|
+-$newline never
 -<input id="#{theId}" name="#{name}" *{attrs} type="search" :isReq:required="" :autoFocus:autofocus="" value="#{either id id val}">
 -|]
-+        do { (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) "<input id=\"");
-+             (Yesod.Core.Widget.asWidgetT . toWidget) (toHtml theId);
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) "\" name=\"");
-+             (Yesod.Core.Widget.asWidgetT . toWidget) (toHtml name);
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) "\" type=\"search\"");
-+             Text.Hamlet.condH
-+               [(isReq, 
-+                 (Yesod.Core.Widget.asWidgetT . toWidget)
-+                   ((Text.Blaze.Internal.preEscapedText . pack) " required=\"\""))]
-+               Nothing;
-+             Text.Hamlet.condH
-+               [(autoFocus, 
-+                 (Yesod.Core.Widget.asWidgetT . toWidget)
-+                   ((Text.Blaze.Internal.preEscapedText . pack) " autofocus=\"\""))]
-+               Nothing;
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) " value=\"");
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               (toHtml (either id id val));
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) "\"");
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Hamlet.attrsToHtml . toAttributes) attrs);
-+             (Yesod.Core.Widget.asWidgetT . toWidget)
-+               ((Text.Blaze.Internal.preEscapedText . pack) ">") }
-+
-         when autoFocus $ do
-           -- we want this javascript to be placed immediately after the field
+-        when autoFocus $ do
+-          -- we want this javascript to be placed immediately after the field
 -          [whamlet|
 -$newline never
 -<script>if (!('autofocus' in document.createElement('input'))) {document.getElementById('#{theId}').focus();}
@@ -402,51 +409,10 @@
 -            ##{theId}
 -              -webkit-appearance: textfield
 -            |]
-+          do { (Yesod.Core.Widget.asWidgetT . toWidget)
-+                 ((Text.Blaze.Internal.preEscapedText . pack)
-+                    "<script>if (!('autofocus' in document.createElement('input'))) {document.getElementById('");
-+               (Yesod.Core.Widget.asWidgetT . toWidget) (toHtml theId);
-+               (Yesod.Core.Widget.asWidgetT . toWidget)
-+                 ((Text.Blaze.Internal.preEscapedText . pack)
-+                    "').focus();}</script>") }
-+
-+          toWidget  $           \ _render_arQv
-+            -> (Text.Css.CssNoWhitespace
-+                . (foldr ($) []))
-+                 [((++)
-+                   $ (map
-+                        Text.Css.TopBlock
-+                        (((Text.Css.Block
-+                             {Text.Css.blockSelector = Data.Monoid.mconcat
-+                                                                                 [(Text.Css.fromText
-+                                                                                   . Text.Css.pack)
-+                                                                                    "#",
-+                                                                                  toCss theId],
-+                              Text.Css.blockAttrs = (concat
-+                                                                             $ ([Text.Css.Attr
-+                                                                                   (Data.Monoid.mconcat
-+                                                                                      [(Text.Css.fromText
-+                                                                                        . Text.Css.pack)
-+                                                                                         "-webkit-appearance"])
-+                                                                                   (Data.Monoid.mconcat
-+                                                                                      [(Text.Css.fromText
-+                                                                                        . Text.Css.pack)
-+                                                                                         "textfield"])]
-+                                                                                :
-+                                                                                  (map
-+                                                                                     Text.Css.mixinAttrs
-+                                                                                     []))),
-+                              Text.Css.blockBlocks = (),
-+                              Text.Css.blockMixins = ()}
-+                         :)
-+                          . ((foldr (.) id [])
-+                             . (concatMap Text.Css.mixinBlocks [] ++)))
-+                           [])))]
-+
      , fieldEnctype = UrlEncoded
      }
  
-@@ -331,7 +518,30 @@ urlField = Field
+@@ -358,7 +436,30 @@ urlField = Field
              Nothing -> Left $ MsgInvalidUrl s
              Just _ -> Right s
      , fieldView = \theId name attrs val isReq ->
@@ -478,7 +444,7 @@
      , fieldEnctype = UrlEncoded
      }
  
-@@ -344,18 +554,56 @@ selectField :: (Eq a, RenderMessage site FormMessage)
+@@ -371,18 +472,56 @@ selectField :: (Eq a, RenderMessage site FormMessage)
              => HandlerT site IO (OptionList a)
              -> Field (HandlerT site IO) a
  selectField = selectFieldHelper
@@ -547,7 +513,7 @@
  
  multiSelectFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg)
                       => [(msg, a)]
-@@ -378,11 +626,48 @@ multiSelectField ioptlist =
+@@ -405,11 +544,48 @@ multiSelectField ioptlist =
      view theId name attrs val isReq = do
          opts <- fmap olOptions $ handlerToWidget ioptlist
          let selOpts = map (id &&& (optselected val)) opts
@@ -601,7 +567,7 @@
          where
              optselected (Left _) _ = False
              optselected (Right vals) opt = (optionInternalValue opt) `elem` vals
-@@ -392,67 +677,172 @@ radioFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg)
+@@ -419,67 +595,172 @@ radioFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg)
                 -> Field (HandlerT site IO) a
  radioFieldList = radioField . optionsPairs
  
@@ -732,6 +698,10 @@
 -  $if not isReq
 -      <input id=#{theId}-none *{attrs} type=radio name=#{name} value=none checked>
 -      <label for=#{theId}-none>_{MsgSelectNone}
+-
+-
+-<input id=#{theId}-yes *{attrs} type=radio name=#{name} value=yes :showVal id val:checked>
+-<label for=#{theId}-yes>_{MsgBoolYes}
 +      , fieldView = \theId name attrs val isReq ->       do { Text.Hamlet.condH
 +             [(not isReq, 
 +               do { (Yesod.Core.Widget.asWidgetT . toWidget)
@@ -815,17 +785,13 @@
 +           (Yesod.Core.Widget.asWidgetT . toWidget)
 +             ((Text.Blaze.Internal.preEscapedText . pack) "</label>") }
  
--
--<input id=#{theId}-yes *{attrs} type=radio name=#{name} value=yes :showVal id val:checked>
--<label for=#{theId}-yes>_{MsgBoolYes}
--
 -<input id=#{theId}-no *{attrs} type=radio name=#{name} value=no :showVal not val:checked>
 -<label for=#{theId}-no>_{MsgBoolNo}
 -|]
      , fieldEnctype = UrlEncoded
      }
    where
-@@ -478,10 +868,25 @@ $newline never
+@@ -505,10 +786,25 @@ $newline never
  checkBoxField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Bool
  checkBoxField = Field
      { fieldParse = \e _ -> return $ checkBoxParser e
@@ -855,14 +821,14 @@
      , fieldEnctype = UrlEncoded
      }
  
-@@ -525,49 +930,7 @@ optionsPairs opts = do
+@@ -552,50 +848,6 @@ optionsPairs opts = do
  optionsEnum :: (MonadHandler m, Show a, Enum a, Bounded a) => m (OptionList a)
  optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound]
  
 -optionsPersist :: ( YesodPersist site, PersistEntity a
--                  , PersistQuery (YesodDB site)
+-                  , PersistQuery (YesodPersistBackend site (HandlerT site IO))
 -                  , PathPiece (Key a)
--                  , PersistEntityBackend a ~ PersistMonadBackend (YesodDB site)
+-                  , PersistEntityBackend a ~ PersistMonadBackend (YesodPersistBackend site (HandlerT site IO))
 -                  , RenderMessage site msg
 -                  )
 -               => [Filter a]
@@ -888,7 +854,7 @@
 -     , PersistQuery (YesodPersistBackend site (HandlerT site IO))
 -     , PathPiece (Key a)
 -     , RenderMessage site msg
--     , PersistEntityBackend a ~ PersistMonadBackend (YesodDB site))
+-     , PersistEntityBackend a ~ PersistMonadBackend (YesodPersistBackend site (HandlerT site IO)))
 -  => [Filter a]
 -  -> [SelectOpt a]
 -  -> (a -> msg)
@@ -902,11 +868,11 @@
 -        , optionInternalValue = key
 -        , optionExternalValue = toPathPiece key
 -        }) pairs
-+
- 
+-
  selectFieldHelper
          :: (Eq a, RenderMessage site FormMessage)
-@@ -611,9 +974,21 @@ fileField = Field
+         => (Text -> Text -> [(Text, Text)] -> WidgetT site IO () -> WidgetT site IO ())
+@@ -638,9 +890,21 @@ fileField = Field
          case files of
              [] -> Right Nothing
              file:_ -> Right $ Just file
@@ -931,7 +897,7 @@
      , fieldEnctype = Multipart
      }
  
-@@ -640,10 +1015,20 @@ fileAFormReq fs = AForm $ \(site, langs) menvs ints -> do
+@@ -667,10 +931,20 @@ fileAFormReq fs = AForm $ \(site, langs) menvs ints -> do
              { fvLabel = toHtml $ renderMessage site langs $ fsLabel fs
              , fvTooltip = fmap (toHtml . renderMessage site langs) $ fsTooltip fs
              , fvId = id'
@@ -956,7 +922,7 @@
              , fvErrors = errs
              , fvRequired = True
              }
-@@ -672,10 +1057,20 @@ fileAFormOpt fs = AForm $ \(master, langs) menvs ints -> do
+@@ -699,10 +973,20 @@ fileAFormOpt fs = AForm $ \(master, langs) menvs ints -> do
              { fvLabel = toHtml $ renderMessage master langs $ fsLabel fs
              , fvTooltip = fmap (toHtml . renderMessage master langs) $ fsTooltip fs
              , fvId = id'
@@ -982,10 +948,18 @@
              , fvRequired = False
              }
 diff --git a/Yesod/Form/Functions.hs b/Yesod/Form/Functions.hs
-index 8a36710..8675a10 100644
+index d84633e..9d9257f 100644
 --- a/Yesod/Form/Functions.hs
 +++ b/Yesod/Form/Functions.hs
-@@ -53,12 +53,16 @@ import Text.Blaze (Markup, toMarkup)
+@@ -25,7 +25,6 @@ module Yesod.Form.Functions
+     , generateFormPost
+     , generateFormGet
+       -- * More than one form on a handler
+-    , identifyForm
+       -- * Rendering
+     , FormRender
+     , renderTable
+@@ -56,12 +55,16 @@ import Text.Blaze (Markup, toMarkup)
  #define toHtml toMarkup
  import Yesod.Core
  import Network.Wai (requestMethod)
@@ -1003,7 +977,7 @@
  
  -- | Get a unique identifier.
  newFormIdent :: Monad m => MForm m Text
-@@ -210,7 +214,14 @@ postHelper form env = do
+@@ -213,7 +216,14 @@ postHelper form env = do
      let token =
              case reqToken req of
                  Nothing -> mempty
@@ -1019,7 +993,7 @@
      m <- getYesod
      langs <- languages
      ((res, xml), enctype) <- runFormGeneric (form token) m langs env
-@@ -279,7 +290,12 @@ getHelper :: MonadHandler m
+@@ -282,61 +292,17 @@ getHelper :: MonadHandler m
            -> Maybe (Env, FileEnv)
            -> m (a, Enctype)
  getHelper form env = do
@@ -1033,7 +1007,61 @@
      langs <- languages
      m <- getYesod
      runFormGeneric (form fragment) m langs env
-@@ -293,19 +309,66 @@ renderTable, renderDivs, renderDivsNoLabels :: Monad m => FormRender m a
+ 
+ 
+--- | Creates a hidden field on the form that identifies it.  This
+--- identification is then used to distinguish between /missing/
+--- and /wrong/ form data when a single handler contains more than
+--- one form.
+---
+--- For instance, if you have the following code on your handler:
+---
+--- > ((fooRes, fooWidget), fooEnctype) <- runFormPost fooForm
+--- > ((barRes, barWidget), barEnctype) <- runFormPost barForm
+---
+--- Then replace it with
+---
+--- > ((fooRes, fooWidget), fooEnctype) <- runFormPost $ identifyForm "foo" fooForm
+--- > ((barRes, barWidget), barEnctype) <- runFormPost $ identifyForm "bar" barForm
+---
+--- Note that it's your responsibility to ensure that the
+--- identification strings are unique (using the same one twice on a
+--- single handler will not generate any errors).  This allows you
+--- to create a variable number of forms and still have them work
+--- even if their number or order change between the HTML
+--- generation and the form submission.
+-identifyForm
+-  :: Monad m
+-  => Text -- ^ Form identification string.
+-  -> (Html -> MForm m (FormResult a, WidgetT (HandlerSite m) IO ()))
+-  -> (Html -> MForm m (FormResult a, WidgetT (HandlerSite m) IO ()))
+-identifyForm identVal form = \fragment -> do
+-    -- Create hidden <input>.
+-    let fragment' =
+-          [shamlet|
+-            <input type=hidden name=#{identifyFormKey} value=#{identVal}>
+-            #{fragment}
+-          |]
+-
+-    -- Check if we got its value back.
+-    mp <- askParams
+-    let missing = (mp >>= Map.lookup identifyFormKey) /= Just [identVal]
+-
+-    -- Run the form proper (with our hidden <input>).  If the
+-    -- data is missing, then do not provide any params to the
+-    -- form, which will turn its result into FormMissing.  Also,
+-    -- doing this avoids having lots of fields with red errors.
+-    let eraseParams | missing   = local (\(_, h, l) -> (Nothing, h, l))
+-                    | otherwise = id
+-    eraseParams (form fragment')
+-
+-identifyFormKey :: Text
+-identifyFormKey = "_formid"
+-
+ 
+ type FormRender m a =
+        AForm m a
+@@ -347,19 +313,66 @@ renderTable, renderDivs, renderDivsNoLabels :: Monad m => FormRender m a
  renderTable aform fragment = do
      (res, views') <- aFormToForm aform
      let views = views' []
@@ -1113,7 +1141,7 @@
      return (res, widget)
  
  -- | render a field inside a div
-@@ -318,19 +381,67 @@ renderDivsMaybeLabels :: Monad m => Bool -> FormRender m a
+@@ -372,19 +385,67 @@ renderDivsMaybeLabels :: Monad m => Bool -> FormRender m a
  renderDivsMaybeLabels withLabels aform fragment = do
      (res, views') <- aFormToForm aform
      let views = views' []
@@ -1193,8 +1221,8 @@
 +
      return (res, widget)
  
- -- | Render a form using Bootstrap-friendly shamlet syntax.
-@@ -354,19 +465,63 @@ renderBootstrap aform fragment = do
+ -- | Render a form using Bootstrap v2-friendly shamlet syntax.
+@@ -410,19 +471,63 @@ renderBootstrap aform fragment = do
      let views = views' []
          has (Just _) = True
          has Nothing  = False
@@ -1269,8 +1297,8 @@
 +           views }
 +
      return (res, widget)
+ {-# DEPRECATED renderBootstrap "Please use the Yesod.Form.Bootstrap3 module." #-}
  
- check :: (Monad m, RenderMessage (HandlerSite m) msg)
 diff --git a/Yesod/Form/Jquery.hs b/Yesod/Form/Jquery.hs
 index 2c4ae25..ed9b366 100644
 --- a/Yesod/Form/Jquery.hs
@@ -1436,7 +1464,7 @@
      }
  
 diff --git a/Yesod/Form/MassInput.hs b/Yesod/Form/MassInput.hs
-index 332eb66..5015e7b 100644
+index a2b434d..6766ad8 100644
 --- a/Yesod/Form/MassInput.hs
 +++ b/Yesod/Form/MassInput.hs
 @@ -9,6 +9,16 @@ module Yesod.Form.MassInput
@@ -1455,7 +1483,7 @@
 +
  import Yesod.Form.Types
  import Yesod.Form.Functions
- import Yesod.Form.Fields (boolField)
+ import Yesod.Form.Fields (checkBoxField)
 @@ -70,16 +80,28 @@ inputList label fixXml single mdef = formToAForm $ do
          { fvLabel = label
          , fvTooltip = Nothing
@@ -1512,7 +1540,7 @@
 +                  "\" value=\"yes\">") }
 +
          _ -> do
-             (_, xml2) <- aFormToForm $ areq boolField FieldSettings
+             (_, xml2) <- aFormToForm $ areq checkBoxField FieldSettings
                  { fsLabel = SomeMessage MsgDelete
 @@ -121,32 +147,155 @@ fixme eithers =
  massDivs, massTable
@@ -1789,17 +1817,17 @@
      }
    where
 diff --git a/yesod-form.cabal b/yesod-form.cabal
-index 1f6e0e1..4667861 100644
+index 56a3053..e7a0729 100644
 --- a/yesod-form.cabal
 +++ b/yesod-form.cabal
-@@ -19,6 +19,7 @@ library
-                    , time                  >= 1.1.4
-                    , hamlet                >= 1.1      && < 1.2
-                    , shakespeare-css       >= 1.0      && < 1.1
-+                   , shakespeare
-                    , shakespeare-js        >= 1.0.2    && < 1.3
-                    , persistent            >= 1.2      && < 1.4
-                    , template-haskell
+@@ -43,7 +43,6 @@ library
+     exposed-modules: Yesod.Form
+                      Yesod.Form.Types
+                      Yesod.Form.Functions
+-                     Yesod.Form.Bootstrap3
+                      Yesod.Form.Input
+                      Yesod.Form.Fields
+                      Yesod.Form.Jquery
 -- 
-1.7.10.4
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch b/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
--- a/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
+++ b/standalone/no-th/haskell-patches/yesod-persistent_do-not-really-build.patch
@@ -1,26 +1,33 @@
-From 03819615edb1c5f7414768dae84234d6791bd758 Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 04:11:46 +0000
+From b232effd092b03c6ad4235e5aa0c5750461af02d Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Wed, 21 May 2014 04:47:44 +0000
 Subject: [PATCH] do not really build
 
 ---
- yesod-persistent.cabal |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ yesod-persistent.cabal | 10 ----------
+ 1 file changed, 10 deletions(-)
 
 diff --git a/yesod-persistent.cabal b/yesod-persistent.cabal
-index 98c2146..11960cf 100644
+index 3560dd9..d01be4a 100644
 --- a/yesod-persistent.cabal
 +++ b/yesod-persistent.cabal
-@@ -23,8 +23,7 @@ library
-                    , lifted-base
-                    , pool-conduit
-                    , resourcet
+@@ -14,16 +14,6 @@ description:     Some helpers for using Persistent from Yesod.
+ 
+ library
+     build-depends:   base                      >= 4        && < 5
+-                   , yesod-core                >= 1.2.2    && < 1.3
+-                   , persistent                >= 1.2      && < 1.4
+-                   , persistent-template       >= 1.2      && < 1.4
+-                   , transformers              >= 0.2.2    && < 0.4
+-                   , blaze-builder
+-                   , conduit
+-                   , resourcet                 >= 0.4.5
+-                   , resource-pool
 -    exposed-modules: Yesod.Persist
 -                     Yesod.Persist.Core
-+    exposed-modules: 
      ghc-options:     -Wall
  
  test-suite test
 -- 
-1.7.10.4
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod-static_hack.patch b/standalone/no-th/haskell-patches/yesod-static_hack.patch
--- a/standalone/no-th/haskell-patches/yesod-static_hack.patch
+++ b/standalone/no-th/haskell-patches/yesod-static_hack.patch
@@ -1,31 +1,27 @@
-From 885cc873196f535de7cd1ac2ccfa217d10308d1f Mon Sep 17 00:00:00 2001
+From 606c5f4f4b2d476d274907eb2bb8c12b60fc451f Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 7 Mar 2014 02:28:34 +0000
-Subject: [PATCH] avoid building with jsmin
-
-jsmin needs language-javascript, which fails to build for android due to
-a problem or incompatability with happy.
+Date: Wed, 21 May 2014 04:43:30 +0000
+Subject: [PATCH] remove TH
 
-This also avoids all the TH code.
 ---
  Yesod/EmbeddedStatic/Generators.hs |  3 +--
  Yesod/Static.hs                    | 29 ++++++++++++++++++-----------
- yesod-static.cabal                 |  7 -------
- 3 files changed, 19 insertions(+), 20 deletions(-)
+ yesod-static.cabal                 |  9 ---------
+ 3 files changed, 19 insertions(+), 22 deletions(-)
 
 diff --git a/Yesod/EmbeddedStatic/Generators.hs b/Yesod/EmbeddedStatic/Generators.hs
-index e83785d..6b1c10e 100644
+index 08febb9..e3a6d51 100644
 --- a/Yesod/EmbeddedStatic/Generators.hs
 +++ b/Yesod/EmbeddedStatic/Generators.hs
-@@ -43,7 +43,6 @@ import Language.Haskell.TH
+@@ -42,7 +42,6 @@ import Language.Haskell.TH
  import Network.Mime (defaultMimeLookup)
  import System.Directory (doesDirectoryExist, getDirectoryContents, findExecutable)
  import System.FilePath ((</>))
 -import Text.Jasmine (minifym)
  import qualified Data.ByteString.Lazy as BL
  import qualified Data.Conduit.List as C
- import qualified Data.Text as T
-@@ -158,7 +157,7 @@ concatFilesWith loc process files = do
+ import Data.Conduit.Binary (sourceHandle)
+@@ -162,7 +161,7 @@ concatFilesWith loc process files = do
  
  -- | Convienient rexport of 'minifym' with a type signature to work with 'concatFilesWith'.
  jasmine :: BL.ByteString -> IO BL.ByteString
@@ -35,7 +31,7 @@
  -- | Use <https://github.com/mishoo/UglifyJS2 UglifyJS2> to compress javascript.
  -- Assumes @uglifyjs@ is located in the path and uses options @[\"-m\", \"-c\"]@
 diff --git a/Yesod/Static.hs b/Yesod/Static.hs
-index dd21791..37f7e00 100644
+index 725ebf4..33eaffd 100644
 --- a/Yesod/Static.hs
 +++ b/Yesod/Static.hs
 @@ -37,8 +37,8 @@ module Yesod.Static
@@ -74,9 +70,9 @@
 -import Data.FileEmbed (embedDir)
 +import Data.FileEmbed
  
+ import Control.Monad.Trans.Resource (runResourceT)
  import Yesod.Core
- import Yesod.Core.Types
-@@ -135,6 +135,7 @@ staticDevel dir = do
+@@ -136,6 +136,7 @@ staticDevel dir = do
      hashLookup <- cachedETagLookupDevel dir
      return $ Static $ webAppSettingsWithLookup (F.decodeString dir) hashLookup
  
@@ -84,7 +80,7 @@
  -- | Produce a 'Static' based on embedding all of the static files' contents in the
  -- executable at compile time.
  --
-@@ -149,6 +150,7 @@ staticDevel dir = do
+@@ -150,6 +151,7 @@ staticDevel dir = do
  -- This will cause yesod to embed those assets into the generated HTML file itself.
  embed :: Prelude.FilePath -> Q Exp
  embed fp = [|Static (embeddedSettings $(embedDir fp))|]
@@ -92,7 +88,7 @@
  
  instance RenderRoute Static where
      -- | A route on the static subsite (see also 'staticFiles').
-@@ -214,6 +216,7 @@ getFileListPieces = flip evalStateT M.empty . flip go id
+@@ -215,6 +217,7 @@ getFileListPieces = flip evalStateT M.empty . flip go id
                  put $ M.insert s s m
                  return s
  
@@ -100,7 +96,7 @@
  -- | Template Haskell function that automatically creates routes
  -- for all of your static files.
  --
-@@ -266,7 +269,7 @@ staticFilesList dir fs =
+@@ -267,7 +270,7 @@ staticFilesList dir fs =
  -- see if their copy is up-to-date.
  publicFiles :: Prelude.FilePath -> Q [Dec]
  publicFiles dir = mkStaticFiles' dir "StaticRoute" False
@@ -109,7 +105,7 @@
  
  mkHashMap :: Prelude.FilePath -> IO (M.Map F.FilePath S8.ByteString)
  mkHashMap dir = do
-@@ -309,6 +312,7 @@ cachedETagLookup dir = do
+@@ -310,6 +313,7 @@ cachedETagLookup dir = do
      etags <- mkHashMap dir
      return $ (\f -> return $ M.lookup f etags)
  
@@ -117,7 +113,7 @@
  mkStaticFiles :: Prelude.FilePath -> Q [Dec]
  mkStaticFiles fp = mkStaticFiles' fp "StaticRoute" True
  
-@@ -356,6 +360,7 @@ mkStaticFilesList fp fs routeConName makeHash = do
+@@ -357,6 +361,7 @@ mkStaticFilesList fp fs routeConName makeHash = do
                  [ Clause [] (NormalB $ (ConE route) `AppE` f' `AppE` qs) []
                  ]
              ]
@@ -125,7 +121,7 @@
  
  base64md5File :: Prelude.FilePath -> IO String
  base64md5File = fmap (base64 . encode) . hashFile
-@@ -394,7 +399,7 @@ base64 = map tr
+@@ -395,7 +400,7 @@ base64 = map tr
  -- single static file at compile time.
  
  data CombineType = JS | CSS
@@ -134,7 +130,7 @@
  combineStatics' :: CombineType
                  -> CombineSettings
                  -> [Route Static] -- ^ files to combine
-@@ -428,7 +433,7 @@ combineStatics' combineType CombineSettings {..} routes = do
+@@ -429,7 +434,7 @@ combineStatics' combineType CombineSettings {..} routes = do
          case combineType of
              JS -> "js"
              CSS -> "css"
@@ -143,7 +139,7 @@
  -- | Data type for holding all settings for combining files.
  --
  -- This data type is a settings type. For more information, see:
-@@ -504,6 +509,7 @@ instance Default CombineSettings where
+@@ -505,6 +510,7 @@ instance Default CombineSettings where
  errorIntro :: [FilePath] -> [Char] -> [Char]
  errorIntro fps s = "Error minifying " ++ show fps ++ ": " ++ s
  
@@ -151,7 +147,7 @@
  liftRoutes :: [Route Static] -> Q Exp
  liftRoutes =
      fmap ListE . mapM go
-@@ -550,4 +556,5 @@ combineScripts' :: Bool -- ^ development? if so, perform no combining
+@@ -551,4 +557,5 @@ combineScripts' :: Bool -- ^ development? if so, perform no combining
                  -> Q Exp
  combineScripts' development cs con routes
      | development = [| mapM_ (addScript . $(return $ ConE con)) $(liftRoutes routes) |]
@@ -159,36 +155,39 @@
 +    | otherwise = [| addScript $ $(return $ ConE con) $(combineStatics' JS cs routes) |]a
 +-}
 diff --git a/yesod-static.cabal b/yesod-static.cabal
-index 3423149..416aae6 100644
+index 2582a95..5df03b3 100644
 --- a/yesod-static.cabal
 +++ b/yesod-static.cabal
-@@ -48,18 +48,12 @@ library
+@@ -49,7 +49,6 @@ library
                     , data-default
                     , shakespeare-css       >= 1.0.3
                     , mime-types            >= 0.1
 -                   , hjsmin
-                    , process-conduit       >= 1.0      && < 1.1
                     , filepath              >= 1.3
                     , resourcet             >= 0.4
                     , unordered-containers  >= 0.2
+@@ -62,13 +61,6 @@ library
+                    , hashable              >= 1.1
  
      exposed-modules: Yesod.Static
 -                     Yesod.EmbeddedStatic
 -                     Yesod.EmbeddedStatic.Generators
 -                     Yesod.EmbeddedStatic.Types
+-                     Yesod.EmbeddedStatic.Css.AbsoluteUrl
 -
 -    other-modules:   Yesod.EmbeddedStatic.Internal
+-                     Yesod.EmbeddedStatic.Css.Util
  
      ghc-options:     -Wall
      extensions: TemplateHaskell
-@@ -99,7 +93,6 @@ test-suite tests
+@@ -108,7 +100,6 @@ test-suite tests
                     , data-default
                     , shakespeare-css
                     , mime-types
 -                   , hjsmin
-                    , process-conduit
                     , filepath
                     , resourcet
+                    , unordered-containers
 -- 
-1.9.0
+2.0.0.rc2
 
diff --git a/standalone/no-th/haskell-patches/yesod_hack-TH.patch b/standalone/no-th/haskell-patches/yesod_hack-TH.patch
--- a/standalone/no-th/haskell-patches/yesod_hack-TH.patch
+++ b/standalone/no-th/haskell-patches/yesod_hack-TH.patch
@@ -1,13 +1,13 @@
-From 369c99b9de0c82578f5221fdabc42ea9ba59ddea Mon Sep 17 00:00:00 2001
+From 86264ab2a76568585cacca9145e440d6c06edbe3 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Fri, 7 Mar 2014 04:10:02 +0000
-Subject: [PATCH] hack to TH
+Date: Wed, 21 May 2014 06:30:03 +0000
+Subject: [PATCH] avoid TH
 
 ---
  Yesod.hs              | 19 ++++++++++++--
- Yesod/Default/Main.hs | 25 +------------------
+ Yesod/Default/Main.hs | 31 +----------------------
  Yesod/Default/Util.hs | 69 ++-------------------------------------------------
- 3 files changed, 20 insertions(+), 93 deletions(-)
+ 3 files changed, 20 insertions(+), 99 deletions(-)
 
 diff --git a/Yesod.hs b/Yesod.hs
 index b367144..fbe309c 100644
@@ -41,7 +41,7 @@
 +insert = undefined
 +
 diff --git a/Yesod/Default/Main.hs b/Yesod/Default/Main.hs
-index 0780539..ad99ccd 100644
+index e273de2..bf46642 100644
 --- a/Yesod/Default/Main.hs
 +++ b/Yesod/Default/Main.hs
 @@ -1,10 +1,8 @@
@@ -55,7 +55,7 @@
      , defaultRunner
      , defaultDevelApp
      , LogFunc
-@@ -22,7 +20,7 @@ import Control.Monad (when)
+@@ -23,7 +21,7 @@ import Control.Monad (when)
  import System.Environment (getEnvironment)
  import Data.Maybe (fromMaybe)
  import Safe (readMay)
@@ -64,7 +64,7 @@
  import System.Log.FastLogger (LogStr, toLogStr)
  import Language.Haskell.TH.Syntax (qLocation)
  
-@@ -54,27 +52,6 @@ defaultMain load getApp = do
+@@ -55,33 +53,6 @@ defaultMain load getApp = do
  
  type LogFunc = Loc -> LogSource -> LogLevel -> LogStr -> IO ()
  
@@ -82,16 +82,22 @@
 -    runSettings defaultSettings
 -        { settingsPort = appPort config
 -        , settingsHost = appHost config
--        , settingsOnException = const $ \e -> logFunc
+-        , settingsOnException = const $ \e -> when (shouldLog' e) $ logFunc
 -            $(qLocation >>= liftLoc)
 -            "yesod"
 -            LevelError
 -            (toLogStr $ "Exception from Warp: " ++ show e)
 -        } app
--
+-  where
+-    shouldLog' =
+-#if MIN_VERSION_wai(2,1,3)
+-        Warp.defaultShouldDisplayException
+-#else
+-        const True
+-#endif
+ 
  -- | Run your application continously, listening for SIGINT and exiting
  --   when received
- --
 diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs
 index a10358e..0547424 100644
 --- a/Yesod/Default/Util.hs
@@ -189,5 +195,5 @@
 -                else return $ Just ex
 -        else return Nothing
 -- 
-1.9.0
+2.0.0.rc2
 
diff --git a/static/css/bootstrap-theme.css b/static/css/bootstrap-theme.css
--- a/static/css/bootstrap-theme.css
+++ b/static/css/bootstrap-theme.css
diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css
--- a/static/css/bootstrap.css
+++ b/static/css/bootstrap.css
diff --git a/static/js/bootstrap.js b/static/js/bootstrap.js
--- a/static/js/bootstrap.js
+++ b/static/js/bootstrap.js
diff --git a/static/js/jquery.full.js b/static/js/jquery.full.js
--- a/static/js/jquery.full.js
+++ b/static/js/jquery.full.js
diff --git a/static/js/jquery.ui.core.js b/static/js/jquery.ui.core.js
--- a/static/js/jquery.ui.core.js
+++ b/static/js/jquery.ui.core.js
diff --git a/static/js/jquery.ui.mouse.js b/static/js/jquery.ui.mouse.js
--- a/static/js/jquery.ui.mouse.js
+++ b/static/js/jquery.ui.mouse.js
diff --git a/static/js/jquery.ui.sortable.js b/static/js/jquery.ui.sortable.js
--- a/static/js/jquery.ui.sortable.js
+++ b/static/js/jquery.ui.sortable.js
diff --git a/static/js/jquery.ui.widget.js b/static/js/jquery.ui.widget.js
--- a/static/js/jquery.ui.widget.js
+++ b/static/js/jquery.ui.widget.js
diff --git a/static/js/longpolling.js b/static/js/longpolling.js
--- a/static/js/longpolling.js
+++ b/static/js/longpolling.js
@@ -44,3 +44,5 @@
 		}
 	});
 }
+
+//EOF