diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 08:37:28 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 08:37:28 -0700 |
| commit | eda120dc4d8599e293afec7789847fd22ca0c1b0 (patch) | |
| tree | ff008fc6295433fe6f54f62b89c18dd92b89a278 /doc/markdown | |
| parent | d554070a62b0bc34ab2289d4a071b950df4d5485 (diff) | |
| parent | f729f6044717635ca2dfbe054fa863d068de5c98 (diff) | |
| download | gitlab-ce-eda120dc4d8599e293afec7789847fd22ca0c1b0.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'doc/markdown')
| -rw-r--r-- | doc/markdown/markdown.md | 7 |
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 |