diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-09 15:45:48 +0000 |
|---|---|---|
| committer | Julius Kvedaras <juliuskvedaras@yahoo.ie> | 2018-07-10 15:42:08 +0100 |
| commit | 2da13baad3f87b0f101a6205d5b24ef8fcc6315d (patch) | |
| tree | a7133d0c7c6b3ec9dc9a82d823a35a99397c363d | |
| parent | 803584be2cf25fc3e31177f3a3c1b1f96c36d647 (diff) | |
| download | gitlab-ce-2da13baad3f87b0f101a6205d5b24ef8fcc6315d.tar.gz | |
Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master'
Resolve "Markdown help incorrect in how wiki pages are rendered"
Closes #48970
See merge request gitlab-org/gitlab-ce!20459
| -rw-r--r-- | doc/user/markdown.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 8e87c896a72..bd199b55a61 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -9,7 +9,7 @@ > For the best result, we encourage you to check this document out as rendered by GitLab: [markdown.md] -_GitLab uses (as of 11.1) the [CommonMark Ruby Library][commonmarker] for Markdown processing of all new issues, merge requests, comments, and other Markdown content in the GitLab system. Previous content and Markdown files `.md` in the repositories are still processed using the [Redcarpet Ruby library][redcarpet]._ +_GitLab uses (as of 11.1) the [CommonMark Ruby Library][commonmarker] for Markdown processing of all new issues, merge requests, comments, and other Markdown content in the GitLab system. Previous content, wiki pages and Markdown files (`.md`) in the repositories are still processed using the [Redcarpet Ruby library][redcarpet]._ _Where there are significant differences, we will try to call them out in this document._ @@ -22,7 +22,7 @@ You can use GFM in the following areas: - merge requests - milestones - snippets (the snippet must be named with a `.md` extension) -- wiki pages +- wiki pages (currently only rendered by Redcarpet) - markdown documents inside the repository (currently only rendered by Redcarpet) You can also use other rich text files in GitLab. You might have to install a |