X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FBBCode.md;h=b13d081195190cbb387e8c04c1f19ebd9318932b;hb=9f86465fb97effb601dc2ae36ee1301a654b1dce;hp=aeb5e06c95cfecf8282b5598c7a8bc79f819de0b;hpb=75166cae27114c62aed2ed01c8ef9f24bc4f970b;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index aeb5e06c95..b13d081195 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -12,21 +12,22 @@ table.bbcodes {
border: 1px solid #aaa;
border-collapse: collapse;
color: #000;
- width: 100%;
+ width: 100%;
}
table.bbcodes > tr > th,
table.bbcodes > tr > td,
table.bbcodes > * > tr > th,
table.bbcodes > * > tr > td {
- border: 1px solid #aaa;
- padding: 0.2em 0.4em
+ border: 1px solid #aaa;
+ padding: 0.2em 0.4em
}
table.bbcodes > tr > th,
table.bbcodes > * > tr > th {
- background-color: #f2f2f2;
- text-align: center
+ background-color: #f2f2f2;
+ text-align: center;
+ width: 50%
}
@@ -60,17 +61,21 @@ table.bbcodes > * > tr > th {
| red |
- | [url=http://www.friendica.com]Friendica[/url] |
- Friendica |
+ [url=http://friendi.ca]Friendica[/url] |
+ Friendica |
+
+
+ | [img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img] |
+  |
- | [img]http://friendica.com/sites/default/files/friendika-32.png[/img] |
-  |
+ [img=https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg]The Friendica Logo[/img] |
+ |
- [img=64x32]http://friendica.com/sites/default/files/friendika-32.png[/img]
+ | [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
Note: provided height is simply discarded. |
- |
+ |
| [size=xx-small]small text[/size] |
@@ -81,7 +86,7 @@ table.bbcodes > * > tr > th {
big text |
- | [size=20]exact size[/size] (size can be any number, in pixel) |
+ [size=20]exact size[/size] (size can be any number, in pixels) |
exact size |
@@ -98,23 +103,23 @@ table.bbcodes > * > tr > th {
| Result |
- | [url]http://friendica.com[/url] |
- http://friendica.com |
+ [url]http://friendi.ca[/url] |
+ http://friendi.ca |
- | [url=http://friendica.com]Friendica[/url] |
- Friendica |
+ [url=http://friendi.ca]Friendica[/url] |
+ Friendica |
- [bookmark]http://friendica.com[/bookmark]
-#^[url]http://friendica.com[/url] |
- |
+ [bookmark]http://friendi.ca[/bookmark]
+#^[url]http://friendi.ca[/url] |
+ |
- [bookmark=http://friendica.com]Bookmark[/bookmark]
-#^[url=http://friendica.com]Bookmark[/url]
-#[url=http://friendica.com]^[/url][url=http://friendica.com]Bookmark[/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] |
@@ -164,7 +169,7 @@ line
code
- | [code=php]function text_highlight($s,$lang)[/code] |
+ [code=php]function text_highlight($s,$lang)[/code]1 |
- function text_highlight($s,$lang)
|
@@ -207,6 +212,27 @@ code
+1: Supported language parameter values for code highlighting:
+- abap
+- avrc
+- cpp
+- css
+- diff
+- dtd
+- html
+- java
+- javascript
+- js
+- mysql
+- perl
+- php
+- python
+- ruby
+- sh
+- sql
+- vbscript
+- xml
+
### Titles
@@ -472,6 +498,10 @@ You can embed video, audio and more in a message.
| [vimeo]Vimeo video ID[/vimeo] |
Vimeo player iframe embed. |
+
+ | [embed]URL[/embed] |
+ Embed OEmbed rich content. |
+
| [iframe]URL[/iframe] |
General embed, iframe size is limited by the theme size for video players. |
@@ -485,8 +515,8 @@ Page title with a link to *url* will be shown.
## Map
-This require "openstreetmap" addon version 1.3 or newer. If the addon isn't activated,
-the raw coordinates are shown instead.
+This requires "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+If the addon isn't activated, the raw coordinates are shown instead.
@@ -509,10 +539,10 @@ the raw coordinates are shown instead.
## Abstract for longer posts
-If you want to spread your post to several third party networks you can have the problem that these networks have a length limitation like on Twitter.
+If you want to spread your post to several third party networks you may have the problem that these networks have a length limitation like on Twitter.
-Friendica is using a semi intelligent mechanism to generate a fitting abstract.
-But it can be interesting to define a custom abstract that will only be displayed on the external network.
+Friendica uses a semi-intelligent mechanism to generate a fitting abstract.
+But it can be useful to define a custom abstract that will only be displayed on the external network.
This is done with the [abstract]-element.
@@ -522,8 +552,8 @@ This is done with the [abstract]-element.
[abstract]Totally interesting! A must-see! Please click the link![/abstract]
I want to tell you a really boring story that you really never wanted to hear. |
- Twitter would display the text "Totally interesting! A must-see! Please click the link!".
-On Friendica you would only see the text after "I want to tell you a really ..." |
+ Twitter would display the text Totally interesting! A must-see! Please click the link!
+On Friendica you would only see the text after I want to tell you a really ... |
@@ -543,7 +573,7 @@ pictures?[/abstract]
that I wanted to share with you.[/abstract]
Today I was in the woods and took some real cool pictures ...
For Twitter and App.net the system will use the defined abstracts.
-For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used. |
+For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used.
@@ -561,7 +591,7 @@ Instead you have to name the explicit network:
[abstract]These days I had a strange encounter...[/abstract]
-[abstract=goog]Helly my dear Google+ followers. You have to read my newest blog post![/abstract]
+[abstract=goog]Hello my dear Google+ followers. You have to read my newest blog post![/abstract]
[abstract=face]Hello my Facebook friends. These days happened something really cool.[/abstract]
While taking pictures in the woods I had a really strange encounter... |
Google and Facebook will show the respective abstracts while the other networks will show the default one.
@@ -569,7 +599,11 @@ While taking pictures in the woods I had a really strange encounter... |
-The [abstract] element isn't working with the native OStatus connection or with connectors where we post the HTML like Tumblr, Wordpress or Pump.io.
+The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, Wordpress or Pump.io.
+For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
+
+For postings that are delivered via ActivityPub, the text from the abstract is placed in the summary field.
+On Mastodon this field is used for the content warning.
## Special
@@ -579,7 +613,7 @@ The [abstract] element isn't working with the native OStatus connection or with
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] are used to escape bbcode:
- [noparse][b]bold[/b][/noparse]
- [nobb][b]bold[/b][/nobb]
@@ -608,4 +642,3 @@ The [abstract] element isn't working with the native OStatus connection or with
<span class="custom">If the class exists,
this block will have the custom class
style applied.</span> |
|
-