Tue Nov 28 11:44:24 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/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/f84ddf06c9daf86a2e15bf44cf877ce2324967cf

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

commit f84ddf06c9daf86a2e15bf44cf877ce2324967cf
Merge: 228a0d7 8410dd3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Feb 8 17:56:17 2016 +0100

    Merge branch 'anchors-redux'


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

f84ddf06c9daf86a2e15bf44cf877ce2324967cf
 .../resources/html/Ocean.std-theme/ocean.css       |  13 +-
 haddock-api/src/Haddock/Backends/Xhtml/Layout.hs   |  11 +-
 haddock-api/src/Haddock/Backends/Xhtml/Names.hs    |   6 +-
 haddock-api/src/Haddock/Backends/Xhtml/Utils.hs    |   2 +-
 html-test/ref/A.html                               |  24 +-
 html-test/ref/B.html                               |  14 +-
 html-test/ref/Bold.html                            |   6 +-
 html-test/ref/Bug1.html                            |   6 +-
 html-test/ref/Bug195.html                          |  22 +-
 html-test/ref/Bug2.html                            |   4 +-
 html-test/ref/Bug201.html                          |  12 +-
 html-test/ref/Bug253.html                          |   6 +-
 html-test/ref/Bug26.html                           |  28 +-
 html-test/ref/Bug294.html                          |  32 +-
 html-test/ref/Bug298.html                          |  30 +-
 html-test/ref/Bug3.html                            |   4 +-
 html-test/ref/Bug308.html                          |  18 +-
 html-test/ref/Bug308CrossModule.html               |   6 +-
 html-test/ref/Bug310.html                          |   4 +-
 html-test/ref/Bug313.html                          |  12 +-
 html-test/ref/Bug335.html                          |  12 +-
 html-test/ref/Bug387.html                          |  12 +-
 html-test/ref/Bug4.html                            |   4 +-
 html-test/ref/Bug6.html                            |  36 +-
 html-test/ref/Bug7.html                            |  16 +-
 html-test/ref/Bug8.html                            |  34 +-
 html-test/ref/Bug85.html                           |  18 +-
 html-test/ref/BugDeprecated.html                   |  24 +-
 html-test/ref/BugExportHeadings.html               |  24 +-
 html-test/ref/Bugs.html                            |   8 +-
 html-test/ref/DeprecatedClass.html                 |  20 +-
 html-test/ref/DeprecatedData.html                  |  16 +-
 html-test/ref/DeprecatedFunction.html              |   8 +-
 html-test/ref/DeprecatedFunction2.html             |   4 +-
 html-test/ref/DeprecatedFunction3.html             |   4 +-
 html-test/ref/DeprecatedModule.html                |   4 +-
 html-test/ref/DeprecatedModule2.html               |   4 +-
 html-test/ref/DeprecatedNewtype.html               |  12 +-
 html-test/ref/DeprecatedReExport.html              |   4 +-
 html-test/ref/DeprecatedRecord.html                |  10 +-
 html-test/ref/DeprecatedTypeFamily.html            |   8 +-
 html-test/ref/DeprecatedTypeSynonym.html           |   8 +-
 html-test/ref/Examples.html                        |   4 +-
 html-test/ref/Extensions.html                      |   6 +-
 html-test/ref/FunArgs.html                         |  20 +-
 html-test/ref/GADTRecords.html                     |  16 +-
 html-test/ref/Hash.html                            |  44 ++-
 html-test/ref/HiddenInstances.html                 |  32 +-
 html-test/ref/HiddenInstancesB.html                |  14 +-
 html-test/ref/Hyperlinks.html                      |   4 +-
 html-test/ref/IgnoreExports.html                   |   8 +-
 html-test/ref/ImplicitParams.html                  |  22 +-
 html-test/ref/Instances.html                       | 434 ++++++++++++++++-----
 html-test/ref/Math.html                            |   4 +-
 html-test/ref/Minimal.html                         | 138 ++++---
 html-test/ref/ModuleWithWarning.html               |   4 +-
 html-test/ref/Nesting.html                         |  48 ++-
 html-test/ref/NoLayout.html                        |   4 +-
 html-test/ref/NonGreedy.html                       |   6 +-
 html-test/ref/Operators.html                       |  72 ++--
 html-test/ref/OrphanInstances.html                 |   4 +
 html-test/ref/OrphanInstancesClass.html            |   8 +-
 html-test/ref/OrphanInstancesType.html             |   6 +-
 html-test/ref/PatternSyns.html                     |  40 +-
 html-test/ref/PromotedTypes.html                   |  32 +-
 html-test/ref/Properties.html                      |   4 +-
 html-test/ref/QuasiExpr.html                       |  56 ++-
 html-test/ref/QuasiQuote.html                      |   4 +-
 html-test/ref/SpuriousSuperclassConstraints.html   |  34 +-
 html-test/ref/TH.html                              |   6 +-
 html-test/ref/TH2.html                             |   6 +-
 html-test/ref/Test.html                            | 286 +++++++++-----
 html-test/ref/Threaded.html                        |   4 +-
 html-test/ref/Threaded_TH.html                     |   6 +-
 html-test/ref/Ticket112.html                       |   6 +-
 html-test/ref/Ticket61.html                        |  10 +-
 html-test/ref/Ticket75.html                        |  12 +-
 html-test/ref/TitledPicture.html                   |   8 +-
 html-test/ref/TypeFamilies.html                    | 182 +++++++--
 html-test/ref/TypeFamilies2.html                   |  32 +-
 html-test/ref/TypeOperators.html                   |  64 +--
 html-test/ref/Unicode.html                         |   4 +-
 html-test/ref/Visible.html                         |   4 +-
 html-test/ref/ocean.css                            |  15 +-
 84 files changed, 1601 insertions(+), 662 deletions(-)