diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-26 13:11:54 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-26 13:11:54 -0800 |
| commit | 3bb6c667db9b8d833fa9eca1dd744ad4ad05eebd (patch) | |
| tree | f1b596919c6928d7cdb6a4df49054a7fc9ccdd95 /doc/member/member_guide.bb | |
| parent | b530d1d44981df955842f4f572676db83d18084e (diff) | |
| parent | fdbb5b67a87cb2077ec5a4e00b3e882892187235 (diff) | |
| download | volse-hubzilla-3bb6c667db9b8d833fa9eca1dd744ad4ad05eebd.tar.gz volse-hubzilla-3bb6c667db9b8d833fa9eca1dd744ad4ad05eebd.tar.bz2 volse-hubzilla-3bb6c667db9b8d833fa9eca1dd744ad4ad05eebd.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'doc/member/member_guide.bb')
| -rw-r--r-- | doc/member/member_guide.bb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb index 53cc6b8c7..3c1376282 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. [url=[baseurl]/help/member/bbcode]BBcode[/url] 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][url=[baseurl]/help/member/bbcode]BBcode[/url][/td][/tr] +[tr][td]Wiki[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown[/td][/tr] +[tr][td]Webpage element[/td][td][url=[baseurl]/help/member/bbcode]BBcode[/url], Markdown, HTML[/td][/tr] +[/table] + [h3]Personal Cloud Storage[/h3] $Projectname provides an ability to store privately and/or share arbitrary files with friends. |