Commit ddbb3c3016fa7ad6cea6d2d4e9086c98f9337e00

Authored by Dmitriy Zaporozhets
2 parents bb44a7a2 abb6204d

Merge branch 'markup-dependencies' into 'master'

Markup Dependencies
Showing 1 changed file with 4 additions and 0 deletions   Show diff stats
doc/markdown/markdown.md
@@ -45,6 +45,10 @@ You can use GFM in @@ -45,6 +45,10 @@ You can use GFM in
45 * milestones 45 * milestones
46 * wiki pages 46 * wiki pages
47 47
  48 +You can also use other rich text files in GitLab.
  49 +You might have to install a depency to do so.
  50 +Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
  51 +
48 Newlines 52 Newlines
49 -------- 53 --------
50 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. 54 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.