[commit: ghc] master: Typos in manual and comments [ci skip] (715be01)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/715be013d40511771bb760647e4aff1b165ddd21/ghc

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

commit 715be013d40511771bb760647e4aff1b165ddd21
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Jan 17 11:25:49 2017 +0100

    Typos in manual and comments [ci skip]


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

715be013d40511771bb760647e4aff1b165ddd21
 compiler/codeGen/StgCmmClosure.hs | 2 +-
 compiler/simplCore/CallArity.hs   | 2 +-
 compiler/specialise/Specialise.hs | 4 ++--
 docs/users_guide/bugs.rst         | 4 ++--
 docs/users_guide/glasgow_exts.rst | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs
index 1943dc4..7b9813a 100644
--- a/compiler/codeGen/StgCmmClosure.hs
+++ b/compiler/codeGen/StgCmmClosure.hs
@@ -828,7 +828,7 @@ we run into issues like Trac #10414. Specifically:
 
   * It is dangerous to black-hole a non-updatable thunk because
      - is not updated (of course)
-     - hence, if it is black-holed and another thread tries to evalute
+     - hence, if it is black-holed and another thread tries to evaluate
        it, that thread will block forever
     This actually happened in Trac #10414.  So we do not black-hole
     non-updatable thunks.
diff --git a/compiler/simplCore/CallArity.hs b/compiler/simplCore/CallArity.hs
index ffdd4b5..c051dae 100644
--- a/compiler/simplCore/CallArity.hs
+++ b/compiler/simplCore/CallArity.hs
@@ -115,7 +115,7 @@ Note [Analysis II: The Co-Called analysis]
 ------------------------------------------
 
 The second part is more sophisticated. For reasons explained below, it is not
-sufficient to simply know how often an expression evalutes a variable. Instead
+sufficient to simply know how often an expression evaluates a variable. Instead
 we need to know which variables are possibly called together.
 
 The data structure here is an undirected graph of variables, which is provided
diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs
index 257d076..a2b1604 100644
--- a/compiler/specialise/Specialise.hs
+++ b/compiler/specialise/Specialise.hs
@@ -1784,8 +1784,8 @@ This makes b), c), d) trivial and pushes a) towards the end. The deduplication
 is done by using a TrieMap for membership tests on CallKey. This lets us delete
 the nondeterministic Ord CallKey instance.
 
-An alternative approach would be to augument the Map the same way that UniqDFM
-is augumented, by keeping track of insertion order and using it to order the
+An alternative approach would be to augment the Map the same way that UniqDFM
+is augmented, by keeping track of insertion order and using it to order the
 resulting lists. It would mean keeping the nondeterministic Ord CallKey
 instance making it easy to reintroduce nondeterminism in the future.
 -}
diff --git a/docs/users_guide/bugs.rst b/docs/users_guide/bugs.rst
index c1527f1..9b60e54 100644
--- a/docs/users_guide/bugs.rst
+++ b/docs/users_guide/bugs.rst
@@ -472,7 +472,7 @@ Bugs in GHC
    .. code-block:: none
 
        ghc: panic! (the 'impossible' happened)
-         (GHC version 7.10.1 for x86_64-unknown-linux):
+         (GHC version 8.2.1 for x86_64-unknown-linux):
            Simplifier ticks exhausted
          When trying UnfoldingDone x_alB
          To increase the limit, use -fsimpl-tick-factor=N (default 100)
@@ -541,7 +541,7 @@ Bugs in GHC
    unexpected results. See :ghc-ticket:`11715` for one example.
 
 -  Because of a toolchain limitation we are unable to support full Unicode paths
-   on WIndows. On Windows we support up to Latin-1. See :ghc-ticket:`12971` for more.
+   on Windows. On Windows we support up to Latin-1. See :ghc-ticket:`12971` for more.
 
 .. _bugs-ghci:
 
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index e21a975..103d6ac 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -11564,7 +11564,7 @@ optionally had by adding ``!`` in front of a variable.
 
        case x of !y -> rhs
 
-   which evalutes ``x``. Similarly, if ``newtype Age = MkAge Int``, then ::
+   which evaluates ``x``. Similarly, if ``newtype Age = MkAge Int``, then ::
 
        case x of MkAge i -> rhs