[commit: ghc] master: Typos [ci skip] (09938f2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/09938f29cd615a3073f49f8b628650693e2f29e9/ghc

>---------------------------------------------------------------

commit 09938f29cd615a3073f49f8b628650693e2f29e9
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu May 11 15:13:02 2017 +0200

    Typos [ci skip]


>---------------------------------------------------------------

09938f29cd615a3073f49f8b628650693e2f29e9
 aclocal.m4                        | 2 +-
 compiler/basicTypes/DataCon.hs    | 2 +-
 compiler/parser/Lexer.x           | 8 ++++----
 compiler/types/FamInstEnv.hs      | 2 +-
 docs/users_guide/glasgow_exts.rst | 2 +-
 iserv/src/Remote/Slave.hs         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index a7920a7..697cba5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1879,7 +1879,7 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[
 # converts os from gnu to ghc naming, and assigns the result to $target_var
 AC_DEFUN([GHC_CONVERT_OS],[
     case "$1" in
-      # watchos and tvos are ios variant as of May 2017.
+      # watchos and tvos are ios variants as of May 2017.
       ios|watchos|tvos)
         $3="ios"
         ;;
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs
index acd2865..60cffac 100644
--- a/compiler/basicTypes/DataCon.hs
+++ b/compiler/basicTypes/DataCon.hs
@@ -233,7 +233,7 @@ It's a flaw in the language.
         it separately in the type checker on occurrences of a
         constructor, either in an expression or in a pattern.
 
-        [May 2003: actually I think this decision could evasily be
+        [May 2003: actually I think this decision could easily be
         reversed now, and probably should be.  Generics could be
         disabled for types with a stupid context; record updates now
         (H98) needs the context too; etc.  It's an unforced change, so
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 6ebd087..2ce0ac6 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -2524,7 +2524,7 @@ alternativeLayoutRuleToken t
              (_, ALRLayout _ col : _ls, Just expectingOCurly)
               | (thisCol > col) ||
                 (thisCol == col &&
-                 isNonDecreasingIntentation expectingOCurly) ->
+                 isNonDecreasingIndentation expectingOCurly) ->
                  do setAlrExpectingOCurly Nothing
                     setALRContext (ALRLayout expectingOCurly thisCol : context)
                     setNextToken t
@@ -2668,9 +2668,9 @@ isALRclose ITccurly = True
 isALRclose ITcubxparen = True
 isALRclose _        = False
 
-isNonDecreasingIntentation :: ALRLayout -> Bool
-isNonDecreasingIntentation ALRLayoutDo = True
-isNonDecreasingIntentation _           = False
+isNonDecreasingIndentation :: ALRLayout -> Bool
+isNonDecreasingIndentation ALRLayoutDo = True
+isNonDecreasingIndentation _           = False
 
 containsCommas :: Token -> Bool
 containsCommas IToparen = True
diff --git a/compiler/types/FamInstEnv.hs b/compiler/types/FamInstEnv.hs
index 89f4214..6d179a9 100644
--- a/compiler/types/FamInstEnv.hs
+++ b/compiler/types/FamInstEnv.hs
@@ -849,7 +849,7 @@ lookupFamInstEnvInjectivityConflicts
                       -- INVARIANT: list contains at least one True value
     ->  FamInstEnvs   -- all type instances seens so far
     ->  FamInst       -- new type instance that we're checking
-    -> [CoAxBranch]   -- conflicting instance delcarations
+    -> [CoAxBranch]   -- conflicting instance declarations
 lookupFamInstEnvInjectivityConflicts injList (pkg_ie, home_ie)
                              fam_inst@(FamInst { fi_axiom = new_axiom })
   -- See Note [Verifying injectivity annotation]. This function implements
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 2b7b652..729cd4d 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -9497,7 +9497,7 @@ Here are the details:
        visible type application.
 
      * Universal variables always come first, in precisely the order they
-       appear in the type delcaration. Universal variables that are
+       appear in the type declaration. Universal variables that are
        constrained by a GADT return type are not included in the data constructor.
 
      * Existential variables come next. Their order is determined by a user-
diff --git a/iserv/src/Remote/Slave.hs b/iserv/src/Remote/Slave.hs
index c7210dc..11cc68a 100644
--- a/iserv/src/Remote/Slave.hs
+++ b/iserv/src/Remote/Slave.hs
@@ -30,7 +30,7 @@ dropLeadingPathSeparator :: FilePath -> FilePath
 dropLeadingPathSeparator p | isAbsolute p = joinPath (drop 1 (splitPath p))
                            | otherwise    = p
 
--- | Path concatication that prevents a double path separator to appear in the
+-- | Path concatenation that prevents a double path separator to appear in the
 -- final path. "/foo/bar/" <//> "/baz/quux" == "/foo/bar/baz/quux"
 (<//>) :: FilePath -> FilePath -> FilePath
 lhs <//> rhs = dropTrailingPathSeparator lhs </> dropLeadingPathSeparator rhs