Mon Nov 20 21:00:18 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,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,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
Link       : http://git.haskell.org/haddock.git/commitdiff/228a0d72baa04be161b0fc918266f2edb0c6519b

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

commit 228a0d72baa04be161b0fc918266f2edb0c6519b
Merge: 8a4c949 a427f59
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Feb 8 15:40:44 2016 +0100

    Merge branch 'fix-up-testsuite'


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

228a0d72baa04be161b0fc918266f2edb0c6519b
 haddock-api/haddock-api.cabal                     |    8 +-
 haddock-test/haddock-test.cabal                   |    2 +-
 haddock-test/src/Test/Haddock.hs                  |   40 +-
 haddock-test/src/Test/Haddock/Config.hs           |    6 +-
 haddock.cabal                                     |    2 +-
 hoogle-test/Main.hs                               |    3 +-
 html-test/Main.hs                                 |    6 +-
 html-test/ref/A.html                              |   65 +-
 html-test/ref/B.html                              |   63 +-
 html-test/ref/Bold.html                           |   31 +-
 html-test/ref/Bug1.html                           |   35 +-
 html-test/ref/Bug195.html                         |   49 +-
 html-test/ref/Bug2.html                           |   27 +-
 html-test/ref/Bug201.html                         |   31 +-
 html-test/ref/Bug253.html                         |   29 +-
 html-test/ref/Bug26.html                          |   55 +-
 html-test/ref/Bug294.html                         |   77 +-
 html-test/ref/Bug298.html                         |   51 +-
 html-test/ref/Bug3.html                           |   31 +-
 html-test/ref/Bug308.html                         |   39 +-
 html-test/ref/Bug308CrossModule.html              |   35 +-
 html-test/ref/Bug310.html                         |   31 +-
 html-test/ref/Bug313.html                         |   33 +-
 html-test/ref/Bug335.html                         |   31 +-
 html-test/ref/Bug387.html                         |   41 +-
 html-test/ref/Bug4.html                           |   31 +-
 html-test/ref/Bug6.html                           |  119 +-
 html-test/ref/Bug7.html                           |   49 +-
 html-test/ref/Bug8.html                           |   65 +-
 html-test/ref/Bug85.html                          |   61 +-
 html-test/ref/BugDeprecated.html                  |   71 +-
 html-test/ref/BugExportHeadings.html              |   83 +-
 html-test/ref/Bugs.html                           |   31 +-
 html-test/ref/DeprecatedClass.html                |   63 +-
 html-test/ref/DeprecatedData.html                 |   47 +-
 html-test/ref/DeprecatedFunction.html             |   41 +-
 html-test/ref/DeprecatedFunction2.html            |   31 +-
 html-test/ref/DeprecatedFunction3.html            |   31 +-
 html-test/ref/DeprecatedModule.html               |   31 +-
 html-test/ref/DeprecatedModule2.html              |   27 +-
 html-test/ref/DeprecatedNewtype.html              |   47 +-
 html-test/ref/DeprecatedReExport.html             |   39 +-
 html-test/ref/DeprecatedRecord.html               |   49 +-
 html-test/ref/DeprecatedTypeFamily.html           |   55 +-
 html-test/ref/DeprecatedTypeSynonym.html          |   39 +-
 html-test/ref/Examples.html                       |   37 +-
 html-test/ref/Extensions.html                     |   27 +-
 html-test/ref/FunArgs.html                        |   53 +-
 html-test/ref/GADTRecords.html                    |  105 +-
 html-test/ref/Hash.html                           |  157 +-
 html-test/ref/HiddenInstances.html                |   95 +-
 html-test/ref/HiddenInstancesB.html               |   39 +-
 html-test/ref/Hyperlinks.html                     |   35 +-
 html-test/ref/IgnoreExports.html                  |   39 +-
 html-test/ref/ImplicitParams.html                 |   49 +-
 html-test/ref/Instances.html                      | 1708 +++++++++++++++++
 html-test/ref/Math.html                           |   29 +-
 html-test/ref/Minimal.html                        |  123 +-
 html-test/ref/ModuleWithWarning.html              |   31 +-
 html-test/ref/NamedDoc.html                       |   23 +-
 html-test/ref/Nesting.html                        |   55 +-
 html-test/ref/NoLayout.html                       |   33 +-
 html-test/ref/NonGreedy.html                      |   31 +-
 html-test/ref/Operators.html                      |  175 +-
 html-test/ref/OrphanInstances.html                |   35 +-
 html-test/ref/OrphanInstancesClass.html           |   31 +-
 html-test/ref/OrphanInstancesType.html            |   31 +-
 html-test/ref/PatternSyns.html                    |  113 +-
 html-test/ref/PromotedTypes.html                  |  105 +-
 html-test/ref/Properties.html                     |   37 +-
 html-test/ref/PruneWithWarning.html               |   23 +-
 html-test/ref/QuasiExpr.html                      |  135 +-
 html-test/ref/QuasiQuote.html                     |   27 +-
 html-test/ref/SpuriousSuperclassConstraints.html  |   83 +-
 html-test/ref/TH.html                             |   25 +-
 html-test/ref/TH2.html                            |   25 +-
 html-test/ref/Test.html                           |  843 ++++-----
 html-test/ref/Threaded.html                       |   31 +-
 html-test/ref/{Threaded.html => Threaded_TH.html} |   58 +-
 html-test/ref/Ticket112.html                      |   29 +-
 html-test/ref/Ticket61.html                       |   35 +-
 html-test/ref/Ticket75.html                       |   43 +-
 html-test/ref/TitledPicture.html                  |   43 +-
 html-test/ref/TypeFamilies.html                   |  669 +++----
 html-test/ref/TypeFamilies2.html                  |   85 +-
 html-test/ref/TypeOperators.html                  |   67 +-
 html-test/ref/Unicode.html                        |   31 +-
 html-test/ref/Visible.html                        |   29 +-
 hypsrc-test/Main.hs                               |    6 +-
 hypsrc-test/ref/src/Classes.html                  |  159 +-
 hypsrc-test/ref/src/Constructors.html             |   75 +-
 hypsrc-test/ref/src/Identifiers.html              |  125 +-
 hypsrc-test/ref/src/Literals.html                 |   11 +-
 hypsrc-test/ref/src/Operators.html                |  127 +-
 hypsrc-test/ref/src/Polymorphism.html             | 2036 +++++++++++++++++++++
 hypsrc-test/ref/src/Records.html                  |  183 +-
 hypsrc-test/ref/src/Types.html                    |   17 +-
 hypsrc-test/src/Polymorphism.hs                   |    8 +-
 latex-test/Main.hs                                |    3 +-
 99 files changed, 6839 insertions(+), 3219 deletions(-)