diff options
| -rw-r--r-- | Assistant/Monad.hs | 2 | ||||
| -rw-r--r-- | Git/AutoCorrect.hs | 2 | ||||
| -rw-r--r-- | Logs/PreferredContent.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs index 6b843ea88..44ae210b7 100644 --- a/Assistant/Monad.hs +++ b/Assistant/Monad.hs @@ -99,7 +99,7 @@ class LiftAnnex m where liftAnnex :: Annex a -> m a {- Runs an action in the git-annex monad. Note that the same monad state - - is shared amoung all assistant threads, so only one of these can run at + - is shared among all assistant threads, so only one of these can run at - a time. Therefore, long-duration actions should be avoided. -} instance LiftAnnex Assistant where liftAnnex a = do diff --git a/Git/AutoCorrect.hs b/Git/AutoCorrect.hs index 325632de9..aa8379849 100644 --- a/Git/AutoCorrect.hs +++ b/Git/AutoCorrect.hs @@ -27,7 +27,7 @@ gitEditCosts = EditCosts similarityFloor :: Int similarityFloor = 7 -{- Finds inexact matches for the input amoung the choices. +{- Finds inexact matches for the input among the choices. - Returns an ordered list of good enough matches, or an empty list if - nothing matches well. -} fuzzymatches :: String -> (c -> String) -> [c] -> [c] diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs index 57367148c..202c86997 100644 --- a/Logs/PreferredContent.hs +++ b/Logs/PreferredContent.hs @@ -76,7 +76,7 @@ preferredContentMapRaw = simpleMap . parseLog Just <$> Annex.Branch.get preferredContentLog {- This intentionally never fails, even on unparsable expressions, - - because the configuration is shared amoung repositories and newer + - because the configuration is shared among repositories and newer - versions of git-annex may add new features. Instead, parse errors - result in a Matcher that will always succeed. -} makeMatcher :: GroupMap -> M.Map UUID RemoteConfig -> UUID -> String -> FileMatcher |