[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Collapse user-defined section by default (re #335) (ad22493)

[git at git.haskell.org]

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/ad22493300eff0c1f55a617bdb129408011c35e0

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

commit ad22493300eff0c1f55a617bdb129408011c35e0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Oct 31 11:08:02 2014 +0100

    Collapse user-defined section by default (re #335)
    
    Conflicts:
    	haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs


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

ad22493300eff0c1f55a617bdb129408011c35e0
 haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
index 565adef..921e409 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/DocMarkup.hs
@@ -161,7 +161,7 @@ hackMarkup fmt' h' =
       CollapsingHeader (Header lvl titl) par n nm ->
         let id_ = makeAnchorId $ "ch:" ++ fromMaybe "noid:" nm ++ show n
             col' = collapseControl id_ True "caption"
-            instTable = (thediv ! collapseSection id_ True [] <<)
+            instTable = (thediv ! collapseSection id_ False [] <<)
             lvs = zip [1 .. ] [h1, h2, h3, h4, h5, h6]
             getHeader = fromMaybe caption (lookup lvl lvs)
             subCaption = getHeader ! col' << markup fmt titl