Merge /home/joey/thk_fix_haddock

Command/Upgrade.hs

@@ -13,12 +13,13 @@ import Annex.Version
 import Annex.Init
 
 cmd :: Command
-cmd = dontCheck repoExists $
-	-- ^ because an old version may not seem to exist
+cmd = dontCheck
+	-- because an old version may not seem to exist
 	-- and also, this avoids automatic silent upgrades before
 	-- this command can start up.
+	repoExists $
+	-- avoid upgrading repo out from under daemon
 	noDaemonRunning $
-	-- ^ avoid upgrading repo out from under daemon
 	command "upgrade" SectionMaintenance "upgrade repository"
 		paramNothing (seek <$$> optParser)
 

Types/Remote.hs

@@ -266,10 +266,10 @@ data ImportActions a = ImportActions
 	, retrieveExportWithContentIdentifier 
 		:: ExportLocation
 		-> ContentIdentifier
+		-- file to write content to
 		-> FilePath
-		-- ^ file to write content to
+		-- callback that generates a key from the downloaded content
 		-> a (Maybe Key)
-		-- ^ callback that generates a key from the downloaded content
 		-> MeterUpdate
 		-> a (Maybe Key)
 	-- Exports content to an ExportLocation, and returns the
@@ -292,8 +292,8 @@ data ImportActions a = ImportActions
 		:: FilePath
 		-> Key
 		-> ExportLocation
+		-- old content that it's safe to overwrite
 		-> [ContentIdentifier]
-		-- ^ old content that it's safe to overwrite
 		-> MeterUpdate
 		-> a (Either String ContentIdentifier)
 	-- This is used rather than removeExport when a special remote