diff --git a/typo3/sysext/adminpanel/Documentation/Configuration/Index.rst b/typo3/sysext/adminpanel/Documentation/Configuration/Index.rst
index 177b93728eabdde2a96d74550c00366e5de9d1dd..32a950fc205f6194a4c658526ec8c7d7e4bd34ca 100644
--- a/typo3/sysext/adminpanel/Documentation/Configuration/Index.rst
+++ b/typo3/sysext/adminpanel/Documentation/Configuration/Index.rst
@@ -1,4 +1,4 @@
-.. include:: ../Includes.txt
+.. include:: /Includes.txt
 
 .. _configuration:
 
diff --git a/typo3/sysext/adminpanel/Documentation/Index.rst b/typo3/sysext/adminpanel/Documentation/Index.rst
index 956f877ff003768ad65c87144aa8cb30d4aa4977..32bd4c827e527beac91db21569a1c659c181c918 100644
--- a/typo3/sysext/adminpanel/Documentation/Index.rst
+++ b/typo3/sysext/adminpanel/Documentation/Index.rst
@@ -1,7 +1,7 @@
 .. every .rst file should include Includes.txt
 .. use correct path!
 
-.. include:: Includes.txt
+.. include:: /Includes.txt
 
 .. Every manual should have a start label for cross-referencing to
 .. start page. Do not remove this!
@@ -59,5 +59,4 @@ request.
    Inspecting/Index
    Settings/Index
    Extending/Index
-   Changelog/Index
    Sitemap
diff --git a/typo3/sysext/fluid_styled_content/Documentation/Settings.cfg b/typo3/sysext/fluid_styled_content/Documentation/Settings.cfg
index ea71d9432e058b65a531ab1c07eb82974824b63a..d4b4dd953b1c0d085d93cb7108e38790766e710a 100644
--- a/typo3/sysext/fluid_styled_content/Documentation/Settings.cfg
+++ b/typo3/sysext/fluid_styled_content/Documentation/Settings.cfg
@@ -13,8 +13,6 @@ description = This documentation is about TYPO3's system extension
       "fluid_styled_content" which provides content elements and uses Fluid to render
       frontend output.
 
-todo_include_todos = true
-
 [html_theme_options]
 
 ; for theme t3SphinxThemeRtd
diff --git a/typo3/sysext/linkvalidator/Documentation/Includes.txt b/typo3/sysext/linkvalidator/Documentation/Includes.txt
index 6f6d15ac0e57db62d01a3a8628cc57cc968473e3..400b4e9b4ff0cc9b53a796298edb58672638dc03 100644
--- a/typo3/sysext/linkvalidator/Documentation/Includes.txt
+++ b/typo3/sysext/linkvalidator/Documentation/Includes.txt
@@ -12,6 +12,7 @@
 .. --------------------------------------------------
 
 .. role::   typoscript(code)
+.. role::   sql(code)
 
 .. role::   ts(typoscript)
    :class:  typoscript
diff --git a/typo3/sysext/linkvalidator/Documentation/Introduction/Index.rst b/typo3/sysext/linkvalidator/Documentation/Introduction/Index.rst
index 1a7136fb8e008e5af1698efc59a25ba5e61dcba9..d73f492f818de1fbece7be5fd63cb86394892f96 100644
--- a/typo3/sysext/linkvalidator/Documentation/Introduction/Index.rst
+++ b/typo3/sysext/linkvalidator/Documentation/Introduction/Index.rst
@@ -97,14 +97,9 @@ The LinkValidator features full support of the TYPO3 Scheduler. This is
 the LinkValidator task:
 
 .. figure:: ../Images/SchedulerTask.png
-   :alt: The LinkValidator Scheduler task (1)
+   :alt: The LinkValidator Scheduler task
 
-   Defining the LinkValidator task in the Scheduler (2)
-
-.. figure:: ../Images/SchedulerTask2.png
-   :alt: The LinkValidator Scheduler task (2)
-
-   Defining the LinkValidator task in the Scheduler (2)
+   Defining the LinkValidator task in the Scheduler
 
 
 -   With this task you can run LinkValidator regularly via cron without
diff --git a/typo3/sysext/workspaces/Documentation/Administration/Workspaces/Index.rst b/typo3/sysext/workspaces/Documentation/Administration/Workspaces/Index.rst
index 5ab39f42a3caa42514b0938e95c64e95a2bb2d64..9024e00fd1a5253d3926f9806949a949248ea2a2 100644
--- a/typo3/sysext/workspaces/Documentation/Administration/Workspaces/Index.rst
+++ b/typo3/sysext/workspaces/Documentation/Administration/Workspaces/Index.rst
@@ -84,4 +84,4 @@ mind. Although the ideal is complete transparency in backend and
 perfect previews in the frontend, this is almost impossible to obtain.
 Nevertheless a high level of consistency can be obtained by using the API
 provided by TYPO3 CMS. These functions and the challenges they are designed to
-address are discussed in :ref:`TYPO3 Core API <t3api:workspaces>`.
+address are discussed in :ref:`TYPO3 Explained <t3coreapi:workspaces>`.
diff --git a/typo3/sysext/workspaces/Documentation/Introduction/Index.rst b/typo3/sysext/workspaces/Documentation/Introduction/Index.rst
index f17a2c6953a2ba9144bbaa3b6d2c1e2242582f1d..c236f3f39ba328bcaab21fd88a06de94333f2e19 100644
--- a/typo3/sysext/workspaces/Documentation/Introduction/Index.rst
+++ b/typo3/sysext/workspaces/Documentation/Introduction/Index.rst
@@ -27,9 +27,9 @@ Credits
 ^^^^^^^
 
 This manual corresponds in large parts to the original version from
-Kasper found in the :ref:`Inside TYPO3 <t3inside:start>` document. It was adjusted and
-updated to fit with the workspaces and versioning modules as found in
-current versions.
+Kasper found in `Inside TYPO3 <https://docs.typo3.org/typo3cms/InsideTypo3Reference/>`__
+document. It was adjusted and updated to fit with the workspaces and versioning
+modules and moved into :ref:`TYPO3 Explained <t3coreapi:workspaces>`.
 
 
 .. _feedback:
diff --git a/typo3/sysext/workspaces/Documentation/Settings.cfg b/typo3/sysext/workspaces/Documentation/Settings.cfg
index 59ffa328a21bd5533b96f89be72628e8d5721ce9..1e3e697122e8abe7ed958050ab87cdde058c5589 100644
--- a/typo3/sysext/workspaces/Documentation/Settings.cfg
+++ b/typo3/sysext/workspaces/Documentation/Settings.cfg
@@ -14,8 +14,8 @@ description = This is the documentation of TYPO3's system
 
 ; in this manual we actually use:
 
-t3api        = https://docs.typo3.org/typo3cms/CoreApiReference/
-t3tca        = https://docs.typo3.org/typo3cms/TCAReference/
+t3coreapi     = https://docs.typo3.org/m/typo3/reference-coreapi/main/en-us/
+t3tca         = https://docs.typo3.org/m/typo3/reference-tca/main/en-us/
 t3inside     = https://docs.typo3.org/typo3cms/InsideTypo3Reference/