Wed Jul 8 08:28:49 UTC 2015

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/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/attoparsec-update,wip/landmine-param-family,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/remove-cabal-dep,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/f656de23cc8b73a08264886dfb91060f936f0d70

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

commit f656de23cc8b73a08264886dfb91060f936f0d70
Author: John MacFarlane <jgm at berkeley.edu>
Date:   Wed Jun 18 10:54:56 2014 -0700

    Fixed haddock warnings.


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

f656de23cc8b73a08264886dfb91060f936f0d70
 haddock-library/src/Documentation/Haddock/Parser.hs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/haddock-library/src/Documentation/Haddock/Parser.hs b/haddock-library/src/Documentation/Haddock/Parser.hs
index 860271e..37bf4ca 100644
--- a/haddock-library/src/Documentation/Haddock/Parser.hs
+++ b/haddock-library/src/Documentation/Haddock/Parser.hs
@@ -342,11 +342,9 @@ takeNonEmptyLine = do
 
 -- | Blocks of text of the form:
 --
--- @
--- > foo
--- > bar
--- > baz
--- @
+-- >> foo
+-- >> bar
+-- >> baz
 --
 birdtracks :: Parser (DocH mod a)
 birdtracks = DocCodeBlock . DocString . intercalate "\n" . stripSpace <$> many1 line
@@ -409,7 +407,7 @@ property :: Parser (DocH mod a)
 property = DocProperty . strip . decodeUtf8 <$> ("prop>" *> takeWhile1 (/= '\n'))
 
 -- |
--- Paragraph level codeblock. Anything between the two delimiting @ is parsed
+-- Paragraph level codeblock. Anything between the two delimiting \@ is parsed
 -- for markup.
 codeblock :: Parser (DocH mod Identifier)
 codeblock =

