From 20e9ac818cc918606808742fecdb9596de102496 Mon Sep 17 00:00:00 2001
From: Yuri Sizov <yuris@humnom.net>
Date: Wed, 20 Sep 2023 15:07:54 +0200
Subject: [PATCH] Add `/download/4.x` redirects for the current download page

This also adjusts the format for redirects to make sure
pages are always generated as `/index.html`.
This happens when the redirect link ends with a slash, no
explicit declaration needed. So I adjusted existing rules
to use that as well.
---
 _config.yml                       | 2 +-
 collections/_download/android.md  | 3 +++
 collections/_download/linux.md    | 3 +++
 collections/_download/macos.md    | 3 ++-
 collections/_download/windows.md  | 3 +++
 collections/_download_3/server.md | 2 +-
 pages/blog/blog.html              | 9 +++++----
 pages/contact.html                | 2 +-
 pages/download.html               | 3 +++
 9 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/_config.yml b/_config.yml
index dd2668ae88..249c5e0cd2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,7 +25,7 @@ collections:
     output: true
   download_3:
     output: true
-    permalink: /download/3.x/:name/index.html
+    permalink: /download/3.x/:name/
 
 # Build collection items with a future date.
 future: true
diff --git a/collections/_download/android.md b/collections/_download/android.md
index a966987841..c66a57a7e1 100644
--- a/collections/_download/android.md
+++ b/collections/_download/android.md
@@ -16,6 +16,9 @@ downloads:
 ignore_export: true
 ignore_mono: true
 
+redirect_from:
+  - /download/4.x/android/
+
 content_note: |
   <p>
     <strong>Note:</strong> C# support is not available in the Android editor.
diff --git a/collections/_download/linux.md b/collections/_download/linux.md
index 72ef746893..6f7ef597f1 100644
--- a/collections/_download/linux.md
+++ b/collections/_download/linux.md
@@ -17,6 +17,9 @@ downloads:
   - platform: "linux.32"
     mono: true
 
+redirect_from:
+  - /download/4.x/linux/
+
 content_instructions: |
   <ul>
     <li>Extract and run. Godot is self-contained and does not require installation.</li>
diff --git a/collections/_download/macos.md b/collections/_download/macos.md
index e10c839316..d5b0aa59eb 100644
--- a/collections/_download/macos.md
+++ b/collections/_download/macos.md
@@ -13,7 +13,8 @@ downloads:
     featured_flavor: .NET
 
 redirect_from:
-  - /download/osx
+  - /download/4.x/macos/
+  - /download/osx/
 
 content_instructions: |
   <ul>
diff --git a/collections/_download/windows.md b/collections/_download/windows.md
index 8500e6bd34..62011eabd6 100644
--- a/collections/_download/windows.md
+++ b/collections/_download/windows.md
@@ -19,6 +19,9 @@ downloads:
   - platform:  "windows.32"
     mono: true
 
+redirect_from:
+  - /download/4.x/windows/
+
 content_note: |
   <p>
     <strong>Note:</strong> The 32-bit .NET binaries do not run on 64-bit Windows systems at the time being. Make sure to export 64-bit .NET binaries for your 64-bit target platforms.
diff --git a/collections/_download_3/server.md b/collections/_download_3/server.md
index ac2e63d16f..2fc3ef524c 100644
--- a/collections/_download_3/server.md
+++ b/collections/_download_3/server.md
@@ -18,7 +18,7 @@ downloads:
     mono: true
 
 redirect_from:
-  - /download/server
+  - /download/server/
 
 content_instructions: |
   <ul>
diff --git a/pages/blog/blog.html b/pages/blog/blog.html
index 05d7dbf480..1c9f3c12df 100644
--- a/pages/blog/blog.html
+++ b/pages/blog/blog.html
@@ -7,8 +7,9 @@
   enabled: true
   collection: article
 redirect_from:
-  - /devblog/index.html
-  - /news/index.html
-  - /news/default/1/index.html
-  - /news/default/2/index.html
+  - /devblog/
+  - /news/
+  - /news/default/
+  - /news/default/1/
+  - /news/default/2/
 ---
diff --git a/pages/contact.html b/pages/contact.html
index 76ed947046..55a0376686 100644
--- a/pages/contact.html
+++ b/pages/contact.html
@@ -6,7 +6,7 @@
 header_text: "Contact us"
 current_tab: "contact"
 redirect_from:
-  - /more/index.html
+  - /more/
 ---
 
 <div class="container-text">
diff --git a/pages/download.html b/pages/download.html
index 9d797767dd..6e2400916d 100644
--- a/pages/download.html
+++ b/pages/download.html
@@ -3,6 +3,9 @@
 title: "Download - Godot Engine"
 description: "Download the latest stable version of the Godot Engine for Linux, macOS, Windows, or Android"
 layout: default
+
+redirect_from:
+  - /download/4.x/
 ---
 
 <div style="padding: 16px 32px">