Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 15:07:40 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 15:07:40 +0300
commit506d6dcd7c787ba71a8a53102f3d4fdb6adcfa5e (patch)
treeb1d65f48256b1f17d6f47429a65050c5d43f420a /doc/user/markdown.md
parent45b4df3e57c949c88107840c44ccbfaf2eabdf26 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/markdown.md')
-rw-r--r--doc/user/markdown.md30
1 files changed, 14 insertions, 16 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 666b0ce3500..866293302cf 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -821,32 +821,30 @@ Footnotes add a link to a note that will be rendered at the end of a Markdown fi
To make a footnote, you need both a reference tag and a separate line (anywhere in the file) with
the note content.
-Regardless of the tag names, the relative order of the reference tags determines the rendered numbering.
+Regardless of the tag names, the relative order of the reference tags determines the rendered
+numbering.
-```markdown
-A footnote reference tag looks like this:[^1]
-
-[^1]: This is the contents of a footnote.
+Reference tags can use letters and other characters. Avoid using lowercase `w` or an underscore
+(`_`) in footnote tag names until [this bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is
+resolved.
-Reference tags can use letters and other characters.[^footnote-note]
-
-Avoid using lowercase `w` or an underscore (`_`) in footnote tag names until
-[this bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved. [^this-name-has-w] [^this-name-has_]
+```markdown
+A footnote reference tag looks like this: [^1]
-[^this-name-has-w]: This won't be rendered, because the name contains "w".
+This reference tag is a mix of letters and numbers. [^footnote-42]
-[^this-name-has_]: This won be rendered, because the name contains an underscore.
+[^1]: This is the text inside a footnote.
+[^footnote-42]: This is another footnote.
```
-Reference tags can use letters and other characters.[^footnote-note]
+A footnote reference tag looks like this:[^1]
-Avoid using lowercase `w` or an underscore (`_`) in footnote tag names until
-[this bug](https://gitlab.com/gitlab-org/gitlab/issues/24423) is resolved. [^this-name-has-w] [^this-name-has_]
+This reference tag is a mix of letters and numbers.[^footnote-42]
-[^this-name-has-w]: This won't be rendered, because the name contains "w".
+[^1]: This is the text inside a footnote.
-[^this-name-has_]: This won't be rendered, because the name contains an underscore.
+[^footnote-42]: This is another footnote.
### Headers