summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-03-14 08:01:26 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-03-14 08:01:26 +0000
commitb0905366b01f1fb8633da90b489045684181602d (patch)
tree8630078057ecd701ee82cd48718668925be3540e
parentb6055bc1ea348998d2e468e7d4e81a91f7eb4077 (diff)
parent5111525a4a1dc6a4e5498875b9198c265d6ea288 (diff)
downloadgitlab-ce-b0905366b01f1fb8633da90b489045684181602d.tar.gz
Merge branch 'lm-docs-clarity' into 'master'
Update markdown.md example with asterisks and underscores for clarity See merge request !9915
-rw-r--r--doc/user/markdown.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index db06224bac2..97de428d11d 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -431,7 +431,7 @@ Emphasis, aka italics, with *asterisks* or _underscores_.
Strong emphasis, aka bold, with **asterisks** or __underscores__.
-Combined emphasis with **asterisks and _underscores_**.
+Combined emphasis with **_asterisks and underscores_**.
Strikethrough uses two tildes. ~~Scratch this.~~
```