diff options
| author | Corey Hulen <corey@hulen.com> | 2015-12-14 15:26:06 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-12-14 15:26:06 -0800 |
| commit | 8392e5ecc4b95af18529bd6ab4fe69fbb24dd17f (patch) | |
| tree | 006219e207e736422561eee438ac065063912ef5 | |
| parent | f5ec973cba4c224de5ba75b56aad447f715b9d6b (diff) | |
| parent | cdeddd344f174b36348941d7f3bcc1987b8ebca5 (diff) | |
| download | chat-8392e5ecc4b95af18529bd6ab4fe69fbb24dd17f.tar.gz chat-8392e5ecc4b95af18529bd6ab4fe69fbb24dd17f.tar.bz2 chat-8392e5ecc4b95af18529bd6ab4fe69fbb24dd17f.zip | |
Merge pull request #1728 from mattermost/lfbrock-patch-1
PLT-1457 Update syntax highlighting tests/documentation
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | doc/developer/tests/test-syntax-highlighting.md | 2 | ||||
| -rw-r--r-- | doc/help/Markdown.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dad1798..9b50b7fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,7 +124,7 @@ To limit the impact of this security issue, Mattermost v1.2.0 has been removed f #### Syntax Highlighting -- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, JavaScript, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini` +- Syntax highlight for code blocks now available for `Diff, Apache, Makefile, HTTP, JSON, Markdown, JavaScript, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, CoffeeScript, C, SQL, Go, Ruby, Java, and ini` #### Usability Improvements @@ -161,7 +161,7 @@ User Interface - Member list in Channel display now scrollable, and includes Message button to message channel members directly - Added ability to edit previous message by hitting UP arrow - Syntax highlighting added for code blocks - - Languages include `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, Coffee, C, SQL, Go, Ruby, Java, and ini`. + - Languages include `Diff, Apache, Makefile, HTTP, JSON, Markdown, Java, CSS, nginx, ObjectiveC, Python, XML, Perl, Bash, PHP, CoffeeScript, C, SQL, Go, Ruby, Java, and ini`. - Use by adding the name of the language on the first link of the code block, for example: ```python - Syntax color theme can be defined under **Account Settings** > **Appearance Settings** > **Custom Theme** - Updated Drag & Drop UI diff --git a/doc/developer/tests/test-syntax-highlighting.md b/doc/developer/tests/test-syntax-highlighting.md index 7f8f4cdaa..b1568c385 100644 --- a/doc/developer/tests/test-syntax-highlighting.md +++ b/doc/developer/tests/test-syntax-highlighting.md @@ -133,7 +133,7 @@ echo "Hello World" ### CoffeeScript -``` coffee +``` coffeescript console.log(“Hello world!”); ``` diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md index 64ce4fc83..d185a4160 100644 --- a/doc/help/Markdown.md +++ b/doc/help/Markdown.md @@ -31,7 +31,7 @@ code block 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` +`diff, apache, makefile, http, json, markdown, javascript, css, nginx, objectivec, python, xml, perl, bash, php, coffeescript, cs (C#), cpp (C++), sql, go, ruby, java, ini, latex` Example: |