From dc0e4e65d58dede3e8317b889b3fc9e0e9ec9ab2 Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:29:41 +0200 Subject: [PATCH 1/7] [TASK] Move tuning TYPO3 chapter to TYPO3 Explained See https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-GettingStarted/pull/477 --- config/nginx/redirects.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index 64d0f4f..c069987 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -887,6 +887,9 @@ location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagem location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/PermissionsManagement/$2; } +location ~ ^/m/typo3/tutorial-getting-started//(main|13.4|12.4)/en-us/Installation/TuneTYPO3.html { + return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/en-us/Administration/Installation/TuneTYPO3.html; +} # TYPO3 release integrity guide as requestes by ohader # https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-Installation/pull/82 From 7547db0198f96d333bd3cf849431e8fe097052fc Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 05:30:43 +0200 Subject: [PATCH 2/7] Update redirects.conf --- config/nginx/redirects.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index c069987..6a7311d 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -887,9 +887,12 @@ location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagem location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/PermissionsManagement/$2; } -location ~ ^/m/typo3/tutorial-getting-started//(main|13.4|12.4)/en-us/Installation/TuneTYPO3.html { +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/TuneTYPO3.html { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/en-us/Administration/Installation/TuneTYPO3.html; } +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/ReleaseIntegrity.html { + return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/en-us/Administration/Installation/ReleaseIntegrity.html; +} # TYPO3 release integrity guide as requestes by ohader # https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-Installation/pull/82 From 9bebac106033ff4673ef50d854bef9f0e59093ff Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 05:37:30 +0200 Subject: [PATCH 3/7] Update redirects.conf --- config/nginx/redirects.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index 6a7311d..5cfb032 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -887,11 +887,8 @@ location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagem location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/PermissionsManagement/$2; } -location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/TuneTYPO3.html { - return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/en-us/Administration/Installation/TuneTYPO3.html; -} -location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/ReleaseIntegrity.html { - return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/en-us/Administration/Installation/ReleaseIntegrity.html; +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { + return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/Installation/$2.html; } # TYPO3 release integrity guide as requestes by ohader From 565c0c7081717e0219f1b84a57166cb9195822fb Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 06:37:50 +0200 Subject: [PATCH 4/7] Update redirects.conf --- config/nginx/redirects.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index 5cfb032..f26e9ce 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -67,7 +67,7 @@ location = /Home/Extensions.html { # Add short links location = /installation { - return 303 /m/typo3/tutorial-getting-started/main/en-us/Installation/Index.html; + return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/Install.html } location = /upgrade { @@ -75,7 +75,7 @@ location = /upgrade { } location = /system-requirements { - return 303 /m/typo3/guide-installation/main/en-us/In-depth/SystemRequirements/Index.html; + return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/SystemRequirements/Index.html } location = /core-contribution { @@ -881,13 +881,13 @@ location ~ ^/typo3cms/extensions/externalimport_tut/(master|latest|stable)/(.*) } # getting started rewrite 2024 -location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagement/(.*) { +location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/UserManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/UserManagement/$2; } -location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { +location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/PermissionsManagement/$2; } -location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { +location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/Installation/$2.html; } From 5ce4462774fb14b98898c0f8ea09189235bcb4d7 Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 06:41:28 +0200 Subject: [PATCH 5/7] Update redirects.conf --- config/nginx/redirects.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index f26e9ce..2a8b7eb 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -881,13 +881,16 @@ location ~ ^/typo3cms/extensions/externalimport_tut/(master|latest|stable)/(.*) } # getting started rewrite 2024 -location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/UserManagement/(.*) { +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/TutorialDdev.html { + return 303 https://docs.typo3.org/m/typo3/tutorial-getting-started/$1/en-us/Installation/Install.html +} +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/UserManagement/$2; } -location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/PermissionsManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/PermissionsManagement/$2; } -location ~ ^/m/typo3/tutorial-/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/Installation/$2.html; } From bbc96cf0b78fbd40251cfbf943e9bd33801d35f9 Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 07:32:23 +0200 Subject: [PATCH 6/7] Update redirects.conf --- config/nginx/redirects.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index 2a8b7eb..ec1ceab 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -893,6 +893,9 @@ location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Permissions location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/(TuneTYPO3|ReleaseIntegrity|Deployer/Index|Surf/Index|Magallanes/Index).html { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/Installation/$2.html; } +location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/en-us/Troubleshooting/(TYPO3|SystemModules|PHP|Database).html { + return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/Troubleshooting/$2.html; +} # TYPO3 release integrity guide as requestes by ohader # https://github.com/TYPO3-Documentation/TYPO3CMS-Guide-Installation/pull/82 From 2ffafea7eefb2b4cff29d8073a73566b359ce976 Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:12:05 +0200 Subject: [PATCH 7/7] Apply suggestions from code review --- config/nginx/redirects.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf index ec1ceab..8adf7cb 100644 --- a/config/nginx/redirects.conf +++ b/config/nginx/redirects.conf @@ -67,7 +67,7 @@ location = /Home/Extensions.html { # Add short links location = /installation { - return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/Install.html + return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/Install.html; } location = /upgrade { @@ -75,7 +75,7 @@ location = /upgrade { } location = /system-requirements { - return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/SystemRequirements/Index.html + return 303 /m/typo3/reference-coreapi/main/en-us/Administration/Installation/SystemRequirements/Index.html; } location = /core-contribution { @@ -882,7 +882,7 @@ location ~ ^/typo3cms/extensions/externalimport_tut/(master|latest|stable)/(.*) # getting started rewrite 2024 location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/Installation/TutorialDdev.html { - return 303 https://docs.typo3.org/m/typo3/tutorial-getting-started/$1/en-us/Installation/Install.html + return 303 https://docs.typo3.org/m/typo3/tutorial-getting-started/$1/en-us/Installation/Install.html; } location ~ ^/m/typo3/tutorial-getting-started/(main|13.4|12.4)/en-us/UserManagement/(.*) { return 303 https://docs.typo3.org/m/typo3/reference-coreapi/$1/en-us/Administration/UserManagement/$2;