Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.2

http://hackage.haskell.org/trac/ghc/changeset/0d6400e89d912a4bba2fecdece26389ee1239769

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

commit 0d6400e89d912a4bba2fecdece26389ee1239769
Author: Ian Lynagh <[email protected]>
Date:   Sun Jul 3 20:36:48 2011 +0100

    Tweak release notes

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

 docs/users_guide/7.2.1-notes.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/users_guide/7.2.1-notes.xml b/docs/users_guide/7.2.1-notes.xml
index 336d370..4b11586 100644
--- a/docs/users_guide/7.2.1-notes.xml
+++ b/docs/users_guide/7.2.1-notes.xml
@@ -173,15 +173,15 @@ foreign import ccall interruptible
 
       <listitem>
         <para>
-          The <literal>OverlappingInstances</literal> exception used to
+          The <literal>OverlappingInstances</literal> extension used to
           allow overlapping instances only when all but the
           most specific instance were compiled with
           <literal>OverlappingInstances</literal>.
           Now overlap is allowed if <emphasis>either</emphasis> all but
           the most specific instance were compiled with
-          <literal>OverlappingInstances</literal>, or if the most
-          specific instance was compiled with
-          <literal>OverlappingInstances</literal>.
+          <literal>OverlappingInstances</literal>,
+          <emphasis>or</emphasis> if the most specific instance was
+          compiled with <literal>OverlappingInstances</literal>.
         </para>
       </listitem>
 



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to