summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-03-25 08:16:16 +0000
committerHannes Rosenögger <123haynes@gmail.com>2015-03-25 08:16:16 +0000
commitde9d51eea36a084376715f043ce3fc218ffd9855 (patch)
treee0eff24fea3c65651a95bd0c03ae54700819e044 /doc
parent8f3f6e9efbbacf5e52f98324944f644630da2f18 (diff)
parentfec3a34bed67da87c37898e6ce5f71d55db2811d (diff)
downloadgitlab-ce-de9d51eea36a084376715f043ce3fc218ffd9855.tar.gz
Merge branch 'master' into 'master'
Documentation - Markdown - added missing line-break info as promised, I updated the Markdown documentation with the line-breaks info See merge request !186
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown/markdown.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index b66583bb363..181db287201 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -46,14 +46,15 @@ You can also use other rich text files in GitLab. You might have to install a de
GFM honors the markdown specification in how [paragraphs and line breaks are handled](http://daringfireball.net/projects/markdown/syntax#p).
-A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.:
+A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.
+Line-breaks, or softreturns, are rendered if you end a line with two or more spaces
- Roses are red
+ Roses are red [followed by two or more spaces]
Violets are blue
Sugar is sweet
-Roses are red
+Roses are red
Violets are blue
Sugar is sweet