diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/hook/author_is_pmable.bb | 2 | ||||
| -rw-r--r-- | doc/member/bbcode.html | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/hook/author_is_pmable.bb b/doc/hook/author_is_pmable.bb index 708350673..11d1185f3 100644 --- a/doc/hook/author_is_pmable.bb +++ b/doc/hook/author_is_pmable.bb @@ -6,7 +6,7 @@ By default author_is_pmable() returns true for 'zot' xchans, and false for all o The plugin is passed an array - [ 'xchan' => $author_xchan, 'result' => 'unset' ] + [ 'xchan' => $author_xchan, 'abook' => abook record, 'result' => 'unset' ] A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash. A value of false will disable the 'send mail' link. 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> |