[commit: haddock] ghc-7.8, wip/pattern-synonym-sig-backport: Merge branch 'v2.14' into ghc-7.8 (aaa00e8)

[git at git.haskell.org]

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

On branches: ghc-7.8,wip/pattern-synonym-sig-backport
Link       : http://git.haskell.org/haddock.git/commitdiff/aaa00e86b224125aaa2d7d16bddb78c75103bff4

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

commit aaa00e86b224125aaa2d7d16bddb78c75103bff4
Merge: 87a6eed 32c6be7
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Jun 25 11:49:34 2014 +0200

    Merge branch 'v2.14' into ghc-7.8



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

aaa00e86b224125aaa2d7d16bddb78c75103bff4
 CHANGES                                            |  2 +
 doc/haddock.xml                                    |  8 +++-
 html-test/ref/{Bug201.html => Bug308.html}         | 47 +++++++++++++---------
 .../{Hyperlinks.html => Bug308CrossModule.html}    | 38 +++++++++--------
 html-test/src/Bug308.hs                            | 21 ++++++++++
 html-test/src/Bug308CrossModule.hs                 | 17 ++++++++
 src/Haddock/Backends/Xhtml/DocMarkup.hs            |  7 +++-
 src/Haddock/Parser.hs                              | 11 +++--
 test/Haddock/ParserSpec.hs                         | 13 ++++++
 9 files changed, 122 insertions(+), 42 deletions(-)