[commit: ghc] ghc-8.0: TH: Tweak Haddock language (1c3b1cb)

[git at git.haskell.org]

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/1c3b1cbddf3cab12348a20baa8fa8cde486c80e2/ghc

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

commit 1c3b1cbddf3cab12348a20baa8fa8cde486c80e2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Apr 17 12:58:24 2016 +0200

    TH: Tweak Haddock language
    
    (cherry picked from commit 89b66742b770311255a441f7fe641b9e212d87aa)


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

1c3b1cbddf3cab12348a20baa8fa8cde486c80e2
 libraries/template-haskell/Language/Haskell/TH/Syntax.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
index b76a5fe..9a7e019 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
@@ -1565,13 +1565,13 @@ data Dec
   | DefaultSigD Name Type         -- ^ @{ default size :: Data a => a -> Int }@
   deriving( Show, Eq, Ord, Data, Typeable, Generic )
 
--- | Properties for overlapping instances.
+-- | Varieties of allowed instance overlap.
 data Overlap = Overlappable   -- ^ May be overlapped by more specific instances
              | Overlapping    -- ^ May overlap a more general instance
              | Overlaps       -- ^ Both 'Overlapping' and 'Overlappable'
              | Incoherent     -- ^ Both 'Overlappable' and 'Overlappable', and
                               -- pick an arbitrary one if multiple choices are
-                              -- avaialble.
+                              -- available.
   deriving( Show, Eq, Ord, Data, Typeable, Generic )
 
 -- | Common elements of 'OpenTypeFamilyD' and 'ClosedTypeFamilyD'.