Merge branch 'release/6.0.18'

TYPO3GmbH · May 3, 2024 · 833e4c4 · 833e4c4
2 parents d4511ec + bdbf450
commit 833e4c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf
@@ -84,10 +84,15 @@ location = /core-contribution {
 
 # Rewrite Fluid VH reference links to new position
 location ~ ^/typo3cms/ViewHelperReference/latest(.*)$ {
-    return 303 /other/typo3/view-helper-reference/9.5/en-us$1;
+    return 303 /other/typo3/view-helper-reference/main/en-us$1;
 }
 location ~ ^/typo3cms/ViewHelperReference(.*)$ {
-    return 303 /other/typo3/view-helper-reference/9.5/en-us$1;
+    return 303 /other/typo3/view-helper-reference/main/en-us$1;
+}
+
+# Move exceptions to standard location
+location ~ ^/typo3cms/exceptions/main/en-us/(.*)$ {
+    return 303 /m/typo3/reference-exceptions/main/en-us/$1;
 }
 
 # Rewrite Surf documentation links to new position

diff --git a/package-lock.json b/package-lock.json