diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2016-04-05 18:03:02 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2016-04-05 18:03:02 +0000 |
| commit | 79d6513f360d7d305b4276777973dfd991c347f8 (patch) | |
| tree | 1990ce03c85ed914be654c82b52e247775ee5e35 | |
| parent | c61fe245295d8fbb98ead70cbc48ece2905bb4b6 (diff) | |
| parent | 400a7b995de5c35fa3a2df83e08867c736f72324 (diff) | |
| download | gitlab-ce-79d6513f360d7d305b4276777973dfd991c347f8.tar.gz | |
Merge branch 'markdown-attribution' into 'master'
Attribution where it is due.
Inspired by https://news.ycombinator.com/item?id=11431969
See merge request !3546
| -rw-r--r-- | doc/markdown/markdown.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index e6eb1cf3819..75d55b34171 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -31,7 +31,7 @@ _GitLab uses the [Redcarpet Ruby library][redcarpet] for Markdown processing._ -For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality. +For GitLab uses "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality. It was inspired by [GitHub Flavored Markdown](https://help.github.com/articles/basic-writing-and-formatting-syntax/). You can use GFM in @@ -47,15 +47,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](https://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 [followed by two or more spaces] + 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 @@ -67,7 +67,7 @@ It is not reasonable to italicize just _part_ of a word, especially when you're perform_complicated_task do_this_and_do_that_and_another_thing -perform_complicated_task +perform_complicated_task do_this_and_do_that_and_another_thing ## URL auto-linking @@ -534,7 +534,7 @@ 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 also a separate paragraph, and... This line is on its own line, because the previous line ends with two spaces. ``` @@ -546,7 +546,7 @@ 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 also a separate paragraph, and... This line is on its own line, because the previous line ends with two spaces. |