[commit: haddock] alexbiehl-patch-1, ghc-head, ghc-head1, haddock-quick, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, 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: Merge remote-tracking branch 'origin/master' into ghc-head (e18d166)

git at git.haskell.org git at git.haskell.org
Mon Nov 20 21:00:35 UTC 2017


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

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,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/e18d166b39cdc8c6672b626b4b840c1c383a9685

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

commit e18d166b39cdc8c6672b626b4b840c1c383a9685
Merge: 57a5dcf 6a6029f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Feb 12 10:04:22 2016 +0100

    Merge remote-tracking branch 'origin/master' into ghc-head



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

e18d166b39cdc8c6672b626b4b840c1c383a9685
 doc/.gitignore                                     |    1 +
 doc/Makefile                                       |   10 +-
 doc/README.md                                      |   23 +-
 doc/aclocal.m4                                     |  174 --
 doc/conf.py                                        |   69 +
 doc/config.mk.in                                   |   15 -
 doc/configure.ac                                   |   12 -
 doc/docbook-xml.mk                                 |  130 --
 doc/fptools.css                                    |   36 -
 doc/ghc.mk                                         |    9 +-
 doc/haddock.xml                                    | 2329 --------------------
 doc/index.rst                                      |   21 +
 doc/intro.rst                                      |  164 ++
 doc/invoking.rst                                   |  458 ++++
 doc/markup.rst                                     |  887 ++++++++
 haddock-api/haddock-api.cabal                      |    8 +-
 .../resources/html/Ocean.std-theme/ocean.css       |   13 +-
 haddock-api/src/Haddock.hs                         |   13 +-
 haddock-api/src/Haddock/Backends/Xhtml.hs          |   31 +-
 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 +-
 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                               |   75 +-
 html-test/ref/B.html                               |   69 +-
 html-test/ref/Bold.html                            |   33 +-
 html-test/ref/Bug1.html                            |   37 +-
 html-test/ref/Bug195.html                          |   51 +-
 html-test/ref/Bug2.html                            |   29 +-
 html-test/ref/Bug201.html                          |   39 +-
 html-test/ref/Bug253.html                          |   33 +-
 html-test/ref/Bug26.html                           |   75 +-
 html-test/ref/Bug294.html                          |   93 +-
 html-test/ref/Bug298.html                          |   71 +-
 html-test/ref/Bug3.html                            |   33 +-
 html-test/ref/Bug308.html                          |   53 +-
 html-test/ref/Bug308CrossModule.html               |   39 +-
 html-test/ref/Bug310.html                          |   33 +-
 html-test/ref/Bug313.html                          |   41 +-
 html-test/ref/Bug335.html                          |   39 +-
 html-test/ref/Bug387.html                          |   49 +-
 html-test/ref/Bug4.html                            |   33 +-
 html-test/ref/Bug6.html                            |  129 +-
 html-test/ref/Bug7.html                            |   59 +-
 html-test/ref/Bug8.html                            |   77 +-
 html-test/ref/Bug85.html                           |   67 +-
 html-test/ref/BugDeprecated.html                   |   83 +-
 html-test/ref/BugExportHeadings.html               |   95 +-
 html-test/ref/Bugs.html                            |   35 +-
 html-test/ref/DeprecatedClass.html                 |   75 +-
 html-test/ref/DeprecatedData.html                  |   51 +-
 html-test/ref/DeprecatedFunction.html              |   45 +-
 html-test/ref/DeprecatedFunction2.html             |   33 +-
 html-test/ref/DeprecatedFunction3.html             |   33 +-
 html-test/ref/DeprecatedModule.html                |   33 +-
 html-test/ref/DeprecatedModule2.html               |   29 +-
 html-test/ref/DeprecatedNewtype.html               |   51 +-
 html-test/ref/DeprecatedReExport.html              |   41 +-
 html-test/ref/DeprecatedRecord.html                |   51 +-
 html-test/ref/DeprecatedTypeFamily.html            |   59 +-
 html-test/ref/DeprecatedTypeSynonym.html           |   43 +-
 html-test/ref/Examples.html                        |   39 +-
 html-test/ref/Extensions.html                      |   31 +-
 html-test/ref/FunArgs.html                         |   63 +-
 html-test/ref/GADTRecords.html                     |  107 +-
 html-test/ref/Hash.html                            |  189 +-
 html-test/ref/HiddenInstances.html                 |  123 +-
 html-test/ref/HiddenInstancesB.html                |   49 +-
 html-test/ref/Hyperlinks.html                      |   37 +-
 html-test/ref/IgnoreExports.html                   |   43 +-
 html-test/ref/ImplicitParams.html                  |   61 +-
 html-test/ref/Instances.html                       | 1938 ++++++++++++++++
 html-test/ref/Math.html                            |   31 +-
 html-test/ref/Minimal.html                         |  211 +-
 html-test/ref/ModuleWithWarning.html               |   33 +-
 html-test/ref/NamedDoc.html                        |   23 +-
 html-test/ref/Nesting.html                         |   87 +-
 html-test/ref/NoLayout.html                        |   35 +-
 html-test/ref/NonGreedy.html                       |   35 +-
 html-test/ref/Operators.html                       |  205 +-
 html-test/ref/OrphanInstances.html                 |   39 +-
 html-test/ref/OrphanInstancesClass.html            |   35 +-
 html-test/ref/OrphanInstancesType.html             |   33 +-
 html-test/ref/PatternSyns.html                     |  137 +-
 html-test/ref/PromotedTypes.html                   |  115 +-
 html-test/ref/Properties.html                      |   39 +-
 html-test/ref/PruneWithWarning.html                |   23 +-
 html-test/ref/QuasiExpr.html                       |  165 +-
 html-test/ref/QuasiQuote.html                      |   29 +-
 html-test/ref/SpuriousSuperclassConstraints.html   |  115 +-
 html-test/ref/TH.html                              |   29 +-
 html-test/ref/TH2.html                             |   29 +-
 html-test/ref/Test.html                            |  975 ++++----
 html-test/ref/Threaded.html                        |   33 +-
 html-test/ref/{Threaded.html => Threaded_TH.html}  |   58 +-
 html-test/ref/Ticket112.html                       |   33 +-
 html-test/ref/Ticket61.html                        |   41 +-
 html-test/ref/Ticket75.html                        |   49 +-
 html-test/ref/TitledPicture.html                   |   47 +-
 html-test/ref/TypeFamilies.html                    |  785 ++++---
 html-test/ref/TypeFamilies2.html                   |  107 +-
 html-test/ref/TypeOperators.html                   |  105 +-
 html-test/ref/Unicode.html                         |   33 +-
 html-test/ref/Visible.html                         |   31 +-
 html-test/ref/ocean.css                            |   15 +-
 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 +-
 121 files changed, 9572 insertions(+), 6113 deletions(-)




More information about the ghc-commits mailing list