[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, ghc-head, master, metainfo, v2.15, 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: Fix #313 by doing some list munging. (08db4c8)

[git at git.haskell.org]

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

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,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/08db4c81ffac672a4a5a90291be70279e9a1f098

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

commit 08db4c81ffac672a4a5a90291be70279e9a1f098
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Mon Jul 28 14:31:03 2014 +0200

    Fix #313 by doing some list munging.
    
    I get rid of the Monoid instance because we weren't satisfying the laws.
    Convenience of having <> didn't outweigh the shock-factor of having it
    behave badly.


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

08db4c81ffac672a4a5a90291be70279e9a1f098
 haddock-library/src/Documentation/Haddock/Doc.hs   | 12 ++-
 .../src/Documentation/Haddock/Parser.hs            | 26 +++----
 .../test/Documentation/Haddock/ParserSpec.hs       | 20 ++++-
 html-test/ref/{Bug308.html => Bug313.html}         | 89 +++++++++++++---------
 html-test/src/Bug313.hs                            | 37 +++++++++
 src/Haddock/Doc.hs                                 |  3 +-
 src/Haddock/Interface/Create.hs                    |  7 +-
 src/Haddock/Interface/LexParseRn.hs                |  4 +-
 8 files changed, 137 insertions(+), 61 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 08db4c81ffac672a4a5a90291be70279e9a1f098