[commit: haddock] ghc-7.8: Merge tag 'haddock-2.14.0-release' into ghc-7.8 (3945c9a)

[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/3945c9aaf13064f768aceb1dc93a43e211e9f4e0

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

commit 3945c9aaf13064f768aceb1dc93a43e211e9f4e0
Merge: e0865f5 1063ade
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Mar 12 10:28:39 2014 +0100

    Merge tag 'haddock-2.14.0-release' into ghc-7.8
    
    This merge has been done in such a way that this commit's tree corresponds
    exactly to the tree pointed to by the haddock-2.14.0-release tag.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>



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

3945c9aaf13064f768aceb1dc93a43e211e9f4e0
 CHANGES                                         |   20 +-
 doc/haddock.xml                                 |   30 ++
 html-test/ref/{GADTRecords.html => Bug195.html} |  178 ++++-----
 html-test/ref/Bug8.html                         |   14 +-
 html-test/ref/Operators.html                    |  457 +++++++++++++++++++++++
 html-test/src/Bug195.hs                         |   11 +
 html-test/src/Operators.hs                      |   64 ++++
 html-test/src/TypeFamilies2.hs                  |    8 +
 resources/html/Ocean.std-theme/ocean.css        |   13 +
 src/Haddock.hs                                  |    6 +-
 src/Haddock/Backends/Hoogle.hs                  |    2 +-
 src/Haddock/Backends/LaTeX.hs                   |   11 +-
 src/Haddock/Backends/Xhtml.hs                   |   14 +-
 src/Haddock/Backends/Xhtml/Decl.hs              |  299 +++++++++------
 src/Haddock/Backends/Xhtml/Layout.hs            |   12 +-
 src/Haddock/Backends/Xhtml/Types.hs             |   12 +-
 src/Haddock/Backends/Xhtml/Utils.hs             |   17 +-
 src/Haddock/Interface/AttachInstances.hs        |   70 ++--
 src/Haddock/Interface/Create.hs                 |   74 ++--
 src/Haddock/Interface/Rename.hs                 |   10 +-
 src/Haddock/InterfaceFile.hs                    |   11 +-
 src/Haddock/Options.hs                          |   25 +-
 src/Haddock/Types.hs                            |   13 +
 23 files changed, 1040 insertions(+), 331 deletions(-)