Mon Nov 20 21:00:28 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/6a6029f1fc7b2cfeea8e231c8806d293d6644004

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

commit 6a6029f1fc7b2cfeea8e231c8806d293d6644004
Merge: 1ee7e9a bae468b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Feb 11 18:53:03 2016 +0100

    Merge pull request #480 from bgamari/sphinx
    
    Move documentation to ReStructuredText


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

6a6029f1fc7b2cfeea8e231c8806d293d6644004
 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 ++++++++++++++++++++
 15 files changed, 1617 insertions(+), 2721 deletions(-)