X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FBBCode.md;h=cab51bd09f13a248c10b9d67040246e25a690211;hb=34463f37e4a3226709853bd3e35e6c22da45502c;hp=50fb406b0539cd2f78030f8269283378bede0b32;hpb=fc3c1601b1d8de58aff2457f6e116ea226c69ced;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index 50fb406b05..cab51bd09f 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -61,17 +61,21 @@ table.bbcodes > * > tr > th {
red |
- [url=http://www.friendica.com]Friendica[/url] |
- Friendica |
+ [url=http://friendi.ca]Friendica[/url] |
+ Friendica |
- [img]http://friendica.com/sites/default/files/friendika-32.png[/img] |
- ![Immagine/foto](http://friendica.com/sites/default/files/friendika-32.png) |
+ [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=64x32]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] |
+ ![The Friendica Logo](https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg) |
+
+
+ [img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]
Note: provided height is simply discarded. |
- ![](http://friendica.com/sites/default/files/friendika-32.png) |
+ ![](https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg) |
[size=xx-small]small text[/size] |
@@ -82,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 |
@@ -99,27 +103,27 @@ 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] |
- Diaspora post with GUID |
+ Diaspora post with GUID |
#Friendica |
@@ -165,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)
|
@@ -208,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
@@ -490,7 +515,7 @@ Page title with a link to *url* will be shown.
## Map
-This require "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+This requires "openstreetmap" or "Google Maps" addon version 1.3 or newer.
If the addon isn't activated, the raw coordinates are shown instead.
@@ -514,10 +539,10 @@ If the addon isn't activated, 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.
@@ -566,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.
@@ -574,9 +599,12 @@ While taking pictures in the woods I had a really strange encounter... |
-The [abstract] element isn't working 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