diff --git a/Documentation/ContentMapping/AddContent.rst b/Documentation/ContentMapping/AddContent.rst
index ec9de59b..532ea311 100644
--- a/Documentation/ContentMapping/AddContent.rst
+++ b/Documentation/ContentMapping/AddContent.rst
@@ -7,7 +7,11 @@
 Add content in the TYPO3 backend
 ================================
 
-Now it's a great time to add some content in the backend. Go to
+The pages generated in step
+:ref:`Create initial pages <t3sitepackage:typo3-backend-create-initial-pages>`
+already contain some example content.
+
+You can add additonal content in the backend. Go to
 :guilabel:`Web > Page` and select any of the pages you created before,
 (for example "Page 1"). Click the :guilabel:`+ Content` button
 in the column labelled "*Main*" and choose the "Regular Text
@@ -21,25 +25,12 @@ You can return to the previous view by clicking :guilabel:`Close`.
 
 ..  include:: /Images/AutomaticScreenshots/FillNewContentElement.rst.txt
 
-The new content element appears in the appropriate column. Repeat this process
-and enter some further content in the column "Jumbotron". The page module should
-now look like this:
-
-..  include:: /Images/AutomaticScreenshots/ContentMappingPreviewPage.rst.txt
-
-..  contents::
-
-..  _cm-preview-page:
-
-Preview page
-============
-
-We have made changes to the Fluid templates of the extension above. It is
-therefore necessary to :guilabel:`Flush frontend caches` in the Menu in the
-top bar before you can preview the page properly:
-
-..  include:: /Images/AutomaticScreenshots/FlushFrontendCaches.rst.txt
-
-You can now preview your page:
+:ref:`Preview the page <t3sitepackage:cm-preview-page>` and assert that the
+content is displayed as expected. Whenever you edit the content elements on
+a page the cache of the current page is automatically deleted. If the content
+fails to update you should still delete the TYPO3 caches and force your
+browser to reload.
 
-..  include:: /Images/AutomaticScreenshots/ContentMappingPreviewPage.rst.txt
+There are many tips and tricks around content editing. The topic is described
+in more depth in chapter
+:ref:`Content Elements of the Editors Tutorial <t3editors:content-elements>`.
diff --git a/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.png b/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.png
deleted file mode 100644
index ae490314..00000000
Binary files a/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.png and /dev/null differ
diff --git a/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.rst.txt b/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.rst.txt
deleted file mode 100644
index 7a41b7e4..00000000
--- a/Documentation/Images/AutomaticScreenshots/ContentMappingPreviewPage.rst.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-.. Automatic screenshot: Remove this line if you want to manually change this file
-
-.. figure:: /Images/AutomaticScreenshots/ContentMappingPreviewPage.png
-   :class: with-shadow
-
-   Preview the page
\ No newline at end of file
diff --git a/Documentation/MinimalExample/Index.rst b/Documentation/MinimalExample/Index.rst
index 70666b4f..2dff01e7 100644
--- a/Documentation/MinimalExample/Index.rst
+++ b/Documentation/MinimalExample/Index.rst
@@ -197,6 +197,20 @@ Clear all caches and preview the web page.
 
 Learn more about using Fluid Templates in chapter :ref:`fluid-templates`.
 
+..  _cm-preview-page:
+
+Preview page
+============
+
+Whenever we have made changes to the Fluid templates or TypoScript files, it is
+necessary to :guilabel:`Flush frontend caches` in the menu in the
+top bar before you can preview the page properly:
+
+..  include:: /Images/AutomaticScreenshots/FlushFrontendCaches.rst.txt
+
+You can then preview your page by clicking on the button :guilabel:`View webpage`
+in the page module.
+
 .. _extension-configuration-composer:
 
 Composer configuration :file:`composer.json`