Commit 79d6513f authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'markdown-attribution' into 'master'

Attribution where it is due.

Inspired by https://news.ycombinator.com/item?id=11431969

See merge request !3546
parents c61fe245 400a7b99
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
_GitLab uses the [Redcarpet Ruby library][redcarpet] for Markdown processing._ _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 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 ...@@ -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). 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 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 Violets are blue
Sugar is sweet Sugar is sweet
Roses are red Roses are red
Violets are blue Violets are blue
Sugar is sweet Sugar is sweet
...@@ -67,7 +67,7 @@ It is not reasonable to italicize just _part_ of a word, especially when you're ...@@ -67,7 +67,7 @@ It is not reasonable to italicize just _part_ of a word, especially when you're
perform_complicated_task perform_complicated_task
do_this_and_do_that_and_another_thing do_this_and_do_that_and_another_thing
perform_complicated_task perform_complicated_task
do_this_and_do_that_and_another_thing do_this_and_do_that_and_another_thing
## URL auto-linking ## URL auto-linking
...@@ -534,7 +534,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa ...@@ -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 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 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 This line is on its own line, because the previous line ends with two
spaces. spaces.
``` ```
...@@ -546,7 +546,7 @@ This line is separated from the one above by two newlines, so it will be a *sepa ...@@ -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 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 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 This line is on its own line, because the previous line ends with two
spaces. spaces.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment