summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-25 21:03:56 +0000
committerRobert Speicher <robert@gitlab.com>2015-09-25 21:03:56 +0000
commit9ee96d45a3f123cba8ceb0b0147530dbeb04440a (patch)
tree8909eea5f27ee7774e56b6f948ca5fbaff87ef1b
parent136fec94bf13d1962ca932892041065fe4fdbb4e (diff)
parent3453b79c9d57d07d6772bdebd37ab691bfd84723 (diff)
downloadgitlab-ce-9ee96d45a3f123cba8ceb0b0147530dbeb04440a.tar.gz
Merge branch 'rs-correct-markdown-doc' into 'master'
Correct an inaccuracy in the Markdown doc [ci skip] See merge request !1445
-rw-r--r--doc/markdown/markdown.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index d83838127c9..ac3851f8c95 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -274,7 +274,7 @@ The IDs are generated from the content of the header according to the following
1. All spaces are converted to hyphens
1. Two or more hyphens in a row are converted to one
1. If a header with the same ID has already been generated, a unique
- incrementing number is appended.
+ incrementing number is appended, starting at 1.
For example:
@@ -291,8 +291,8 @@ Would generate the following link IDs:
1. `this-header-has-spaces-in-it`
1. `this-header-has-a-in-it`
1. `this-header-has-unicode-in-it-한글`
+1. `this-header-has-spaces-in-it`
1. `this-header-has-spaces-in-it-1`
-1. `this-header-has-spaces-in-it-2`
Note that the Emoji processing happens before the header IDs are generated, so the Emoji is converted to an image which then gets removed from the ID.