aboutsummaryrefslogtreecommitdiffstats
path: root/doc/bbcode.html
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-20 09:31:27 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-20 09:31:27 +0200
commite40112b40dc7dd0e8b235800d85ef070f428e2c2 (patch)
treeb9265650b08bde6762ce4a1494316d1e5458f402 /doc/bbcode.html
parent7a4efcf67f57d6437af5596ad99920c1793cf450 (diff)
parentcc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff)
downloadvolse-hubzilla-e40112b40dc7dd0e8b235800d85ef070f428e2c2.tar.gz
volse-hubzilla-e40112b40dc7dd0e8b235800d85ef070f428e2c2.tar.bz2
volse-hubzilla-e40112b40dc7dd0e8b235800d85ef070f428e2c2.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'doc/bbcode.html')
-rw-r--r--doc/bbcode.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 5a51135ea..7a2c969eb 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -14,6 +14,7 @@
<li>[img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
<div style="clear:both;"></div>
<li>[code]code[/code] <code>code</code><br />
+<li>[code=xxx]syntax highlighted code[/code] <code>supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh</code><br />
<li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
<li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br />
<li> [nobb] may be used to escape bbcode.</ul><br />
@@ -83,7 +84,7 @@ or<br /><br />[dl terms="b"]<br />[*= First element term] First element descript
<li>[spoiler] for hiding spoilers<br /><br /></li>
<li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional</li>
-<li>[qr]text to post[/qr] - create a QR code.</li>
+<li>[qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).</li>
<li>[toc] - create a table of content in a webpage. Please refer to the <a href="http://ndabas.github.io/toc/" target="_blank">original jquery toc</a> to get more explanations.
<ul>
<li>Optional param: 'data-toc'. If ommited the default is 'body'</li>