[commit: haddock] ghc-7.8: Merge branch 'v2.14' into ghc-7.8 (42757dd)
git at git.haskell.org
git at git.haskell.org
Tue Apr 1 20:21:01 UTC 2014
Repository : ssh://git@git.haskell.org/haddock
On branch : ghc-7.8
Link : http://git.haskell.org/haddock.git/commitdiff/42757dd19c2062945063c9f8359b561c2eed2031
>---------------------------------------------------------------
commit 42757dd19c2062945063c9f8359b561c2eed2031
Merge: 3e6da2f 0bd6361
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Tue Apr 1 21:55:06 2014 +0200
Merge branch 'v2.14' into ghc-7.8
This merges the soon-to-be-tagged haddock-2.14.2 into ghc-7.8
containing important last-minutes fixes (see changelog).
Note: this may require bumping the haddock.base resource-limit by 1% up
Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>
>---------------------------------------------------------------
42757dd19c2062945063c9f8359b561c2eed2031
CHANGES | 18 ++-
haddock.cabal | 5 +-
html-test/ref/A.html | 2 +-
html-test/ref/AdvanceTypes.html | 4 +-
html-test/ref/B.html | 2 +-
html-test/ref/Bold.html | 2 +-
html-test/ref/Bug1.html | 2 +-
html-test/ref/Bug195.html | 2 +-
html-test/ref/Bug2.html | 2 +-
html-test/ref/{IgnoreExports.html => Bug201.html} | 55 +++----
html-test/ref/Bug294.html | 165 +++++++++++++++++++++
html-test/ref/Bug3.html | 2 +-
html-test/ref/Bug4.html | 2 +-
html-test/ref/Bug6.html | 2 +-
html-test/ref/Bug7.html | 2 +-
html-test/ref/Bug8.html | 2 +-
html-test/ref/{Ticket253_2.html => Bug85.html} | 88 +++++++----
html-test/ref/BugDeprecated.html | 2 +-
html-test/ref/BugExportHeadings.html | 2 +-
html-test/ref/Bugs.html | 2 +-
html-test/ref/DeprecatedClass.html | 2 +-
html-test/ref/DeprecatedData.html | 2 +-
html-test/ref/DeprecatedFunction.html | 2 +-
html-test/ref/DeprecatedFunction2.html | 2 +-
html-test/ref/DeprecatedFunction3.html | 2 +-
html-test/ref/DeprecatedModule.html | 2 +-
html-test/ref/DeprecatedModule2.html | 2 +-
html-test/ref/DeprecatedNewtype.html | 2 +-
html-test/ref/DeprecatedReExport.html | 2 +-
html-test/ref/DeprecatedRecord.html | 2 +-
html-test/ref/DeprecatedTypeFamily.html | 2 +-
html-test/ref/DeprecatedTypeSynonym.html | 2 +-
html-test/ref/Examples.html | 2 +-
html-test/ref/Extensions.html | 2 +-
html-test/ref/FunArgs.html | 2 +-
html-test/ref/GADTRecords.html | 2 +-
html-test/ref/Hash.html | 2 +-
html-test/ref/HiddenInstances.html | 2 +-
html-test/ref/HiddenInstancesB.html | 2 +-
html-test/ref/Hyperlinks.html | 2 +-
html-test/ref/IgnoreExports.html | 2 +-
html-test/ref/ImplicitParams.html | 2 +-
html-test/ref/Minimal.html | 2 +-
html-test/ref/ModuleWithWarning.html | 2 +-
html-test/ref/NamedDoc.html | 2 +-
html-test/ref/Nesting.html | 2 +-
html-test/ref/NoLayout.html | 2 +-
html-test/ref/NonGreedy.html | 2 +-
html-test/ref/Operators.html | 2 +-
html-test/ref/PatternSyns.html | 2 +-
html-test/ref/Properties.html | 2 +-
html-test/ref/PruneWithWarning.html | 2 +-
html-test/ref/QuasiExpr.html | 2 +-
html-test/ref/QuasiQuote.html | 2 +-
html-test/ref/SpuriousSuperclassConstraints.html | 2 +-
html-test/ref/TH.html | 2 +-
html-test/ref/TH2.html | 2 +-
html-test/ref/Test.html | 2 +-
html-test/ref/Ticket112.html | 2 +-
html-test/ref/Ticket253_1.html | 2 +-
html-test/ref/Ticket253_2.html | 2 +-
html-test/ref/Ticket61.html | 2 +-
html-test/ref/Ticket75.html | 2 +-
html-test/ref/TitledPicture.html | 2 +-
html-test/ref/TypeFamilies.html | 2 +-
html-test/ref/TypeFamilies2.html | 2 +-
html-test/ref/TypeOperators.html | 2 +-
html-test/ref/Unicode.html | 2 +-
html-test/ref/Visible.html | 2 +-
html-test/src/Bug201.hs | 28 ++++
html-test/src/Bug294.hs | 37 +++++
html-test/src/Bug85.hs | 15 ++
src/Haddock.hs | 30 ++--
src/Haddock/Backends/Xhtml/Decl.hs | 16 +-
src/Haddock/Interface/Create.hs | 34 +++--
src/Haddock/Parser.hs | 31 +++-
test/Haddock/ParserSpec.hs | 28 +++-
77 files changed, 514 insertions(+), 166 deletions(-)
More information about the ghc-commits
mailing list