diff options
author | zotlabs <mike@macgirvin.com> | 2017-06-07 17:07:44 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-06-07 17:07:44 -0700 |
commit | 416a82bf121e568569ed28590092d34dd25da6c0 (patch) | |
tree | face76b8cda01ebfe8a1d3090235f1b524b75761 /doc/member/bbcode.html | |
parent | 40b9130c63fbcc5bfd4ba5feb5463000dfe99d43 (diff) | |
parent | 55836e8ca65ca9a2ae25591de3232470d7a50049 (diff) | |
download | volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.tar.gz volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.tar.bz2 volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'doc/member/bbcode.html')
-rw-r--r-- | doc/member/bbcode.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html index a4bc813d8..9b7080a32 100644 --- a/doc/member/bbcode.html +++ b/doc/member/bbcode.html @@ -26,6 +26,9 @@ <td><code>[color=red]red[/color]</code></td><td><span style="color: red;">red</span></td> </tr> <tr> + <td><code>[hl]highlighted[/hl]</code></td><td><span style="background-color: yellow;">highlighted</span></td> + </tr> + <tr> <td><code>[font=courier]some text[/font] </code></td><td><span style="font-family: courier;">some text</span></td> </tr> <tr> @@ -61,8 +64,10 @@ text</code></td><td> </table> <h3>Code blocks</h3> -Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Supported languages include <strong>php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh </strong>. +Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Syntax highlighting requires a suitable rendering plugin such as <strong>hilite</strong>. Supported languages with the hilite plugin include <strong>php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh </strong>. <br><br> +If a rendering plugin is not installed or an unsupported language is specified, the output for syntax highlighted code blocks is the same as the block format code tag. +<br><br> <table class="table table-responsive table-bordered"> <tbody> <tr> |