X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FBBCode.md;h=47e45b7aca8a6c7dbc76b02b6d9e26e301c62e72;hb=13a4483c59d916b48f9585beb7f5a71328055b72;hp=b13d081195190cbb387e8c04c1f19ebd9318932b;hpb=f1e7d97b8cae93e1c77f5a5085880409b01fcdbe;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index b13d081195..47e45b7aca 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
Friendica |
- [img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img] |
- ![Immagine/foto](https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg) |
+ [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img] |
+ ![Immagine/foto](https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg) |
- [img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]The Friendica Logo[/img] |
- ![The Friendica Logo](https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg) |
+ [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img] |
+ ![The Friendica Logo](https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg) |
- [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
+ | [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]
Note: provided height is simply discarded. |
- ![](https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg) |
+ ![](https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg) |
[size=xx-small]small text[/size] |
@@ -113,17 +113,17 @@ table.bbcodes > * > tr > th {
[bookmark]http://friendi.ca[/bookmark]
#^[url]http://friendi.ca[/url] |
- |
+ |
[bookmark=http://friendi.ca]Bookmark[/bookmark]
#^[url=http://friendi.ca]Bookmark[/url]
#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url] |
- |
+ |
[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url] |
- Diaspora post with GUID |
+ Diaspora post with GUID |
#Friendica |
@@ -613,15 +613,34 @@ On Mastodon this field is used for the content warning.
Result |
- If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+ | If you need to put literal BBCode in a message, [noparse], [nobb] or [pre] blocks prevent BBCode conversion:
- [noparse][b]bold[/b][/noparse]
- [nobb][b]bold[/b][/nobb]
- [pre][b]bold[/b][/pre]
+ Note: [code] has priority over [noparse], [nobb] and [pre] which makes them display as BBCode tags in code blocks instead of being removed.
+ [code] blocks inside [noparse] will still be converted to a code block.
|
[b]bold[/b] |
+
+ Additionally, [noparse] and [pre] blocks prevent mention and hashtag conversion to links:
+
+ - [noparse]@user@domain.tld #hashtag[/noparse]
+ - [pre]@user@domain.tld #hashtag[/pre]
+
+ |
+ @user@domain.tld #hashtag |
+
+
+ Additionally, [pre] blocks preserve spaces:
+
+ |
+ Spaces |
+
[nosmile] is used to disable smilies on a post by post basis
|