summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-12-04 18:58:41 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-12-04 18:58:41 +0000
commit89c7db6aec2e9f893fb5411f4341230015f840d9 (patch)
treec388eb4524d5126a1cebead551b27fe49a58b4ec
parentbd67459131e22273b502eb27d97709827ff42262 (diff)
parente4afac13b707e621b241827544de5d11161dddc2 (diff)
downloadgitlab-ce-89c7db6aec2e9f893fb5411f4341230015f840d9.tar.gz
Merge branch '25148_fix_gfm_typo' into 'master'
Fix gfm doc typo about two spaces for next line transfer Fixes #25148 See merge request !7915
-rw-r--r--doc/user/markdown.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 162d1bd7ed4..85b165ac44f 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -604,7 +604,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 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
spaces.
```
@@ -616,7 +616,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 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
spaces.