diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-25 13:19:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-25 13:19:03 +0000 |
| commit | 3bf46c84ed8fe419eaf4f6f6cefe1424854baf44 (patch) | |
| tree | eba4b5c5d8b87199ae1b401f456166d351ea9ff0 | |
| parent | bf83aaa55b979deadb42956a1736e09cad904f15 (diff) | |
| parent | a3f67eb9d82fe31bd216102bd428a44ce1b2d7b0 (diff) | |
| download | gitlab-ce-3bf46c84ed8fe419eaf4f6f6cefe1424854baf44.tar.gz | |
Merge branch 'patch-17' into 'master'
Update markdown.md
See merge request !10776
| -rw-r--r-- | doc/user/markdown.md | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 97de428d11d..0d29b471d52 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -431,7 +431,7 @@ Emphasis, aka italics, with *asterisks* or _underscores_. Strong emphasis, aka bold, with **asterisks** or __underscores__. -Combined emphasis with **_asterisks and underscores_**. +Combined emphasis with **asterisks and _underscores_**. Strikethrough uses two tildes. ~~Scratch this.~~ ``` @@ -640,10 +640,11 @@ Here's a line for us to start with. This line is separated from the one above by two newlines, so it will be a *separate paragraph*. This line is also a separate paragraph, but... -This line is only separated by a single newline, so it's a separate line in the *same paragraph*. +This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*. + +This line is also a separate paragraph, and... +This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*) -This line is also a separate paragraph, and... -This line is on its own line, because the previous line ends with two spaces. ``` @@ -651,11 +652,12 @@ Here's a line for us to start with. This line is separated from the one above by two newlines, so it will be a *separate paragraph*. -This line is also begins a separate paragraph, but... -This line is only separated by a single newline, so it's a separate line in the *same paragraph*. +This line is also a separate paragraph, but... +This line is only separated by a single newline, so it *does not break* and just follows the previous line in the *same paragraph*. + +This line is also a separate paragraph, and... +This line is *on its own line*, because the previous line ends with two spaces. (but still in the *same paragraph*) -This line is also a separate paragraph, and... -This line is on its own line, because the previous line ends with two spaces. ### Tables |