Permalink
Browse files

Merge

  • Loading branch information...
2 parents fdcad23 + d793b93 commit bd38aa15e6d6b7f3f7ee3dc39e8a5a8b86acda75 @bos committed Aug 25, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 Data/Attoparsec/ByteString/Internal.hs
  2. +2 −2 Data/Attoparsec/Text/Internal.hs
@@ -215,11 +215,11 @@ take n = takeWith n (const True)
-- /Note/: The behaviour of this parser is different to that of the
-- similarly-named parser in Parsec, as this one is all-or-nothing.
-- To illustrate the difference, the following parser will fail under
--- Parsec given an input of @"for"@:
+-- Parsec given an input of @\"for\"@:
--
-- >string "foo" <|> string "for"
--
--- The reason for its failure is that that the first branch is a
+-- The reason for its failure is that the first branch is a
-- partial match, and will consume the letters @\'f\'@ and @\'o\'@
-- before failing. In Attoparsec, the above parser will /succeed/ on
-- that input, because the failed first branch will consume nothing.
@@ -213,11 +213,11 @@ take n = takeWith n (const True)
-- /Note/: The behaviour of this parser is different to that of the
-- similarly-named parser in Parsec, as this one is all-or-nothing.
-- To illustrate the difference, the following parser will fail under
--- Parsec given an input of @"for"@:
+-- Parsec given an input of @\"for\"@:
--
-- >string "foo" <|> string "for"
--
--- The reason for its failure is that that the first branch is a
+-- The reason for its failure is that the first branch is a
-- partial match, and will consume the letters @\'f\'@ and @\'o\'@
-- before failing. In Attoparsec, the above parser will /succeed/ on
-- that input, because the failed first branch will consume nothing.

0 comments on commit bd38aa1

Please sign in to comment.