[commit: ghc] master: Typofixes in manual and comments [ci skip] (df72368)

[git at git.haskell.org]

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

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

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

commit df723689c415573fa6c7d83663758154fa7dc46f
Author: Gabor Greif <ggreif at gmail.com>
Date:   Wed Jan 4 18:37:23 2017 +0100

    Typofixes in manual and comments [ci skip]


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

df723689c415573fa6c7d83663758154fa7dc46f
 compiler/nativeGen/RegAlloc/Liveness.hs | 2 +-
 compiler/simplCore/Simplify.hs          | 2 +-
 docs/users_guide/glasgow_exts.rst       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/nativeGen/RegAlloc/Liveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs
index a904202..4b00ed6 100644
--- a/compiler/nativeGen/RegAlloc/Liveness.hs
+++ b/compiler/nativeGen/RegAlloc/Liveness.hs
@@ -801,7 +801,7 @@ computeLiveness
         -> [SCC (LiveBasicBlock instr)]
         -> ([SCC (LiveBasicBlock instr)],       -- instructions annotated with list of registers
                                                 -- which are "dead after this instruction".
-               BlockMap RegSet)                 -- blocks annontated with set of live registers
+               BlockMap RegSet)                 -- blocks annotated with set of live registers
                                                 -- on entry to the block.
 
 computeLiveness platform sccs
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index e51ef05..0b9f5f0 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -1437,7 +1437,7 @@ rebuildCall env (ArgInfo { ai_fun = fun, ai_args = rev_args, ai_strs = [] }) con
   -- the continuation, leaving just the bottoming expression.  But the
   -- type might not be right, so we may have to add a coerce.
   | not (contIsTrivial cont)     -- Only do this if there is a non-trivial
-  = return (env, castBottomExpr res cont_ty)  -- contination to discard, else we do it
+  = return (env, castBottomExpr res cont_ty)  -- continuation to discard, else we do it
   where                                       -- again and again!
     res     = argInfoExpr fun rev_args
     cont_ty = contResultType cont
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 919ec7d..e21a975 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -3872,7 +3872,7 @@ generates ::
 
       instance Num Dollars
 
-One can think of this instance being implementated with the same code as the
+One can think of this instance being implemented with the same code as the
 ``Num Int`` instance, but with ``Dollars`` and ``getDollars`` added wherever
 necessary in order to make it typecheck. (In practice, GHC uses a somewhat
 different approach to code generation. See the :ref:`precise-gnd-specification`