Merge develop into 20170321_-_frio-fbbrowser

[friendica.git] / doc / BBCode.md

diff --git a/doc/BBCode.md b/doc/BBCode.md
index aeb5e06c95cfecf8282b5598c7a8bc79f819de0b..50fb406b0539cd2f78030f8269283378bede0b32 100644 (file)
--- 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%
 }
 </style>
 
@@ -472,6 +473,10 @@ You can embed video, audio and more in a message.
   <td>[vimeo]Vimeo video ID[/vimeo]</td>
   <td>Vimeo player iframe embed.</td>
 </tr>
+<tr>
+  <td>[embed]URL[/embed]</td>
+  <td>Embed OEmbed rich content.</td>
+</tr>
 <tr>
   <td>[iframe]URL[/iframe]</td>
   <td>General embed, iframe size is limited by the theme size for video players.</td>
@@ -485,8 +490,8 @@ Page title with a link to *url* will be shown.</td>
 
 ## Map
 
-This require "openstreetmap" addon version 1.3 or newer. If the addon isn't activated,
-the raw coordinates are shown instead.
+This require "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+If the addon isn't activated, the raw coordinates are shown instead.
 
 <table class="bbcodes">
 <tr>
@@ -522,8 +527,8 @@ This is done with the [abstract]-element.
 <tr>
   <td>[abstract]Totally interesting! A must-see! Please click the link![/abstract]<br>
 I want to tell you a really boring story that you really never wanted to hear.</td>
-  <td>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 ..."</td>
+  <td>Twitter would display the text <blockquote>Totally interesting! A must-see! Please click the link!</blockquote>
+On Friendica you would only see the text after <blockquote>I want to tell you a really ...</blockquote></td>
 </tr>
 </table>
 
@@ -543,7 +548,7 @@ pictures?[/abstract]<br>
 that I wanted to share with you.[/abstract]<br>
 Today I was in the woods and took some real cool pictures ...</td>
   <td>For Twitter and App.net the system will use the defined abstracts.<br>
-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.</td>
+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.</td>
 </tr>
 </table>
 
@@ -569,7 +574,8 @@ While taking pictures in the woods I had a really strange encounter...</td>
 </tr>
 </table>
 
-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 isn't working with connectors where we post the HTML 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
 
@@ -579,7 +585,7 @@ The [abstract] element isn't working with the native OStatus connection or with
   <th>Result</th>
 </tr>
 <tr>
-  <td>If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:<br>
+  <td>If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
     <ul>
       <li>[noparse][b]bold[/b][/noparse]</li>
       <li>[nobb][b]bold[/b][/nobb]</li>
@@ -608,4 +614,3 @@ The [abstract] element isn't working with the native OStatus connection or with
   <td><pre>&lt;span class="custom"&gt;If the class exists,<br> this block will have the custom class<br> style applied.&lt;/span&gt;</pre></td>
 </tr>
 </table>
-