summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--doc/usage/Markdown.md32
2 files changed, 32 insertions, 2 deletions
diff --git a/README.md b/README.md
index 34aa7693e..81b65bae8 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,8 @@ Joining the Mattermost community is a great way to build relationships with othe
- [Matterbridge](https://github.com/42wim/matterbridge) - an IRC bridge connecting to Mattermost
- [GitLab Integration Service for Mattermost](https://github.com/mattermost/mattermost-integration-gitlab) - connecting GitLab to Mattermost via incoming webhooks
- [Giphy Integration Service for Mattermost](https://github.com/mattermost/mattermost-integration-giphy) - connecting Mattermost to Giphy via outgoing webhooks
+- [node-mattermost](https://github.com/jonathanwiesel/node-mattermost) - a node.js module for sending and receiving messages from Mattermost webhooks
+- [matterqus](https://github.com/jonathanwiesel/matterqus) - Disqus comment notifier for Mattermost
#### Have other ideas or suggestions?
diff --git a/doc/usage/Markdown.md b/doc/usage/Markdown.md
index 055f47619..dd90ede19 100644
--- a/doc/usage/Markdown.md
+++ b/doc/usage/Markdown.md
@@ -11,9 +11,9 @@ You can use either `_` or `*` around a word to make it italic. Use two to make i
* `**_bold-italic_**` renders as **_bold-italics_**
* `~~strikethrough~~` renders as ~~strikethrough~~
-## Code:
+## Code Block:
-Create a code block by indenting four spaces, or by placing ``` on the line above and below your code.
+Create a code block by indenting each line by four spaces, or by placing ``` on the line above and below your code.
Example:
@@ -26,6 +26,34 @@ Renders as:
code block
```
+### Syntax Highlighting
+
+To add syntax highlighting, type the language to be highlighted after the ``` at the beginning of the code block.
+
+Supported languages are:
+`diff, apache, makefile, http, json, markdown, javascript, css, nginx, objectivec, python, xml, perl, bash, php, coffee (CoffeeScript), cs (C#), cpp (C++), sql, go, ruby, java, ini, latex`
+
+Example:
+
+ ``` go
+ package main
+ import "fmt"
+ func main() {
+ fmt.Println("Hello, 世界")
+ }
+ ```
+
+Renders as:
+``` go
+package main
+import "fmt"
+func main() {
+ fmt.Println("Hello, 世界")
+}
+```
+
+## In-line Code:
+
Create in-line monospaced font by surrounding it with backticks.
```
`monospace`