core/modules/filter/src/Plugin/Filter/FilterAlign.php   |  6 +++---
 core/modules/filter/src/Plugin/Filter/FilterCaption.php | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/modules/filter/src/Plugin/Filter/FilterAlign.php b/core/modules/filter/src/Plugin/Filter/FilterAlign.php
index 02681e8..168d0d6 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterAlign.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterAlign.php
@@ -57,16 +57,16 @@ public function process($text, $langcode) {
   public function tips($long = FALSE) {
     if ($long) {
       return $this->t('
-        <p>You can align images left, right or centered. Examples:</p>
+        <p>You can align images, videos, blockquotes and so on to the left, right or center. Examples:</p>
         <ul>
           <li>Align an image to the left: <code>&lt;img src="" data-align="left" /&gt;</code></li>
           <li>Align an image to the center: <code>&lt;img src="" data-align="center" /&gt;</code></li>
           <li>Align an image to the right: <code>&lt;img src="" data-align="right" /&gt;</code></li>
-          <li>… and you can apply this to other elements as well: <code>&lt;blockquote&gt;Llamas are awesome&lt;blockquote;&gt;</code></li>
+          <li>… and you can apply this to other elements as well: <code>&lt;video src="" data-align="center" /&gt;</code></li>
         </ul>');
     }
     else {
-      return $this->t('You can align images (<code>data-align="center"</code>code>), but also video, blockquotes, and so on.');
+      return $this->t('You can align images (<code>data-align="center"</code>code>), but also videos, blockquotes, and so on.');
     }
   }
 
diff --git a/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index 8fbbe0f..5b74f43 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -97,10 +97,16 @@ public function process($text, $langcode) {
   public function tips($long = FALSE) {
     if ($long) {
       return $this->t('
-        <p>You can add caption images. Example: <code>&lt;img src="" data-caption="This is a caption" /&gt;</code>.</p>');
+        <p>You can caption images, videos, blockquotes, and so on. Examples:</p>
+        <ul>
+            <li><code>&lt;img src="" data-caption="This is a caption" /&gt;</code></li>
+            <li><code>&lt;video src="" data-caption="The Drupal Dance" /&gt;</code></li>
+            <li><code>&lt;blockquote data-caption="Dries Buytaert"&gt;Drupal is awesome!&lt;/blockquote&gt;</code></li>
+            <li><code>&lt;code data-caption="Hello world in JavaScript."&gt;alert("Hello world!");&lt;/code&gt;</code></li>
+        </ul>');
     }
     else {
-      return $this->t('You can caption images (<code>data-caption="Text"<code>), but also video, blockquotes, and so on.');
+      return $this->t('You can caption images (<code>data-caption="Text"<code>), but also videos, blockquotes, and so on.');
     }
   }