summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-28 16:43:05 +0000
committerRémy Coutable <remy@rymai.me>2018-02-28 16:43:05 +0000
commit3c033360564d6115c7e94a024d929cd3f6953d23 (patch)
tree184c531fe95e939178d516699f04686fbe6bb120
parent235fa77312854b1d47f064a7fcbac68349526c38 (diff)
parent7de31641605576b18f551da1a525bb97ef56e8c4 (diff)
downloadgitlab-ce-3c033360564d6115c7e94a024d929cd3f6953d23.tar.gz
Merge branch 'patch-28' into 'master'
Replace whitespace demonstrating line-breaks in GFM docs See merge request gitlab-org/gitlab-ce!16135
-rw-r--r--doc/user/markdown.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index ea7b1c9a0ed..650d60f1585 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -36,12 +36,16 @@ GFM honors the markdown specification in how [paragraphs and line breaks are han
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 [followed by two or more spaces]
+[//]: # (Do *NOT* remove the two ending whitespaces in the following line.)
+[//]: # (They are needed for the Markdown text to render correctly.)
+ Roses are red [followed by two or more spaces]
Violets are blue
Sugar is sweet
-Roses are red
+[//]: # (Do *NOT* remove the two ending whitespaces in the following line.)
+[//]: # (They are needed for the Markdown text to render correctly.)
+Roses are red
Violets are blue
Sugar is sweet