diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
| commit | 4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch) | |
| tree | 5623c66a3f66445284529d6207e4ab4a2edb2810 /doc/member/bbcode.html | |
| parent | c664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff) | |
| parent | 90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff) | |
| download | volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.gz volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.bz2 volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.zip | |
Merge branch '2.6RC'2.6
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> |