Merge develop into 20170321_-_frio-fbbrowser

[friendica.git] / doc / BBCode.md

diff --git a/doc/BBCode.md b/doc/BBCode.md
index 6a8c5ebdf131c975f3bccd645a5f85e9c62a74d6..50fb406b0539cd2f78030f8269283378bede0b32 100644 (file)
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -473,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>