From 5e490ed8b750820dcfcd2674e39f05c2bc611e64 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 25 Dec 2016 12:59:34 -0500 Subject: Fix broken link --- doc/about/about_hubzilla.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/about/about_hubzilla.bb b/doc/about/about_hubzilla.bb index f249df66f..3568ca200 100644 --- a/doc/about/about_hubzilla.bb +++ b/doc/about/about_hubzilla.bb @@ -32,7 +32,7 @@ The $Projectname software stack is a relatively standard webserver application w [*= nomadic identity] The ability to authenticate and easily migrate an identity across independent hubs and web domains. Nomadic identity provides true ownership of an online identity, because the identities of the channels controlled by an account on a hub are not tied to the hub itself. A hub is more like a "host" for channels. With Hubzilla, you don't have an "account" on a server like you do on typical websites; you own an identity that you can take with you across the grid by using clones. -[*= [url=[baseurl]/help/developer/what_is_zot]Zot[/url]] The novel JSON-based protocol for implementing secure decentralised communications and services. It differs from many other communication protocols by building communications on top of a decentralised identity and authentication framework. The authentication component is similar to OpenID conceptually but is insulated from DNS-based identities. Where possible remote authentication is silent and invisible. This provides a mechanism for internet-scale distributed access control which is unobtrusive. +[*= [url=[baseurl]/help/developer/api_zot]Zot[/url]] The novel JSON-based protocol for implementing secure decentralised communications and services. It differs from many other communication protocols by building communications on top of a decentralised identity and authentication framework. The authentication component is similar to OpenID conceptually but is insulated from DNS-based identities. Where possible remote authentication is silent and invisible. This provides a mechanism for internet-scale distributed access control which is unobtrusive. [/dl] [h3]Features[/h3] -- cgit v1.2.3 From 1a5dd5c87c60f28fd799397e2aa0081f9b6c58ed Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 26 Dec 2016 08:58:40 -0500 Subject: 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. --- doc/about/about_hubzilla.bb | 9 ---- doc/bbcode.html | 109 -------------------------------------------- doc/member/bbcode.html | 105 ++++++++++++++++++++++++++++++++++++++++++ doc/member/member_guide.bb | 9 ++++ include/bbcode.php | 32 +++++++++++-- 5 files changed, 141 insertions(+), 123 deletions(-) delete mode 100644 doc/bbcode.html create mode 100644 doc/member/bbcode.html diff --git a/doc/about/about_hubzilla.bb b/doc/about/about_hubzilla.bb index 3568ca200..3327e0b50 100644 --- a/doc/about/about_hubzilla.bb +++ b/doc/about/about_hubzilla.bb @@ -186,17 +186,8 @@ Any number of profiles may be created containing different information and these $Projectname offers a simple, one-click account backup, where you can download a complete backup of your profile(s). Backups can then be used to clone or restore a profile. [h4]Account Deletion[/h4] - Accounts can be immediately deleted by clicking on a link. That's it. All associated content is then deleted from the grid (this includes posts and any other content produced by the deleted profile). Depending on the number of connections you have, the process of deleting remote content could take some time but it is scheduled to happen as quickly as is practical. -[h4]Content Creation[/h4] - -[h4]Writing Posts[/h4] - -$Projectname supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in $Projectname. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for $Projectname had some serious issues and has since been removed. We are currently looking for a replacement. - -When creating "Websites", content may be entered in HTML, Markdown, BBcode, and/or plain text. - [h4]Deletion of content[/h4] Any content created in $Projectname remains under the control of the member (or channel) that originally created it. At any time, a member can delete a message, or a range of messages. The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot ($Projectname communication and authentication protocol). diff --git a/doc/bbcode.html b/doc/bbcode.html deleted file mode 100644 index 36f40d3f4..000000000 --- a/doc/bbcode.html +++ /dev/null @@ -1,109 +0,0 @@ -

BBcode reference

-
-

-
    -
  • [b]bold[/b] - bold
    -
  • [i]italic[/i] - italic
    -
  • [u]underlined[/u] - underlined
    -
  • [s]strike[/s] - strike
    -
  • [color=red]red[/color] - red
    -
  • [url=https://zothub.com]$Projectname[/url] $Projectname
    -
  • [img]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=left]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
    -
  • [img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
    -
  • [code]code[/code] code
    -
  • [code=xxx]syntax highlighted code[/code] supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh
    -
  • [quote]quote[/quote]
    quote

    -
  • [quote=Author]Author? Me? No, no, no...[/quote]
    Author wrote:
    Author? Me? No, no, no...

    -
  • [nobb] may be used to escape bbcode.

- -
You can make lists with:
-
    -
  • [list]
    -
  • [list=1]
    -
  • [list=i]
    -
  • [list=I]
    -
  • [list=a]
    -
  • [list=A]
    -
  • [ul]
    -
  • [ol]
    -
  • [dl]
    -
  • [dl terms="biumlh"] — where style of the terms can be any combination of: -
    -
    b
    bold
    -
    i
    italic
    -
    u
    underline
    -
    m
    monospace
    -
    l
    large
    -
    h
    horizontal — like this defintion list
    -
    -
    • - -
For example:
[ul]
[*] First list element
[*] Second list element
[/ul]

Will render something like:
-
    -
  • First list element
    -
  • Second list element
- -or

[dl terms="b"]
[*= First element term] First element description
[*= Second element term] Second element description
[/dl]

Will render something like:

-
-
First element term
First element description
-
Second element term
Second element description
-

- - -
There's also:
-
    -
  • [hr]
    -
  • [video]video URL[/video]
    -
  • [audio]audio URL[/audio]
    -
  • [table]
    -
  • [th]
    -
  • [td]
    -
  • [tr]
    -
  • [center]
    -
  • [font=courier]some text[/font] some text
    -

-
Tables? Yes!

[table border=1]
[tr]
[th]Tables now[/th]
[/tr]
[tr]
[td]Have headers[/td]
[/tr]
[/table]

Tables now
Have headers

All sizes,
From the [size=xx-small] - xx-small.
To the [size=xx-large] - xx-large.
To fit exactly 20px use [size=20].

- -

$Projectname specific codes

-
    -
  • [©] © This works for many HTML entities
    • -
  • [zrl]https://zothub.com[/zrl] Magic-auth version of [url] tag
    • -
  • [zmg]https://zothub.com/some/photo.jpg[/zmg] Magic-auth version of [img] tag
    • - -
  • [observer=1]Text to display if observer is authenticated in the matrix[/observer]
    • -
  • [observer=0]Text to display if observer is not authenticated in the matrix[/observer]
    • -
  • [observer.baseurl] website of observer
    • -
  • [observer.url] channel URL of observer
    • -
  • [observer.name] name of observer
    • -
  • [observer.webname] short name in the url of the observer
    • -
  • [observer.address] address (zot-id) of observer
    • -
  • [observer.photo] profile photo of observer
    • - -
  • [spoiler] for hiding spoilers

    • - -
  • [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
    • -
  • [qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).
    • -
  • [toc] - create a table of content in a webpage. Please refer to the original jquery toc to get more explanations. -
      -
    • Optional param: 'data-toc'. If ommited the default is 'body'
      • -
    • Optional param: 'data-toc-headings'. If ommited the default is 'h1,h2,h3'
      • -
    • Full example: [toc data-toc='div.page-body' data-toc-headings='h1,h2']
      • -
    -
    • -
-
-

These require a suitable map plugin/addon such as openstreetmap or else the result will be blank

-
    -
  • [map] Generate an inline map using the current browser coordinates of the poster, if browser location is enabled
    -
  • [map=latitude,longitude] Generate a map using global coordinates.
    -
  • [map]Place Name[/map] Generate a map for a given named location. The first matching location is returned. For instance "Sydney" will usually return Sydney, Australia and not Sydney, Nova Scotia, Canada unless the more precise location is specified. It is highly recommended to use the post preview utility to ensure you have the correct location before submitting the post.
    -
- -#include doc/macros/main_footer.bb; -
- - - diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html new file mode 100644 index 000000000..e186085d3 --- /dev/null +++ b/doc/member/bbcode.html @@ -0,0 +1,105 @@ +

BBcode reference

+
+

+
    +
  • [b]bold[/b] - bold
    +
  • [i]italic[/i] - italic
    +
  • [u]underlined[/u] - underlined
    +
  • [s]strike[/s] - strike
    +
  • [color=red]red[/color] - red
    +
  • [url=https://zothub.com]$Projectname[/url] $Projectname
    +
  • [img]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [img float=left]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
    +
  • [img float=right]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
    +
  • [code]code[/code] code
    +
  • [code=xxx]syntax highlighted code[/code] supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh
    +
  • [quote]quote[/quote]
    quote

    +
  • [quote=Author]Author? Me? No, no, no...[/quote]
    Author wrote:
    Author? Me? No, no, no...

    +
  • [nobb][nobb]This is how you can show how to use BBcode syntax[/nobb][/nobb]

+ +
You can make lists with:
+
    +
  • [list]
    +
  • [list=1]
    +
  • [list=i]
    +
  • [list=I]
    +
  • [list=a]
    +
  • [list=A]
    +
  • [ul]
    +
  • [ol]
    +
  • [dl]
    +
  • [dl terms="biumlh"] — where style of the terms can be any combination of: +
    +
    b
    bold
    +
    i
    italic
    +
    u
    underline
    +
    m
    monospace
    +
    l
    large
    +
    h
    horizontal — like this defintion list
    +
    +
    • + +
For example:
[ul]
[*] First list element
[*] Second list element
[/ul]

Will render something like:
+
    +
  • First list element
    +
  • Second list element
+ +or

[dl terms="b"]
[*= First element term] First element description
[*= Second element term] Second element description
[/dl]

Will render something like:

+
+
First element term
First element description
+
Second element term
Second element description
+

+ + +
There's also:
+
    +
  • [hr]
    +
  • [video]video URL[/video]
    +
  • [audio]audio URL[/audio]
    +
  • [table]
    +
  • [th]
    +
  • [td]
    +
  • [tr]
    +
  • [center]
    +
  • [font=courier]some text[/font] some text
    +

+
Tables? Yes!

[table border=1]
[tr]
[th]Tables now[/th]
[/tr]
[tr]
[td]Have headers[/td]
[/tr]
[/table]

Tables now
Have headers

All sizes,
From the [size=xx-small] - xx-small.
To the [size=xx-large] - xx-large.
To fit exactly 20px use [size=20].

+ +

$Projectname specific codes

+
    +
  • [©] © This works for many HTML entities
    • +
  • [zrl]https://zothub.com[/zrl] Magic-auth version of [url] tag
    • +
  • [zmg]https://zothub.com/some/photo.jpg[/zmg] Magic-auth version of [img] tag
    • + +
  • [nobb][observer=1]Text to display if observer is authenticated in the matrix[/observer][/nobb]
    • +
  • [nobb][observer=0]Text to display if observer is not authenticated in the matrix[/observer][/nobb]
    • +
  • [nobb][observer.url][/nobb] channel URL of observer
    • +
  • [nobb][observer.baseurl][/nobb] website of observer
    • +
  • [nobb][observer.name][/nobb] name of observer
    • +
  • [nobb][observer.webname][/nobb] short name in the url of the observer
    • +
  • [nobb][observer.address][/nobb] address (zot-id) of observer
    • +
  • [nobb][observer.photo][/nobb] profile photo of observer
    • + +
  • [spoiler] for hiding spoilers

    • + +
  • [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
    • +
  • [qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).
    • +
  • [toc] - create a table of content in a webpage. Please refer to the original jquery toc to get more explanations. +
      +
    • Optional param: 'data-toc'. If ommited the default is 'body'
      • +
    • Optional param: 'data-toc-headings'. If ommited the default is 'h1,h2,h3'
      • +
    • Full example: [toc data-toc='div.page-body' data-toc-headings='h1,h2']
      • +
    +
    • +
+
+

These require a suitable map plugin/addon such as openstreetmap or else the result will be blank

+
    +
  • [map] Generate an inline map using the current browser coordinates of the poster, if browser location is enabled
    +
  • [map=latitude,longitude] Generate a map using global coordinates.
    +
  • [map]Place Name[/map] Generate a map for a given named location. The first matching location is returned. For instance "Sydney" will usually return Sydney, Australia and not Sydney, Nova Scotia, Canada unless the more precise location is specified. It is highly recommended to use the post preview utility to ensure you have the correct location before submitting the post.
    +
+ +
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. diff --git a/include/bbcode.php b/include/bbcode.php index c7bee6f97..f0cf861f3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -530,7 +530,17 @@ function bb_fixtable_lf($match) { } function parseIdentityAwareHTML($Text) { - + + // Hide all [noparse] contained bbtags by spacefying them + if (strpos($Text,'[noparse]') !== false) { + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text); + } + if (strpos($Text,'[nobb]') !== false) { + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text); + } + if (strpos($Text,'[pre]') !== false) { + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text); + } // process [observer] tags before we do anything else because we might // be stripping away stuff that then doesn't need to be worked on anymore @@ -568,9 +578,21 @@ function parseIdentityAwareHTML($Text) { $Text = str_replace('[observer.photo]','', $Text); } - $Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text); + $Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text); - return $Text; + + // Unhide all [noparse] contained bbtags unspacefying them + // and triming the [noparse] tag. + if (strpos($Text,'[noparse]') !== false) { + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim', $Text); + } + if (strpos($Text,'[nobb]') !== false) { + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim', $Text); + } + if (strpos($Text,'[pre]') !== false) { + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); + } + return $Text; } // BBcode 2 HTML was written by WAY2WEB.net @@ -891,8 +913,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) } if (strpos($Text,'[/table]') !== false) { $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '$1
', $Text); - $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '$1
', $Text); - $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '$1
', $Text); + $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/sm", '$1
', $Text); + $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '$1
', $Text); } $Text = str_replace('
', "\n", $Text); $Text = str_replace('[hr]', '
', $Text); -- cgit v1.2.3 From 67f09fb1d6caf7c527aa7d66f29f6ec4a4b5dab3 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 26 Dec 2016 14:59:18 -0500 Subject: Almost completed reconstruction of bbcode reference page --- doc/member/bbcode.html | 245 ++++++++++++++++++++++++++++++++++----------- doc/member/member_guide.bb | 8 +- doc/toc.html | 1 + 3 files changed, 194 insertions(+), 60 deletions(-) diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html index e186085d3..dcb5e2ce8 100644 --- a/doc/member/bbcode.html +++ b/doc/member/bbcode.html @@ -1,36 +1,116 @@ -

BBcode reference

-
-

-
    -
  • [b]bold[/b] - bold
    -
  • [i]italic[/i] - italic
    -
  • [u]underlined[/u] - underlined
    -
  • [s]strike[/s] - strike
    -
  • [color=red]red[/color] - red
    -
  • [url=https://zothub.com]$Projectname[/url] $Projectname
    -
  • [img]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=left]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
    -
  • [img float=right]/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
    -
  • [code]code[/code] code
    -
  • [code=xxx]syntax highlighted code[/code] supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh
    -
  • [quote]quote[/quote]
    quote

    -
  • [quote=Author]Author? Me? No, no, no...[/quote]
    Author wrote:
    Author? Me? No, no, no...

    -
  • [nobb][nobb]This is how you can show how to use BBcode syntax[/nobb][/nobb]

+

Text Decoration

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
BBcode syntaxRendered text
[b]bold[/b]
bold
[i]italic[/i]
italic
[u]underlined[/u]
underlined
[s]strike[/s]
strike
[color=red]red[/color]
red
[font=courier]some text[/font]
some text
[quote]quote[/quote]
quote
[quote=Author]Author? Me? No, no, no...[/quote]
Author wrote:
Author? Me? No, no, no...
[size=small]small text[/size]
+[size=xx-large]xx-large text[/size]
+[size=20]20px exactly[/size]
+
+ Size options include: xx-small, small, medium, large, xx-large		small text
xx-large text
20px exactly
Add a horizontal bar
+[hr]
+Like this
+
+ Add a horizontal bar

Like this + 
This is
+[center]centered[/center]
+text
 + This is
centered

text +
-
You can make lists with:
-
    -
  • [list]
    -
  • [list=1]
    -
  • [list=i]
    -
  • [list=I]
    -
  • [list=a]
    -
  • [list=A]
    -
  • [ul]
    -
  • [ol]
    -
  • [dl]
    -
  • [dl terms="biumlh"] — where style of the terms can be any combination of: +

    Code blocks

    +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 php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh . +

    + + + + + + + + + + + + + + + +
    BBcode syntaxOutput
    [code]function bbcode() { }[/code]
    		function bbcode() { }
    [code=php]function bbcode() {
+  $variable = true;
+  if( $variable ) {
+    echo "true";
+  }
+}[/code]
    1.  function bbcode() {
    2.    $variable = true;
    3.    if( $variable ) {
    4.      echo "true";
    5.    }
    6.  }
    [nobb][nobb]This is how [i]you[/i] can 
+[u]show[/u] how to use 
+[hl]BBcode[/hl] syntax[/nobb][/nobb]
    		[nobb]This is how [i]you[/i] can [u]show[/u] how to use [hl]BBcode[/hl] syntax[/nobb]
    + +

    Lists

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    BBcode syntaxRendered list
    [ul]
+[*] First list element
+[*] Second list element
+[/ul]
    • First list element
    • Second list element
    [ol]
+[*] First list element
+[*] Second list element
+[/ol]
    • First list element
    • Second list element
    [list=A]
+[*] First list element
+[*] Second list element
+[/list]
    + The list type options are 
    1, i, I, a, A
    .
    • First list element
    • Second list element
    [dl terms="b"]
+[*= First element term] First element description
+[*= Second element term] Second element description
+[/dl]
    + The terms style options can be any combination of:
    b
    bold
    i
    italic
    @@ -39,35 +119,88 @@
    l
    large
    h
    horizontal — like this defintion list
    - +
    +
    First element term
    First element description
    +
    Second element term
    Second element description
    
 
-
For example:
[ul]
[*] First list element
[*] Second list element
[/ul]

Will render something like: 

-
    
-
  •  First list element
    
-
  •  Second list element

+
Tables

 
-or

[dl terms="b"]
[*= First element term] First element description
[*= Second element term] Second element description
[/dl]

Will render something like: 


-

-
 First element term 
First element description

-
 Second element term 
Second element description

-

 
+
+	
+		
+			
+		
+		
+			
+		
+		
+			
+		
+		
+			
+		
+	
+
BBcode syntaxRendered table
[table border=0]
+[tr]
+[th]Header 1[/th][th]Header 2[/th]
+[/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[/table]

+
Header 1Header 2
ContentContent
ContentContent
[table border=1]
+[tr]
+[th]Header 1[/th][th]Header 2[/th]
+[/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[/table]

+
Header 1Header 2
ContentContent
ContentContent
[table]
+[tr]
+[th]Header 1[/th][th]Header 2[/th]
+[/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[tr][td]Content[/td][td]Content[/td][/tr]
+[/table]
Header 1Header 2
ContentContent
ContentContent

+

 
+
Links and Embedded Content

 
-
There's also:

-
    
-
  • [hr]
    
-
  • [video]video URL[/video]
    
-
  • [audio]audio URL[/audio]
    
-
  • [table]
    
-
  • [th] 
    
-
  • [td]
    
-
  • [tr]
    
-
  • [center]
    
-
  • [font=courier]some text[/font] some text
    
-


-
Tables? Yes!

[table border=1]
  [tr]
    [th]Tables now[/th]
  [/tr]
  [tr]
    [td]Have headers[/td]
  [/tr]
[/table]

Tables now
Have headers

All sizes, 
From the [size=xx-small] - xx-small.
To the [size=xx-large] - xx-large.
To fit exactly 20px use [size=20].


+
+	
+		
+			
+		
+		
+			
+		
+		
+			
+		
+		
+			
+		
+		
+			
+		
+	
+
BBcode syntaxRendered output
[video]video URL[/video]
+[audio]audio URL[/audio]
[url=https://hubzilla.org]Hubzilla[/url]
Hubzilla
An image [img]url/of/image.jpg[/img] 
+in some text 

+				An image Image/photo in some text
+			

+	
 
-
$Projectname specific codes

+
$Projectname specific codes

 
    
 
  • [©] ©  This works for many HTML entities
    • 
 
  • [zrl]https://zothub.com[/zrl] Magic-auth version of [url] tag
    • 
diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index b68eef12a..3c1376282 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -288,12 +288,12 @@ 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.
+$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]BBcode[/td][/tr]
-[tr][td]Wiki[/td][td]BBcode, Markdown[/td][/tr]
-[tr][td]Webpage element[/td][td]BBcode, Markdown, HTML[/td][/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]
diff --git a/doc/toc.html b/doc/toc.html
index 272f43c7e..ba26d17e3 100644
--- a/doc/toc.html
+++ b/doc/toc.html
@@ -22,6 +22,7 @@
         
-- 
cgit v1.2.3