Merge branch 'master' into make-sure-that-all-block-parsers-are-finished

This commit is contained in:
Petra Baranski 2018-01-18 19:16:37 +01:00 gecommit door GitHub
bovenliggende e20ac6c514 ba9077a9fa
commit cbd8731795
Geen bekende sleutel gevonden voor deze handtekening in de database
GPG sleutel-ID: 4AEE18F83AFDEB23

Bestand weergeven

@ -58,7 +58,7 @@ results in
``` ```
* unorederd * unordered
* list * list
* items * items
* in * in
@ -68,6 +68,8 @@ results in
``` ```
results in results in
```html ```html
<ul>
<li>unordered
<ul> <ul>
<li>list</li> <li>list</li>
<li>items <li>items
@ -78,6 +80,8 @@ results in
</li> </li>
<li>hierarchy</li> <li>hierarchy</li>
</ul> </ul>
</li>
</ul>
``` ```
### ordered ### ordered
@ -89,13 +93,17 @@ results in
* items * items
``` ```
results in results in
```html ```html
<ol> <ol>
<li>ordered</li> <li>ordered</li>
<li>list</li> <li>list</li>
<li>items</li> <li>items</li>
</ol> </ol>
``` ```
``` ```
@ -108,7 +116,9 @@ results in
* hierarchy * hierarchy
``` ```
results in results in
```html ```html
<ol> <ol>
<li>ordered</li> <li>ordered</li>
@ -116,7 +126,9 @@ results in
<ol> <ol>
<li>items</li> <li>items</li>
<li>in <li>in
<ol>an</ol> <ol>
<li>an</li>
</ol>
</li> </li>
<li>hierarchy</li> <li>hierarchy</li>
</ol> </ol>