This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 6590f48c45 Fix redirects
6590f48c45 is described below
commit 6590f48c453e96264a9d261341013704073857ea
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu May 30 15:05:40 2024 +0200
Fix redirects
---
src/site/resources/.htaccess | 4 ++--
src/tools/redirects.txt | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index 1c15064b2c..8194fd29b5 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -56,9 +56,8 @@ RewriteRule "^log4j-slf4j2-impl\.html$"
"manual/installation.html#impl-core-brid
RewriteRule "^manual/api-separation\.html$" "manual/api.html" [R=permanent]
RewriteRule "^manual/scala-api\.html$" "/log4j/scala/latest/index.html"
[R=permanent]
RewriteRule "^manual/usage\.html$" "manual/api.html" [R=permanent]
-RewriteRule "^release-notes/index\.html$" "release-notes.html" [R=permanent]
RewriteRule "^runtime-dependencies\.html$" "manual/installation.html"
[R=permanent]
-RewriteRule "^thanks\.html$" "/support.html#sponsors" [R=permanent]
+RewriteRule "^thanks\.html$" "/support.html#sponsors" [R=permanent,NE]
# These redirects are special, since:
#
@@ -79,3 +78,4 @@ RewriteRule "^log4j-spring-cloud-config\.html/index\.html$"
"log4j-spring-cloud-
RewriteRule "^log4j-spring-cloud-config-client\.html/index\.html$"
"log4j-spring-cloud-config-client.html" [R=permanent]
RewriteRule "^log4j-taglib\.html/index\.html$" "log4j-taglib.html"
[R=permanent]
RewriteRule "^log4j-web\.html/index\.html$" "log4j-web.html" [R=permanent]
+RewriteRule "^release-notes\.html/index\.html$" "release-notes.html"
[R=permanent]
diff --git a/src/tools/redirects.txt b/src/tools/redirects.txt
index 7276736218..e8aabeeffc 100644
--- a/src/tools/redirects.txt
+++ b/src/tools/redirects.txt
@@ -47,14 +47,14 @@
/log4j/2.x/log4j-slf4j-impl.html
/log4j/2.x/manual/installation.html#impl-core-bridge-slf4j
/log4j/2.x/log4j-slf4j2-impl/index.html
/log4j/2.x/manual/installation.html#impl-core-bridge-slf4j
/log4j/2.x/log4j-slf4j2-impl.html
/log4j/2.x/manual/installation.html#impl-core-bridge-slf4j
-/log4j/2.x/api-separation.html /log4j/2.x/manual/api.html
-/log4j/2.x/scala-api.html /log4j/scala/latest/index.html
-/log4j/2.x/usage.html /log4j/2.x/manual/api.html
+/log4j/2.x/manual/api-separation.html /log4j/2.x/manual/api.html
+/log4j/2.x/manual/scala-api.html /log4j/scala/latest/index.html
+/log4j/2.x/manual/usage.html /log4j/2.x/manual/api.html
/log4j/2.x/release-notes/index.html /log4j/2.x/release-notes.html
/log4j/2.x/runtime-dependencies.html /log4j/2.x/manual/installation.html
/log4j/2.x/log4j-spring-boot/index.html /log4j/2.x/log4j-spring-boot.html
/log4j/2.x/log4j-spring-cloud-config/index.html
/log4j/2.x/log4j-spring-cloud-config.html
/log4j/2.x/log4j-spring-cloud-config-client/index.html
/log4j/2.x/log4j-spring-cloud-config-client.html
-/log4j/2.x/thanks.html /log4j/2.x/support.html#sponsors
+/log4j/2.x/thanks.html /support.html#sponsors
/log4j/2.x/log4j-taglib/index.html /log4j/2.x/log4j-taglib.html
-/log4j/2.x/log4j-web/index.html /log4j/2.x/web.html
+/log4j/2.x/log4j-web/index.html /log4j/2.x/log4j-web.html
