Commit 6331344d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master'

Add footnote to Markdown docs

_Originally opened at !3741 by @bbodenmiller._

- - -

See merge request !6564
parents a813c9f9 88ebb7b5
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* [Horizontal Rule](#horizontal-rule) * [Horizontal Rule](#horizontal-rule)
* [Line Breaks](#line-breaks) * [Line Breaks](#line-breaks)
* [Tables](#tables) * [Tables](#tables)
* [Footnotes](#footnotes)
**[Wiki-Specific Markdown](#wiki-specific-markdown)** **[Wiki-Specific Markdown](#wiki-specific-markdown)**
...@@ -699,6 +700,15 @@ By including colons in the header row, you can align the text within that column ...@@ -699,6 +700,15 @@ By including colons in the header row, you can align the text within that column
| Cell 1 | Cell 2 | Cell 3 | Cell 4 | Cell 5 | Cell 6 | | Cell 1 | Cell 2 | Cell 3 | Cell 4 | Cell 5 | Cell 6 |
| Cell 7 | Cell 8 | Cell 9 | Cell 10 | Cell 11 | Cell 12 | | Cell 7 | Cell 8 | Cell 9 | Cell 10 | Cell 11 | Cell 12 |
## Footnotes
You can add footnotes to your text as follows.[^1]
[^1]: This is my awesome footnote.
```
You can add footnotes to your text as follows.[^1]
[^1]: This is my awesome footnote.
```
## Wiki-specific Markdown ## Wiki-specific Markdown
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment