Another round of s/amoung/among/

This commit is contained in:
Richard Hartmann 2013-12-19 10:57:50 +01:00 committed by Joey Hess
parent 46f99c7764
commit 974fe009bf
3 changed files with 3 additions and 3 deletions

View file

@ -99,7 +99,7 @@ class LiftAnnex m where
liftAnnex :: Annex a -> m a liftAnnex :: Annex a -> m a
{- Runs an action in the git-annex monad. Note that the same monad state {- 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. -} - a time. Therefore, long-duration actions should be avoided. -}
instance LiftAnnex Assistant where instance LiftAnnex Assistant where
liftAnnex a = do liftAnnex a = do

View file

@ -27,7 +27,7 @@ gitEditCosts = EditCosts
similarityFloor :: Int similarityFloor :: Int
similarityFloor = 7 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 - Returns an ordered list of good enough matches, or an empty list if
- nothing matches well. -} - nothing matches well. -}
fuzzymatches :: String -> (c -> String) -> [c] -> [c] fuzzymatches :: String -> (c -> String) -> [c] -> [c]

View file

@ -76,7 +76,7 @@ preferredContentMapRaw = simpleMap . parseLog Just
<$> Annex.Branch.get preferredContentLog <$> Annex.Branch.get preferredContentLog
{- This intentionally never fails, even on unparsable expressions, {- 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 - versions of git-annex may add new features. Instead, parse errors
- result in a Matcher that will always succeed. -} - result in a Matcher that will always succeed. -}
makeMatcher :: GroupMap -> M.Map UUID RemoteConfig -> UUID -> String -> FileMatcher makeMatcher :: GroupMap -> M.Map UUID RemoteConfig -> UUID -> String -> FileMatcher