[commit: haddock] ghc-7.8: Merge branch 'v2.14' into ghc-7.8 (288756b)

[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/288756b6f306dc7565f91025f8d3cc4fd7e892d2

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

commit 288756b6f306dc7565f91025f8d3cc4fd7e892d2
Merge: 42757dd 0fce760
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat May 3 15:25:43 2014 +0200

    Merge branch 'v2.14' into ghc-7.8
    
    This merges the soon-to-be-tagged haddock-2.14.3 into ghc-7.8
    to make sure the important bugfix release makes it into GHC 7.8.3
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>



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

288756b6f306dc7565f91025f8d3cc4fd7e892d2
 CHANGES                                    |    4 ++
 doc/haddock.xml                            |    2 +-
 haddock.cabal                              |    6 +-
 html-test/ref/{Bug201.html => Bug298.html} |   89 +++++++++++++++++++---------
 html-test/run.lhs                          |   14 ++++-
 html-test/src/Bug298.hs                    |   22 +++++++
 html-test/src/Bug85.hs                     |    1 -
 src/Haddock/Parser.hs                      |   10 +++-
 8 files changed, 112 insertions(+), 36 deletions(-)