[commit: ghc] master: Update Note [Coercible instances] (4eeaf55)

[git at git.haskell.org]

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

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

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

commit 4eeaf556d4c25b0308107518ea10cb0b3e18c1e0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Jan 2 12:39:45 2014 +0100

    Update Note [Coercible instances]


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

4eeaf556d4c25b0308107518ea10cb0b3e18c1e0
 compiler/typecheck/TcInteract.lhs |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs
index a19c7e3..1dcdc52 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -2066,10 +2066,10 @@ air, in getCoercibleInst. The following “instances” are present:
 
  4. instance Coercible r b => Coercible (NT t1 t2 ...) b
     instance Coercible a r => Coercible a (NT t1 t2 ...)
-    for a newtype constructor NT (nor data family instance that resolves to a
+    for a newtype constructor NT (or data family instance that resolves to a
     newtype) where
      * r is the concrete type of NT, instantiated with the arguments t1 t2 ...
-     * the data constructors of NT are in scope.
+     * the constructor of NT are in scope.
 
     Again, the newtype TyCon can appear undersaturated, but only if it has
     enough arguments to apply the newtype coercion (which is eta-reduced). Examples:
@@ -2084,8 +2084,7 @@ TcCoercion therein has role Representational,  which are turned into Core
 coercions by dsEvTerm in DsBinds.
 
 The evidence for the first three instance is generated here by
-getCoercibleInst, the forth instance is implemented in the canonicalization
-stage using deferTcSForAllEq.
+getCoercibleInst, for the second instance deferTcSForAllEq is used.
 
 When the constraint cannot be solved, it is treated as any other unsolved
 constraint, i.e. it can turn up in an inferred type signature, or reported to