summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-03-13 10:25:58 +0000
committerHannes Rosenögger <123haynes@gmail.com>2015-03-13 10:25:58 +0000
commit12f1a42eccb8c11031ee84157ed5dc6ce0bf23cc (patch)
tree7631ded73cc7545939f7761a5a3074be9b8719ab /doc
parent606d24ff2df157ec70003132d1ead7a47dc32883 (diff)
parent59ebcfe0e041e68fc666c3d6c8de23bb45e6fb41 (diff)
downloadgitlab-ce-12f1a42eccb8c11031ee84157ed5dc6ce0bf23cc.tar.gz
Merge branch 'enhance_markdown_linebreak_docs' into 'master'
Enhance Markdown linebreak docs The "Line Breaks" section within the Markdown docs was missing an example of creating a line break within a paragraph by ending a line with two spaces. See merge request !335
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown/markdown.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 52779103775..64f28d46451 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -485,6 +485,10 @@ This line is separated from the one above by two newlines, so it will be a *sepa
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 also a separate paragraph, and...
+This line is on its own line, because the previous line ends with two
+spaces.
```
Here's a line for us to start with.
@@ -494,6 +498,10 @@ This line is separated from the one above by two newlines, so it will be a *sepa
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, and...
+This line is on its own line, because the previous line ends with two
+spaces.
+
## Tables
Tables aren't part of the core Markdown spec, but they are part of GFM and Markdown Here supports them.