aboutsummaryrefslogtreecommitdiffstats
path: root/doc/member/member_guide.bb
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-12-26 08:58:40 -0500
committerAndrew Manning <tamanning@zoho.com>2016-12-26 08:58:40 -0500
commit1a5dd5c87c60f28fd799397e2aa0081f9b6c58ed (patch)
tree073e722d8efd22ba629d4dc30aac84e992775dc1 /doc/member/member_guide.bb
parentc2a189ab18aa77ceecb7f00a2ddf02aca9fecc5c (diff)
downloadvolse-hubzilla-1a5dd5c87c60f28fd799397e2aa0081f9b6c58ed.tar.gz
volse-hubzilla-1a5dd5c87c60f28fd799397e2aa0081f9b6c58ed.tar.bz2
volse-hubzilla-1a5dd5c87c60f28fd799397e2aa0081f9b6c58ed.zip
Updated markup language support doco. Modified parseIdentityAwareHTML BBcode parsing to support the BBcode reference which is now in /help/member/bbcode.html. Add Bootstrap classes to tables for BBcode tables that have the border=0 or border=1 options set.
Diffstat (limited to 'doc/member/member_guide.bb')
-rw-r--r--doc/member/member_guide.bb9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 53cc6b8c7..b68eef12a 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -287,6 +287,15 @@ The connection edit screen offers a slider to select a degree of friendship with
The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature.
+[h3]Markup Languages[/h3]
+$Projectname supports several markup languages for advanced formatting of content. The default markup language is a [url=[baseurl]/help/member/bbcode]custom variant of BBcode[/url], tailored for use in $Projectname. BBcode is supported for posts, wiki pages, and web page elements. Wiki pages and webpage elements may also be written using standard Markdown.
+[table border=0]
+[tr][th]Content Type[/th][th]Supported Markup[/th][/tr]
+[tr][td]Post[/td][td]BBcode[/td][/tr]
+[tr][td]Wiki[/td][td]BBcode, Markdown[/td][/tr]
+[tr][td]Webpage element[/td][td]BBcode, Markdown, HTML[/td][/tr]
+[/table]
+
[h3]Personal Cloud Storage[/h3]
$Projectname provides an ability to store privately and/or share arbitrary files with friends.