From 9bfdc2f48a23b64f28c3c4903a832a3a8ba26a59 Mon Sep 17 00:00:00 2001
From: Sybille Peters <sypets@gmx.de>
Date: Sun, 26 Apr 2020 10:36:21 +0200
Subject: [PATCH] [DOCS] Fix some broken or outdated links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves: #91198
Releases: master, 9.5
Change-Id: Ibd8ec73ee4a3b38feced4fca3a8609be4b0a3757
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64317
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Björn Jacob <bjoern.jacob@tritum.de>
Tested-by: Daniel Siepmann <coding@daniel-siepmann.de>
Reviewed-by: Björn Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Daniel Siepmann <coding@daniel-siepmann.de>
---
.../core/Documentation/Changelog/Howto.rst | 4 +---
typo3/sysext/core/Documentation/Settings.cfg | 23 ++++---------------
.../dashboard/Documentation/Settings.cfg | 2 +-
.../extbase/ext_typoscript_setup.typoscript | 2 +-
.../ext_typoscript_setup.typoscript | 4 ++--
typo3/sysext/seo/Documentation/Settings.cfg | 2 +-
6 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/typo3/sysext/core/Documentation/Changelog/Howto.rst b/typo3/sysext/core/Documentation/Changelog/Howto.rst
index 2cdf653f88a0..0ae1c2461654 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 79cfc6c4fe7d..d54b082b9c81 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 e78ab065ec1b..4bcea8006658 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 8348d3866744..85f52c01d52b 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 a7831e9190e3..381f56a2f563 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 e9304d9bea4a..73471a5efd58 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/
--
GitLab