summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-07-05 18:58:18 +0000
committerRobert Speicher <robert@gitlab.com>2015-07-05 18:58:18 +0000
commita4c4e7a77e0e61506c15b1655fbeb0916fda7f1b (patch)
treef59167124d23d90b59d8a14323077769143af888 /doc
parent570fd9f590e06c378de82897fce31e1dbc020c0d (diff)
parentb348ff1a10aca42016a995f1477c63e3aa2690a4 (diff)
downloadgitlab-ce-a4c4e7a77e0e61506c15b1655fbeb0916fda7f1b.tar.gz
Merge branch 'doc-list' into 'master'
Improve documentation of lists in Markdown See merge request !899
Diffstat (limited to 'doc')
-rw-r--r--doc/markdown/markdown.md30
1 files changed, 30 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 9c7f723c06d..322111ae9e1 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -343,6 +343,36 @@ Strikethrough uses two tildes. ~~Scratch this.~~
- Or minuses
+ Or pluses
+If a list item contains multiple paragraphs,
+each subsequent paragraph should be indented with four spaces.
+
+```no-highlight
+1. First ordered list item
+
+ Second paragraph of first item.
+2. Another item
+```
+
+1. First ordered list item
+
+ Second paragraph of first item.
+2. Another item
+
+If the second paragraph isn't indented with four spaces,
+the second list item will be incorrectly labeled as `1`.
+
+```no-highlight
+1. First ordered list item
+
+ Second paragraph of first item.
+2. Another item
+```
+
+1. First ordered list item
+
+ Second paragraph of first item.
+2. Another item
+
## Links
There are two ways to create links, inline-style and reference-style.