[commit: haddock] ghc-7.8: Merge remote-tracking branch 'v2.14' into ghc-7.8 (e0299ec)

[git at git.haskell.org]

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

On branch  : ghc-7.8
Link       : http://git.haskell.org/haddock.git/commitdiff/e0299ec51516db981ec0aeb74982d0e7dfc03c58

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

commit e0299ec51516db981ec0aeb74982d0e7dfc03c58
Merge: d74fe55 40d2b41
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Mar 21 18:20:37 2014 +0100

    Merge remote-tracking branch 'v2.14' into ghc-7.8
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>



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

e0299ec51516db981ec0aeb74982d0e7dfc03c58
 haddock.cabal                            |    2 +-
 html-test/ref/DeprecatedClass.html       |   16 --
 html-test/ref/Hash.html                  |    8 -
 html-test/ref/Test.html                  |    8 -
 html-test/ref/Ticket61.html              |    8 -
 html-test/ref/TypeFamilies.html          |  304 ++++++++++++++++++++++--------
 html-test/src/Minimal.hs                 |   40 ++++
 html-test/src/TypeFamilies.hs            |   16 +-
 resources/html/Ocean.std-theme/ocean.css |    7 +-
 src/Haddock/Backends/Xhtml/Decl.hs       |   23 ++-
 src/Haddock/Backends/Xhtml/Layout.hs     |    8 +-
 11 files changed, 298 insertions(+), 142 deletions(-)