X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=doc%2FBBCode.md;h=6eebed486486cbf00c80d5c68baaee5088ee3fc0;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=595c2da8608de744a72a05f2b43aa794975ce5d4;hpb=4b33573c20850607d9e1cc0f33a57ffacf12fec8;p=friendica.git
diff --git a/doc/BBCode.md b/doc/BBCode.md
index 595c2da860..6eebed4864 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -26,7 +26,8 @@ table.bbcodes > * > tr > td {
table.bbcodes > tr > th,
table.bbcodes > * > tr > th {
background-color: #f2f2f2;
- text-align: center
+ text-align: center;
+ width: 50%
}
@@ -60,17 +61,17 @@ 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=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] |
@@ -81,7 +82,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 +99,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] |
@@ -472,6 +473,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 +490,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 +514,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.
@@ -543,7 +548,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 +566,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 +574,8 @@ 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.
## Special