summaryrefslogtreecommitdiff
path: root/doc/markdown
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-26 15:07:07 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-26 15:07:07 +0300
commit0093554ad6055a0843b0537557e8ca44d6ff2429 (patch)
tree14298c76b5866a9b9a99ad277cd18fb663aa0109 /doc/markdown
parent3cc26654d576ed6a0f6eb33980c41f1b66b5f1eb (diff)
downloadgitlab-ce-0093554ad6055a0843b0537557e8ca44d6ff2429.tar.gz
Add test and docs for markdown tables
Diffstat (limited to 'doc/markdown')
-rw-r--r--doc/markdown/markdown.md23
1 files changed, 22 insertions, 1 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index ccf44652b5b..b23e0f3e265 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -27,8 +27,9 @@ Table of Contents
[Inline HTML](#toc_25)
[Horizontal Rule](#toc_26)
[Line Breaks](#toc_27)
+[Tables](#toc_28)
-[References](#toc_28)
+[References](#toc_29)
---------------------
----------------------------------------------
@@ -440,6 +441,26 @@ 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*.
+
+## Tables
+
+Tables aren't part of the core Markdown spec, but they are part of GFM and Markdown Here supports them.
+
+```
+| header 1 | header 2 |
+| -------- | -------- |
+| cell 1 | cell 2 |
+| cell 3 | cell 4 |
+```
+
+Code above produces next output:
+
+| header 1 | header 2 |
+| -------- | -------- |
+| cell 1 | cell 2 |
+| cell 3 | cell 4 |
+
+
------------
<a name="references"/>