[commit: template-haskell] overlapping-tyfams: "Merged" master before update to "Good" (30d5fd7)

[Richard Eisenberg]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/template-haskell

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/30d5fd7d274903f35ad40d27d3b38548adbd4a6c

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

commit 30d5fd7d274903f35ad40d27d3b38548adbd4a6c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 14:17:40 2013 +0100

    "Merged" master before update to "Good"

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

 Language/Haskell/TH/Ppr.hs    |    2 +-
 Language/Haskell/TH/Syntax.hs |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Language/Haskell/TH/Ppr.hs b/Language/Haskell/TH/Ppr.hs
index b9105d5..99f0564 100644
--- a/Language/Haskell/TH/Ppr.hs
+++ b/Language/Haskell/TH/Ppr.hs
@@ -52,7 +52,7 @@ instance Ppr Info where
     ppr (PrimTyConI name arity is_unlifted) 
       = text "Primitive"
 	<+> (if is_unlifted then text "unlifted" else empty)
-	<+> text "type construtor" <+> quotes (ppr name)
+	<+> text "type constructor" <+> quotes (ppr name)
 	<+> parens (text "arity" <+> int arity)
     ppr (ClassOpI v ty cls fix) 
       = text "Class op from" <+> ppr cls <> colon <+>
diff --git a/Language/Haskell/TH/Syntax.hs b/Language/Haskell/TH/Syntax.hs
index 91b1a7d..62b1999 100644
--- a/Language/Haskell/TH/Syntax.hs
+++ b/Language/Haskell/TH/Syntax.hs
@@ -185,7 +185,7 @@ newName s = Q (qNewName s)
 -- but carry on; use 'fail' to stop.
 report  :: Bool -> String -> Q ()
 report b s = Q (qReport b s)
-{-# DEPRECATED report "Use reportError or reportWarning instead" #-}
+{-# DEPRECATED report "Use reportError or reportWarning instead" #-} -- deprecated in 7.6
 
 -- | Report an error to the user, but allow the current splice's computation to carry on. To abort the computation, use 'fail'.
 reportError :: String -> Q ()
@@ -575,7 +575,7 @@ data NameFlavour
 --
 -- The long term solution to this is to use the binary package for annotation serialization and
 -- then remove this instance. However, to do _that_ we need to wait on binary to become stable, since
--- boot libraries cannot be upgraded seperately from GHC itself.
+-- boot libraries cannot be upgraded separately from GHC itself.
 --
 -- This instance cannot be derived automatically due to bug #2701
 instance Data NameFlavour where
@@ -1286,7 +1286,7 @@ type Kind = Type
 Haskell has a rich concrete syntax for types, including
   t1 -> t2, (t1,t2), [t], and so on
 In TH we represent all of this using AppT, with a distinguished
-type construtor at the head.  So,
+type constructor at the head.  So,
   Type              TH representation
   -----------------------------------------------
   t1 -> t2          ArrowT `AppT` t2 `AppT` t2