--- markdown version 1 Thu Jul 09 23:10:16 -0700 2009
+++ markdown version 2 Thu Jan 21 13:02:17 -0800 2010
@@ -1,117 +1,58 @@
-Phrase Emphasis
-
*italic* **bold**
_italic_ __bold__
-Links
+Links and images include the text or alternate text in preceding brackets:
+An [Inline URL](http://url.com/ "With a title")
+A [reference to example link][id]. This would be followed later by:
+[id]: http://example.com/ "Title"
-Inline:
-
-An [example](http://url.com/ "Title")
-Reference-style labels (titles are optional):
-
-An [example][id]. Then, anywhere
-else in the doc, define the link:
-
- [id]: http://example.com/ "Title"
-
-Images:
-
Inline (titles are optional):
-
-Reference-style:
-
-![alt text][id]
-
+
+![a referenced image][id] would be followed later by:
[id]: /url/to/img.jpg "Title"
-Headers
-Setext-style:
-
Header 1
========
-
Header 2
--------
-
-atx-style (closing #'s are optional):
-
+or
# Header 1 #
-
## Header 2 ##
+(closing #'s are optional)
-###### Header 6
+1. First ordered list item
+2. Second item
-Lists
+* An unordered list item.
-Ordered, without paragraphs:
-
-1. Foo
-2. Bar
-
-Unordered, with paragraphs:
-
-* A list item.
-
With multiple paragraphs.
-* Bar
+* Another unordered list item
+ 1. With a nested item below it
-You can nest them:
-
-* Abacus
- * answer
-* Bubbles
- 1. bunk
- 2. bupkis
- * BELITTLER
- 3. burper
-* Cunning
-
-Blockquotes
-
> Email-style angle brackets
> are used for blockquotes.
> > And, they can be nested.
> #### Headers in blockquotes
>
> * You can quote a list.
> * Etc.
-Code Spans
+`<code>` spans are delimited by backticks. You can include literal
+backticks like `` `this` ``.
-`<code>` spans are delimited
-by backticks.
-
-You can include literal backticks
-like `` `this` ``.
-
-Preformatted Code Blocks
-
-Indent every line of a code block by at least 4 spaces or 1 tab.
-
This is a normal paragraph.
- This is a preformatted
- code block.
+ This is a preformatted code block. It must be indented
+ either by at least four spaces or a tab
-Horizontal Rules
-
-Three or more dashes or asterisks:
-
+Three or more dashes or asterisks make a horizontal rule:
---
-
* * *
-
- - - -
-Manual Line Breaks
-
-End a line with two or more spaces:
-
-Roses are red,
-Violets are blue.
+Finally, end a line with two or more spaces to do a manual line break