X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=doc%2FBBCode.md;h=753bc69425bf669ee73b611604cd7cbb3ae60a25;hb=3fddf3807a8e47cbe993ac461222a68f58af96dd;hp=cab51bd09f13a248c10b9d67040246e25a690211;hpb=b2198c75101ec8332a48c8ff449c2047b5ba22d5;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index cab51bd09f..753bc69425 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] |
@@ -502,10 +502,6 @@ You can embed video, audio and more in a message.
[embed]URL[/embed] |
Embed OEmbed rich content. |
-
- [iframe]URL[/iframe] |
- General embed, iframe size is limited by the theme size for video players. |
-
[url]*url*[/url] |
If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
@@ -613,15 +609,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
|