diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 07d43be62b..e4322162b4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,7 @@ Changelog
  * Added accessible colour contrast guidelines to the style guide (Catherine Farman)
  * Added faceted search using the `.facet()` method (Karl Hobley)
  * Admin modal views no longer rely on Javascript `eval()`, for better CSP compliance (Matt Westcott)
+ * Update editor guide for embeds and documents in rich text (Kevin Howbrook)
  * Fix: Handle all exceptions from `Image.get_file_size` (Andrew Plummer)
  * Fix: Fix display of breadcrumbs in ModelAdmin (LB (Ben Johnston))
  * Fix: Remove duplicate border radius of avatars (Benjamin Thurm)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index b74524f73b..e6453ad0bd 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -310,6 +310,7 @@ Contributors
 * Abdulmalik Abdulwahab
 * Andrew Crewdson
 * Aram Dulyan
+* Kevin Howbrook
 
 Translators
 ===========
diff --git a/docs/_static/images/screen21_video_in_editor.png b/docs/_static/images/screen21_video_in_editor.png
index 4b4bfb36bc..d3af04ee11 100644
Binary files a/docs/_static/images/screen21_video_in_editor.png and b/docs/_static/images/screen21_video_in_editor.png differ
diff --git a/docs/_static/images/screen27_docs_icon.png b/docs/_static/images/screen27_docs_icon.png
index 8d02f4c343..5937861f6c 100644
Binary files a/docs/_static/images/screen27_docs_icon.png and b/docs/_static/images/screen27_docs_icon.png differ
diff --git a/docs/_static/images/screen28_docs_form.png b/docs/_static/images/screen28_docs_form.png
index 2b85babc07..c16f845f2a 100644
Binary files a/docs/_static/images/screen28_docs_form.png and b/docs/_static/images/screen28_docs_form.png differ
diff --git a/docs/editor_manual/new_pages/inserting_videos.rst b/docs/editor_manual/new_pages/inserting_videos.rst
index 299e8eacdf..299aefc990 100644
--- a/docs/editor_manual/new_pages/inserting_videos.rst
+++ b/docs/editor_manual/new_pages/inserting_videos.rst
@@ -4,12 +4,15 @@
 Inserting videos into body content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As well as inserting videos into a carousel, Wagtail's rich text fields allow you to add videos into the body of a page by clicking the *Add video* button in the toolbar.
+It is possible to embed media into the body text of a web page by clicking the *Embed* button in rich text toolbar.
 
 .. image:: ../../_static/images/screen20_insert_video_form.png
 
-* Copy and paste the web address for the video (either YouTube or Vimeo) into the URL field and click Insert.
+* Copy and paste the web address for the media into the URL field and click Insert.
 
 .. image:: ../../_static/images/screen21_video_in_editor.png
 
-* A placeholder with the name of the video and a screenshot will be inserted into the text area. Clicking the X in the top corner will remove the video.
+* A placeholder of the media will be inserted into the text area.
+
+The embed button can be used to import media from a number of supported providers, you can see the `full list of supported providers in Wagtail’s source code <https://github.com/wagtail/wagtail/blob/master/wagtail/embeds/oembed_providers.py>`_.
+
diff --git a/docs/releases/2.2.rst b/docs/releases/2.2.rst
index fe40a1b652..e1e5a34d9a 100644
--- a/docs/releases/2.2.rst
+++ b/docs/releases/2.2.rst
@@ -28,6 +28,7 @@ Other features
  * Added accessible colour contrast guidelines to the style guide (Catherine Farman)
  * Added faceted search using the ``.facet()`` method (Karl Hobley)
  * Admin modal views no longer rely on Javascript ``eval()``, for better CSP compliance (Matt Westcott)
+ * Update editor guide for embeds and documents in rich text (Kevin Howbrook)
 
 Bug fixes
 ~~~~~~~~~