@@ -1295,8 +1295,8 @@ Block quotations
1295Markdown uses email conventions for quoting blocks of text.
1295Markdown uses email conventions for quoting blocks of text.
1296A block quotation is one or more paragraphs or other block elements
1296A block quotation is one or more paragraphs or other block elements
1297(such as lists or headers), with each line preceded by a `>` character
1297(such as lists or headers), with each line preceded by a `>` character
1298−and a space. (The `>` need not start at the left margin, but it should
1298+and an optional space. (The `>` need not start at the left margin, but
1299−not be indented more than three spaces.)
1299+it should not be indented more than three spaces.)
1301 > This is a block quote. This
1301 > This is a block quote. This
1302 > paragraph has two lines.
1302 > paragraph has two lines.
@@ -1320,6 +1320,13 @@ other block quotes. That is, block quotes can be nested:
1321 > > A block quote within a block quote.
1321 > > A block quote within a block quote.
1323+If the `>` character is followed by an optional space, that space
1324+will be considered part of the block quote marker and not part of
1325+the indentation of the contents. Thus, to put an indented code
1326+block in a block quote, you need five spaces after the `>`:
1323#### Extension: `blank_before_blockquote` ####
1330#### Extension: `blank_before_blockquote` ####
1325Standard markdown syntax does not require a blank line before a block
1332Standard markdown syntax does not require a blank line before a block