[commit: haddock] 2.17.3.1-spanfix, alexbiehl-patch-1, ghc-8.0, ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, v2.17, v2.17.3, v2.18, 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 pull request #514 from Helkafen/frames (eb5beb4)

Mon Nov 20 21:02:54 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,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/eb5beb400966243275233549e91f7b8f3d5d3c70

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

commit eb5beb400966243275233549e91f7b8f3d5d3c70
Merge: 7290bf9 02adc0a
Author: Sebastian Méric de Bellefon <arnaudpourseb at gmail.com>
Date:   Wed May 25 15:17:40 2016 -0400

    Merge pull request #514 from Helkafen/frames
    
    remove framed view of the HTML documentation (see #114 and #274)


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

eb5beb400966243275233549e91f7b8f3d5d3c70
 CHANGES                                    |  4 +++
 doc/invoking.rst                           |  8 ++----
 haddock-api/haddock-api.cabal              |  1 -
 haddock-api/resources/html/frames.html     | 30 ---------------------
 haddock-api/resources/html/haddock-util.js | 28 --------------------
 haddock-api/src/Haddock/Backends/Xhtml.hs  | 42 +++---------------------------
 haddock-api/src/Haddock/Utils.hs           | 12 ++-------
 html-test/ref/frames.html                  | 30 ---------------------
 html-test/ref/haddock-util.js              | 28 --------------------
 9 files changed, 11 insertions(+), 172 deletions(-)