cmark

Unnamed repository; edit this file 'description' to name the repository.

commit a411013e62cfc1e94fddbd6c217c5e6ad365b34f
parent d3c3e749f4f7b95a9604f751cf993fd488a15b19
Author: John MacFarlane <jgm@berkeley.edu>
Date:   Tue,  7 Oct 2014 22:28:01 -0700

Merge branch 'master' into newemphasis

Conflicts:
	spec.txt

Diffstat:
Mspec.txt | 18+++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/spec.txt b/spec.txt
@@ -2010,7 +2010,7 @@ The following rules define [block quotes](#block-quote):
 <a id="block-quote"></a>
 
 1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
-    of blocks *Bs*, then the result of appending a [block quote
+    of blocks *Bs*, then the result of prepending a [block quote
     marker](#block-quote-marker) to the beginning of each line in *Ls*
     is a [block quote](#block-quote) containing *Bs*.
 
@@ -3686,9 +3686,9 @@ raw HTML:
 .
 
 .
-<http://google.com?find=\*>
+<http://example.com?find=\*>
 .
-<p><a href="http://google.com?find=%5C*">http://google.com?find=\*</a></p>
+<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
 .
 
 .
@@ -5529,9 +5529,9 @@ spec](http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#e-m
 Examples of email autolinks:
 
 .
-<foo@bar.baz.com>
+<foo@bar.example.com>
 .
-<p><a href="mailto:foo@bar.baz.com">foo@bar.baz.com</a></p>
+<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
 .
 
 .
@@ -5573,15 +5573,15 @@ These are not autolinks:
 .
 
 .
-http://google.com
+http://example.com
 .
-<p>http://google.com</p>
+<p>http://example.com</p>
 .
 
 .
-foo@bar.baz.com
+foo@bar.example.com
 .
-<p>foo@bar.baz.com</p>
+<p>foo@bar.example.com</p>
 .
 
 ## Raw HTML