[commit: haddock] ghc-head, ghc-head1, wip/T14529, wip/revert-ttg-2017-11-20, 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: Merge remote-tracking branch 'origin/ghc-head' into HEAD (671b62d)

[git at git.haskell.org]

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

On branches: ghc-head,ghc-head1,wip/T14529,wip/revert-ttg-2017-11-20,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/671b62d104751fd0ab8daf6b9cda1b971abf331f

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

commit 671b62d104751fd0ab8daf6b9cda1b971abf331f
Merge: 406030f e498b78
Author: alexbiehl <alex.biehl at gmail.com>
Date:   Sun Oct 8 19:38:21 2017 +0200

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



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

671b62d104751fd0ab8daf6b9cda1b971abf331f
 haddock-api/haddock-api.cabal                      |   6 +-
 haddock-api/src/Haddock.hs                         |  21 +-
 haddock-api/src/Haddock/Backends/Hoogle.hs         |  34 +-
 .../src/Haddock/Backends/Hyperlinker/Ast.hs        |  30 +-
 haddock-api/src/Haddock/Backends/LaTeX.hs          |  97 ++--
 haddock-api/src/Haddock/Backends/Xhtml.hs          |  12 +-
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs     | 150 +++---
 haddock-api/src/Haddock/Convert.hs                 |  63 +--
 haddock-api/src/Haddock/GhcUtils.hs                |  31 +-
 haddock-api/src/Haddock/Interface.hs               |  19 +-
 .../src/Haddock/Interface/AttachInstances.hs       |  13 +-
 haddock-api/src/Haddock/Interface/Create.hs        | 519 ++++++++++-----------
 haddock-api/src/Haddock/Interface/Json.hs          |   3 -
 haddock-api/src/Haddock/Interface/LexParseRn.hs    |   3 +-
 haddock-api/src/Haddock/Interface/Rename.hs        | 157 ++++---
 haddock-api/src/Haddock/Interface/Specialize.hs    |  53 +--
 haddock-api/src/Haddock/InterfaceFile.hs           |  13 +-
 haddock-api/src/Haddock/Types.hs                   |  80 ++--
 haddock-api/src/Haddock/Utils.hs                   |  20 +-
 haddock-library/haddock-library.cabal              |   4 +-
 haddock-test/haddock-test.cabal                    |   2 +-
 haddock.cabal                                      |   4 +-
 22 files changed, 664 insertions(+), 670 deletions(-)