Merge branch 'master' into git-remote-annex

Types/GitConfig.hs

@@ -136,6 +136,7 @@ data GitConfig = GitConfig
 	, annexAllowedIPAddresses :: String
 	, annexAllowUnverifiedDownloads :: Bool
 	, annexMaxExtensionLength :: Maybe Int
+	, annexMaxExtensions :: Maybe Int
 	, annexJobs :: Concurrency
 	, annexCacheCreds :: Bool
 	, annexAutoUpgradeRepository :: Bool
@@ -244,6 +245,7 @@ extractGitConfig configsource r = GitConfig
 	, annexAllowUnverifiedDownloads = (== Just "ACKTHPPT") $
 		getmaybe (annexConfig "security.allow-unverified-downloads")
 	, annexMaxExtensionLength = getmayberead (annexConfig "maxextensionlength")
+	, annexMaxExtensions = getmayberead (annexConfig "maxextensions")
 	, annexJobs = fromMaybe NonConcurrent $ 
 		parseConcurrency =<< getmaybe (annexConfig "jobs")
 	, annexCacheCreds = getbool (annexConfig "cachecreds") True

Types/Key.hs

@@ -60,7 +60,7 @@ data KeyData = Key
 
 instance NFData KeyData
 
-{- Caching the seralization of a key is an optimization.
+{- Caching the serialization of a key is an optimization.
  -
  - This constructor is not exported, and all smart constructors maintain
  - the serialization.

Types/StallDetection.hs

@@ -27,9 +27,9 @@ data BwRate = BwRate ByteSize Duration
 
 -- Parse eg, "0KiB/60s"
 --
--- Also, it can be set to "true" (or other git config equivilants)
+-- Also, it can be set to "true" (or other git config equivalents)
 -- to enable ProbeStallDetection. 
--- And "false" (and other git config equivilants) explicitly
+-- And "false" (and other git config equivalents) explicitly
 -- disable stall detection.
 parseStallDetection :: String -> Either String StallDetection
 parseStallDetection s = case isTrueFalse s of