Tue Nov 28 11:43:01 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/0104ef892820383845b3dce44c46899fec2f04f0

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

commit 0104ef892820383845b3dce44c46899fec2f04f0
Merge: 2d4680f 3f50b95
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 25 11:03:11 2015 +0100

    Merge remote-tracking branch 'idontgetoutmuch/ghc-head' into ghc-head


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

0104ef892820383845b3dce44c46899fec2f04f0
 haddock-api/src/Haddock.hs                         |  5 ++--
 haddock-api/src/Haddock/Backends/Hoogle.hs         |  2 ++
 haddock-api/src/Haddock/Backends/LaTeX.hs          |  6 ++++
 haddock-api/src/Haddock/Backends/Xhtml.hs          | 24 ++++++++-------
 .../src/Haddock/Backends/Xhtml/DocMarkup.hs        |  3 ++
 haddock-api/src/Haddock/Interface/LexParseRn.hs    |  2 ++
 haddock-api/src/Haddock/InterfaceFile.hs           | 13 +++++++-
 haddock-api/src/Haddock/Options.hs                 |  7 +++++
 haddock-api/src/Haddock/Types.hs                   |  5 +++-
 haddock-api/src/Haddock/Utils.hs                   |  4 +++
 .../src/Documentation/Haddock/Parser.hs            | 22 +++++++++++++-
 haddock-library/src/Documentation/Haddock/Types.hs |  2 ++
 .../test/Documentation/Haddock/ParserSpec.hs       |  4 +++
 html-test/ref/Bug387.html                          |  2 ++
 html-test/ref/{Threaded.html => Math.html}         | 35 ++++++++++++++--------
 html-test/ref/mini_A.html                          |  2 ++
 html-test/ref/mini_AdvanceTypes.html               |  2 ++
 html-test/ref/mini_B.html                          |  2 ++
 html-test/ref/mini_Bug1.html                       |  2 ++
 html-test/ref/mini_Bug2.html                       |  2 ++
 html-test/ref/mini_Bug3.html                       |  2 ++
 html-test/ref/mini_Bug4.html                       |  2 ++
 html-test/ref/mini_Bug6.html                       |  2 ++
 html-test/ref/mini_Bug7.html                       |  2 ++
 html-test/ref/mini_Bug8.html                       |  2 ++
 html-test/ref/mini_BugDeprecated.html              |  2 ++
 html-test/ref/mini_BugExportHeadings.html          |  2 ++
 html-test/ref/mini_Bugs.html                       |  2 ++
 html-test/ref/mini_DeprecatedClass.html            |  2 ++
 html-test/ref/mini_DeprecatedData.html             |  2 ++
 html-test/ref/mini_DeprecatedFunction.html         |  2 ++
 html-test/ref/mini_DeprecatedFunction2.html        |  2 ++
 html-test/ref/mini_DeprecatedFunction3.html        |  2 ++
 html-test/ref/mini_DeprecatedModule.html           |  2 ++
 html-test/ref/mini_DeprecatedModule2.html          |  2 ++
 html-test/ref/mini_DeprecatedNewtype.html          |  2 ++
 html-test/ref/mini_DeprecatedReExport.html         |  2 ++
 html-test/ref/mini_DeprecatedRecord.html           |  2 ++
 html-test/ref/mini_DeprecatedTypeFamily.html       |  2 ++
 html-test/ref/mini_DeprecatedTypeSynonym.html      |  2 ++
 html-test/ref/mini_Examples.html                   |  2 ++
 html-test/ref/mini_FunArgs.html                    |  2 ++
 html-test/ref/mini_GADTRecords.html                |  2 ++
 html-test/ref/mini_Hash.html                       |  2 ++
 html-test/ref/mini_HiddenInstances.html            |  2 ++
 html-test/ref/mini_HiddenInstancesB.html           |  2 ++
 html-test/ref/mini_Hyperlinks.html                 |  2 ++
 html-test/ref/mini_IgnoreExports.html              |  2 ++
 .../ref/{mini_NonGreedy.html => mini_Math.html}    |  6 ++--
 html-test/ref/mini_ModuleWithWarning.html          |  2 ++
 html-test/ref/mini_NamedDoc.html                   |  2 ++
 html-test/ref/mini_NoLayout.html                   |  2 ++
 html-test/ref/mini_NonGreedy.html                  |  2 ++
 html-test/ref/mini_Properties.html                 |  2 ++
 html-test/ref/mini_PruneWithWarning.html           |  2 ++
 html-test/ref/mini_QuasiExpr.html                  |  2 ++
 html-test/ref/mini_QuasiQuote.html                 |  2 ++
 .../ref/mini_SpuriousSuperclassConstraints.html    |  2 ++
 html-test/ref/mini_TH.html                         |  2 ++
 html-test/ref/mini_TH2.html                        |  2 ++
 html-test/ref/mini_Test.html                       |  2 ++
 html-test/ref/mini_Ticket112.html                  |  2 ++
 html-test/ref/mini_Ticket61.html                   |  2 ++
 html-test/ref/mini_Ticket75.html                   |  2 ++
 html-test/ref/mini_TitledPicture.html              |  2 ++
 html-test/ref/mini_TypeFamilies.html               |  2 ++
 html-test/ref/mini_TypeOperators.html              |  2 ++
 html-test/ref/mini_Unicode.html                    |  2 ++
 html-test/ref/mini_Visible.html                    |  2 ++
 html-test/src/Math.hs                              | 14 +++++++++
 70 files changed, 232 insertions(+), 30 deletions(-)