diff --git a/typo3/sysext/core/Documentation/Changelog/Howto.rst b/typo3/sysext/core/Documentation/Changelog/Howto.rst
index 2cdf653f88a0b95ce54c55ce278ede88faf9efcf..0ae1c24616542922f99d294c059d1b8ab2dbd153 100644
--- a/typo3/sysext/core/Documentation/Changelog/Howto.rst
+++ b/typo3/sysext/core/Documentation/Changelog/Howto.rst
@@ -109,7 +109,7 @@ Filename convention
File content
============
-Like other documentation, changelog files are done in ReST, see `TYPO3 wiki ReST syntax`_ for more details.
+Like other documentation, changelog files are done in ReST, see :ref:`h2document:rest-cheat-sheet` for more details.
- All types contain a "Description" section that should give a short summary on which core part was affected by the change.
@@ -123,8 +123,6 @@ Like other documentation, changelog files are done in ReST, see `TYPO3 wiki ReST
- All types contain a list of tags, see below.
-.. _TYPO3 wiki ReST syntax: http://wiki.typo3.org/ReST_Syntax
-
Tagging
=======
diff --git a/typo3/sysext/core/Documentation/Settings.cfg b/typo3/sysext/core/Documentation/Settings.cfg
index 79cfc6c4fe7d380ffb29bc358c23cccbcde88673..d54b082b9c818c49c2e929356a833248fd945c79 100644
--- a/typo3/sysext/core/Documentation/Settings.cfg
+++ b/typo3/sysext/core/Documentation/Settings.cfg
@@ -17,26 +17,11 @@ description = This documentation contains the changelog
; uncomment only what you actually use, as on each build an extra
; inventory file is downloaded for each mapping used.
-# t3api = https://typo3.org/api/typo3cms/
-# t3cgl = https://docs.typo3.org/typo3cms/CodingGuidelinesReference/
-t3coreapi = https://docs.typo3.org/typo3cms/CoreApiReference/
-# t3editors = https://docs.typo3.org/typo3cms/EditorsTutorial/
-# t3extbasebook = https://docs.typo3.org/typo3cms/ExtbaseFluidBook/
-# t3fal = https://docs.typo3.org/typo3cms/FileAbstractionLayerReference/
-# t3inside = https://docs.typo3.org/typo3cms/InsideTypo3Reference/
-# t3install = https://docs.typo3.org/typo3cms/InstallationGuide/
-# t3l10n = https://docs.typo3.org/typo3cms/FrontendLocalizationGuide/
-# t3security = https://docs.typo3.org/typo3cms/SecurityGuide/
-# t3services = https://docs.typo3.org/typo3cms/Typo3ServicesReference/
-# t3skinning = https://docs.typo3.org/typo3cms/SkinningReference/
-# t3start = https://docs.typo3.org/typo3cms/GettingStartedTutorial/
-# t3tca = https://docs.typo3.org/typo3cms/TCAReference/
-# t3templating = https://docs.typo3.org/typo3cms/TemplatingTutorial/
-# t3ts45 = https://docs.typo3.org/typo3cms/TyposcriptIn45MinutesTutorial/
-# t3tsconfig = https://docs.typo3.org/typo3cms/TSconfigReference/
-t3tsref = https://docs.typo3.org/typo3cms/TyposcriptReference/
-# t3tssyntax = https://docs.typo3.org/typo3cms/TyposcriptSyntaxReference/
+h2document = https://docs.typo3.org/m/typo3/docs-how-to-document/master/en-us/
+t3coreapi = https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/
+t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/
+; see https://docs.typo3.org/m/typo3/docs-how-to-document/master/en-us/GeneralConventions/DirectoryFilenames.html#settings-cfg
[html_theme_options]
diff --git a/typo3/sysext/dashboard/Documentation/Settings.cfg b/typo3/sysext/dashboard/Documentation/Settings.cfg
index e78ab065ec1bf244005178067e1674a53dc99fcb..4bcea8006658a6933937f6ee0779ef3ca732ac77 100644
--- a/typo3/sysext/dashboard/Documentation/Settings.cfg
+++ b/typo3/sysext/dashboard/Documentation/Settings.cfg
@@ -41,7 +41,7 @@ t3coreapi = https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/
# t3start = https://docs.typo3.org/m/typo3/tutorial-getting-started/master/en-us/
t3sitepackage = https://docs.typo3.org/m/typo3/tutorial-sitepackage/master/en-us/
# t3tca = https://docs.typo3.org/m/typo3/reference-tca/master/en-us/
-# t3templating = https://docs.typo3.org/m/typo3/tutorial-templating-with-fluid/master/en-us/
+# t3templating = https://docs.typo3.org/m/typo3/tutorial-templating/master/en-us/
# t3ts45 = https://docs.typo3.org/m/typo3/tutorial-typoscript-in-45-minutes/master/en-us/
# t3tsconfig = https://docs.typo3.org/m/typo3/reference-tsconfig/master/en-us/
# t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/
diff --git a/typo3/sysext/extbase/ext_typoscript_setup.typoscript b/typo3/sysext/extbase/ext_typoscript_setup.typoscript
index 8348d38667441c14595a1fdbb666a3f7c9a38693..85f52c01d52b702f1c03d1c8f1913d4f23af4b4f 100644
--- a/typo3/sysext/extbase/ext_typoscript_setup.typoscript
+++ b/typo3/sysext/extbase/ext_typoscript_setup.typoscript
@@ -7,7 +7,7 @@ config.tx_extbase {
updateReferenceIndex = 0
}
features {
- # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
+ # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://docs.typo3.org/m/typo3/book-extbasefluid/master/en-us/b-ExtbaseReference/Index.html#features)
skipDefaultArguments = 0
# if set to 1, the enable fields are ignored in BE context
ignoreAllEnableFieldsInBe = 0
diff --git a/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript b/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript
index a7831e9190e39b44e2617d7b45404422708cec60..381f56a2f563fc74dc5ba0bf0e3e54db2ac4a90e 100644
--- a/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript
+++ b/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript
@@ -1,6 +1,6 @@
module.tx_extensionmanager {
features {
- # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
+ # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://docs.typo3.org/m/typo3/book-extbasefluid/master/en-us/b-ExtbaseReference/Index.html#features)
skipDefaultArguments = 0
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/seo/Documentation/Settings.cfg b/typo3/sysext/seo/Documentation/Settings.cfg
index e9304d9bea4a474702910b08dfe8fbc8c904fce6..73471a5efd586ec2c248738de9c18421a055a87d 100644
--- a/typo3/sysext/seo/Documentation/Settings.cfg
+++ b/typo3/sysext/seo/Documentation/Settings.cfg
@@ -42,7 +42,7 @@ t3install = https://docs.typo3.org/m/typo3/guide-installation/master/en-us/
# t3start = https://docs.typo3.org/m/typo3/tutorial-getting-started/master/en-us/
# t3sitepackage = https://docs.typo3.org/m/typo3/tutorial-sitepackage/master/en-us/
# t3tca = https://docs.typo3.org/m/typo3/reference-tca/master/en-us/
-# t3templating = https://docs.typo3.org/m/typo3/tutorial-templating-with-fluid/master/en-us/
+# t3templating = https://docs.typo3.org/m/typo3/tutorial-templating/master/en-us/
# t3ts45 = https://docs.typo3.org/m/typo3/tutorial-typoscript-in-45-minutes/master/en-us/
# t3tsconfig = https://docs.typo3.org/m/typo3/reference-tsconfig/master/en-us/
t3tsref = https://docs.typo3.org/m/typo3/reference-typoscript/master/en-us/