summaryrefslogtreecommitdiffstats
path: root/doc/help/Markdown.md
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-12-08 13:02:33 -0800
committer=Corey Hulen <corey@hulen.com>2015-12-08 13:02:33 -0800
commit69ecfe4cb1763b10f1690b543ee1828aed94aefa (patch)
tree53c70c2984b2e4144d3cc0e539ef1b52b8eb4552 /doc/help/Markdown.md
parent8b29404525f036633be6b25dc18c536d2aafee02 (diff)
parent90791dd98ea0f26439a13c1ec05a610514988b5c (diff)
downloadchat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.gz
chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.bz2
chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.zip
Fixing merge
Diffstat (limited to 'doc/help/Markdown.md')
-rw-r--r--doc/help/Markdown.md13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md
index 1befed8d4..64ce4fc83 100644
--- a/doc/help/Markdown.md
+++ b/doc/help/Markdown.md
@@ -88,7 +88,7 @@ and
## Emojis
-Check out a full list of emojis [here](http://www.emoji-cheat-sheet.com/).
+Emoji provided free by [Emoji One](http://emojione.com/). Check out a full list of emojis [here](http://http://emoji.codes/).
```
:smile: :+1: :sheep:
@@ -132,6 +132,17 @@ Renders as:
1. Item one
2. Item two
+Make a task list by including square brackets:
+```
+- [ ] Item one
+- [ ] Item two
+- [x] Completed item
+```
+Renders as:
+- [ ] Item one
+- [ ] Item two
+- [x] Completed item
+
## Tables:
Create a table by placing a dashed line under the header row and separating the columns with a pipe `|`. (The columns don’t need to line up exactly for it to work). Choose how to align table columns by including colons `:` within the header row.