Merge branch 'master' into 'master'

Documentation - Markdown - added missing line-break info

as promised, I updated the Markdown documentation with the line-breaks info

See merge request !186

doc/markdown/markdown.md

@@ -46,14 +46,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](http://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
+    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