summaryrefslogtreecommitdiff
path: root/doc/markdown/markdown.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/markdown/markdown.md')
-rw-r--r--doc/markdown/markdown.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 008e37d11f9..f49f09756ab 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -45,6 +45,10 @@ You can use GFM in
* milestones
* wiki pages
+You can also use other rich text files in GitLab.
+You might have to install a depency to do so.
+Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+
Newlines
--------
The biggest difference that GFM introduces is in the handling of linebreaks. With traditional Markdown you can hard wrap paragraphs of text and they will be combined into a single paragraph. We find this to be the cause of a huge number of unintentional formatting errors. GFM treats newlines in paragraph-like content as real line breaks, which is probably what you intended.