From 497b7dd53706bb3dbc329b7b215f9309ab26778e Mon Sep 17 00:00:00 2001
From: ManshaAgarwal716 <manshagr716@gmail.com>
Date: Tue, 23 Sep 2025 21:26:34 +0530
Subject: [PATCH 01/17] Add Jacob Walls and update Former Fellows heading

---
 djangoproject/templates/fundraising/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djangoproject/templates/fundraising/index.html b/djangoproject/templates/fundraising/index.html
index 3d8196b31..c470f1553 100644
--- a/djangoproject/templates/fundraising/index.html
+++ b/djangoproject/templates/fundraising/index.html
@@ -302,7 +302,7 @@ <h2 id="who-are-the-django-fellows">{% translate "Who are the Django Fellows?" %
         {% endblocktranslate %}
       </p>
 
-      <p>{% translate "Former Django Fellows:" %}</p>
+      <h3>{% translate "Former Django Fellows:" %}</h3>
 
       <p>
         {% blocktranslate trimmed %}

From c09dfffcc9ea441641600a0ee2e4bd1c2827acd0 Mon Sep 17 00:00:00 2001
From: ManshaAgarwal716 <manshagr716@gmail.com>
Date: Tue, 23 Sep 2025 21:59:34 +0530
Subject: [PATCH 02/17] Fix blog archive heading to show 'Month Year archive

---
 djangoproject/templates/blog/entry_archive_month.html | 2 +-
 djangoproject/templates/fundraising/index.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/djangoproject/templates/blog/entry_archive_month.html b/djangoproject/templates/blog/entry_archive_month.html
index 939d2e704..3e4ff1bbb 100644
--- a/djangoproject/templates/blog/entry_archive_month.html
+++ b/djangoproject/templates/blog/entry_archive_month.html
@@ -7,7 +7,7 @@
 
 {% block content %}
 
-  <h1>{% blocktranslate %}{{ month|date:"YEAR_MONTH_FORMAT" }} archive{% endblocktranslate %}</h1>
+  <h1>{{ month|date:"F Y" }} {% translate "archive" %}</h1>
 
   <ul class="list-news">
 
diff --git a/djangoproject/templates/fundraising/index.html b/djangoproject/templates/fundraising/index.html
index c470f1553..3d8196b31 100644
--- a/djangoproject/templates/fundraising/index.html
+++ b/djangoproject/templates/fundraising/index.html
@@ -302,7 +302,7 @@ <h2 id="who-are-the-django-fellows">{% translate "Who are the Django Fellows?" %
         {% endblocktranslate %}
       </p>
 
-      <h3>{% translate "Former Django Fellows:" %}</h3>
+      <p>{% translate "Former Django Fellows:" %}</p>
 
       <p>
         {% blocktranslate trimmed %}

From 62f0bea836022a38165ee0c984c1ad506606b70e Mon Sep 17 00:00:00 2001
From: Tobias McNulty <tobias@caktusgroup.com>
Date: Tue, 23 Sep 2025 21:25:59 -0400
Subject: [PATCH 03/17] Revert "Added cache for GitHub Actions Docker builds
 (#2214)"

This reverts commit a2a11c98383828be8f587213ff3c62a2c66d5a3f.
---
 .github/workflows/docker-publish.yml    |  5 -----
 .github/workflows/docker-test-build.yml | 17 -----------------
 2 files changed, 22 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1d3a491cd..7ff7903c3 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,9 +19,6 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3
-
             - name: Log in to the Container registry
               uses: docker/login-action@v3
               with:
@@ -47,5 +44,3 @@ jobs:
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
-                  cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-buildcache:bc-publish-${{ github.ref_name }}
-                  cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-buildcache:bc-publish-${{ github.ref_name }},mode=max
diff --git a/.github/workflows/docker-test-build.yml b/.github/workflows/docker-test-build.yml
index 1f792ccc9..57f9634b0 100644
--- a/.github/workflows/docker-test-build.yml
+++ b/.github/workflows/docker-test-build.yml
@@ -3,17 +3,12 @@ name: Docker test build
 on:
     pull_request:
 
-env:
-    REGISTRY: ghcr.io
-    IMAGE_NAME: ${{ github.repository }}
-
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
     cancel-in-progress: true
 
 permissions:
     contents: read
-    packages: write
 
 jobs:
     build-image:
@@ -30,16 +25,6 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3
-
-            - name: Log in to the Container registry
-              uses: docker/login-action@v3
-              with:
-                  registry: ${{ env.REGISTRY }}
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
             - name: Test docker image build (local development)
               uses: docker/build-push-action@v6
               with:
@@ -47,5 +32,3 @@ jobs:
                   push: false
                   build-args: |
                       REQ_FILE=requirements/${{ matrix.req_file }}
-                  cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-buildcache:bc-test-build-${{ matrix.req_file }}
-                  cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-buildcache:bc-test-build-${{ matrix.req_file }},mode=max

From a19e0898b9ff4167422a19b7e6fd2c9a7de195f9 Mon Sep 17 00:00:00 2001
From: Tobias McNulty <tobias@caktusgroup.com>
Date: Wed, 24 Sep 2025 12:08:22 -0400
Subject: [PATCH 04/17] Added `LOCALE_PATHS` setting (#2213)

---
 .github/workflows/tests.yml      |  2 ++
 Makefile                         |  5 ++++-
 djangoproject/settings/common.py |  5 +++++
 djangoproject/tests.py           | 38 ++++++++++++++++++++++++++++++++
 update-translations.sh           |  1 +
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0b7c22ecf..0ceef41d8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,6 +33,8 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: ${{ env.PYTHON_VERSION }}
+            - name: Install gettext
+              run: sudo apt-get update && sudo apt-get install -y gettext
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip setuptools
diff --git a/Makefile b/Makefile
index 2bf7ed706..78f59e899 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,12 @@ APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs founda
 SCSS = djangoproject/scss
 STATIC = djangoproject/static
 
-ci: test
+ci: compilemessages test
 	@python -m coverage report
 
+compilemessages:
+	python -m manage compilemessages
+
 collectstatics: compile-scss
 	python -m manage collectstatic --noinput
 
diff --git a/djangoproject/settings/common.py b/djangoproject/settings/common.py
index f36e44411..fff6e1dfe 100644
--- a/djangoproject/settings/common.py
+++ b/djangoproject/settings/common.py
@@ -217,8 +217,13 @@
 
 TIME_ZONE = "America/Chicago"
 
+# Internationalization settings
+
 USE_I18N = True
 
+# Django discovers locale directories in the installed apps on its own,
+# but the main project locale directory needs to be listed explicitly.
+LOCALE_PATHS = (BASE_DIR / "locale",)
 
 USE_TZ = False
 
diff --git a/djangoproject/tests.py b/djangoproject/tests.py
index a95f0b939..759f0a329 100644
--- a/djangoproject/tests.py
+++ b/djangoproject/tests.py
@@ -4,11 +4,49 @@
 from django.core.management import call_command
 from django.test import TestCase
 from django.urls import NoReverseMatch, get_resolver
+from django.utils.translation import activate, gettext as _
 from django_hosts.resolvers import reverse
 
 from docs.models import DocumentRelease, Release
 
 
+class LocaleSmokeTests(TestCase):
+    """
+    Smoke test a translated string from each of the 3 locale directories
+    (one defined in settings.LOCALE_PATHS, plus the dashboard and docs apps).
+    """
+
+    def test_dashboard_locale(self):
+        """dashboard/locale/ should contain translations for 'Development dashboard'"""
+        activate("fr")
+        translated = _("Development dashboard")
+        self.assertEqual(
+            translated,
+            "Tableau de bord de développement",
+            msg="dashboard/locale/ translation not loaded or incorrect",
+        )
+
+    def test_docs_locale(self):
+        """docs/locale/ should contain translations for 'Using Django'"""
+        activate("fr")
+        translated = _("Using Django")
+        self.assertEqual(
+            translated,
+            "Utilisation de Django",
+            msg="docs/locale/ translation not loaded or incorrect",
+        )
+
+    def test_project_locale(self):
+        """locale/ should contain translations for 'Fundraising'"""
+        activate("fr")
+        translated = _("Fundraising")
+        self.assertEqual(
+            translated,
+            "Levée de fonds",
+            msg="project-level locale/ translation not loaded or incorrect",
+        )
+
+
 class TemplateViewTests(TestCase):
     """
     Tests for views that are instances of TemplateView.
diff --git a/update-translations.sh b/update-translations.sh
index 6d0fda432..30a888ef4 100755
--- a/update-translations.sh
+++ b/update-translations.sh
@@ -6,6 +6,7 @@
 
 set -ex
 
+# Any non-app directories added here must also be added to settings.LOCALE_PATHS
 LOCALE_DIRS="dashboard/locale/ docs/locale/ locale/"
 
 tx pull -a -f --minimum-perc=70

From 7bd2bab4a8e04925f4b7fa199684a7ef8410af90 Mon Sep 17 00:00:00 2001
From: Adam Zapletal <adamzap@gmail.com>
Date: Sat, 13 Sep 2025 21:01:38 -0500
Subject: [PATCH 05/17] Add top `CorporateMember`s to `docs` sidebar

This was requested by the fundraising working group.

I abstracted the top `CorporateMember` display from the `releases` app
sidebar into a new inclusion tag called `top_corporate_members` and
included it in its original place as well as in the `docs` sidebar as
requested.

Uploaded images for `CorporateMember`s may not display in local
development environments do to the way media files paths work with
subdomains.
---
 .../includes/top_corporate_members.html       | 22 ++++++
 .../templates/releases/download.html          | 23 +-----
 docs/templates/docs/doc.html                  |  2 +
 .../templatetags/fundraising_extras.py        |  7 ++
 fundraising/tests/test_templatetags.py        | 76 ++++++++++++++++++-
 releases/views.py                             |  7 --
 6 files changed, 107 insertions(+), 30 deletions(-)
 create mode 100644 djangoproject/templates/fundraising/includes/top_corporate_members.html

diff --git a/djangoproject/templates/fundraising/includes/top_corporate_members.html b/djangoproject/templates/fundraising/includes/top_corporate_members.html
new file mode 100644
index 000000000..5fb4aeb4c
--- /dev/null
+++ b/djangoproject/templates/fundraising/includes/top_corporate_members.html
@@ -0,0 +1,22 @@
+{% if members %}
+  <div class="corporate-members">
+    <h3>Diamond and Platinum Members</h3>
+    {% for obj in members %}
+      <div class="clearfix">
+        <div class="member-logo">
+          <a href="{{ obj.url }}" title="{{ obj.display_name }}">
+            <img src="{{ obj.thumbnail.url }}" alt="{{ obj.display_name }}" />
+          </a>
+        </div>
+        <div class="small-cta">
+          <ul class="list-links-small">
+            <li><strong>{{ obj.display_name }}</strong></li>
+            <li><a href="{{ obj.url }}" title="{{ obj.display_name }}">
+              {{ obj.description }}
+            </a></li>
+          </ul>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+{% endif %}
diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html
index c46b67239..bb8b9e472 100644
--- a/djangoproject/templates/releases/download.html
+++ b/djangoproject/templates/releases/download.html
@@ -273,28 +273,7 @@ <h2 id="unsupported-versions">Unsupported previous releases</h2>
   <div role="complementary">
     <h2 class="visuallyhidden" id="aside-header">Additional Information</h2>
 
-    {% if corporate_members %}
-      <div class="corporate-members">
-        <h3>Diamond and Platinum Members</h3>
-        {% for obj in corporate_members %}
-          <div class="clearfix">
-            <div class="member-logo">
-              <a href="{{ obj.url }}" title="{{ obj.display_name }}">
-                <img src="{{ obj.thumbnail.url }}" alt="{{ obj.display_name }}" />
-              </a>
-            </div>
-            <div class="small-cta">
-              <ul class="list-links-small">
-                <li><strong>{{ obj.display_name }}</strong></li>
-                <li><a href="{{ obj.url }}" title="{{ obj.display_name }}">
-                  {{ obj.description }}
-                </a></li>
-              </ul>
-            </div>
-          </div>
-        {% endfor %}
-      </div>
-    {% endif %}
+    {% top_corporate_members %}
 
     {% donation_snippet %}
 
diff --git a/docs/templates/docs/doc.html b/docs/templates/docs/doc.html
index 44ec5a707..2373d2114 100644
--- a/docs/templates/docs/doc.html
+++ b/docs/templates/docs/doc.html
@@ -222,5 +222,7 @@ <h3 id="links-wrapper-header">{% trans "Download:" %}</h3>
         </p>
       </section>
     {% endblock links-wrapper %}
+
+    {% top_corporate_members %}
   </div>
 {% endblock content-related %}
diff --git a/fundraising/templatetags/fundraising_extras.py b/fundraising/templatetags/fundraising_extras.py
index 55b3ecf23..2d78ef9ea 100644
--- a/fundraising/templatetags/fundraising_extras.py
+++ b/fundraising/templatetags/fundraising_extras.py
@@ -111,3 +111,10 @@ def display_django_heroes():
         "display_logo_amount": int(LEADERSHIP_LEVEL_AMOUNT),
         "corporate_membership_amounts": CORPORATE_MEMBERSHIP_AMOUNTS,
     }
+
+
+@register.inclusion_tag("fundraising/includes/top_corporate_members.html")
+def top_corporate_members():
+    members = CorporateMember.objects.by_membership_level()
+
+    return {"members": members["diamond"] + members["platinum"]}
diff --git a/fundraising/tests/test_templatetags.py b/fundraising/tests/test_templatetags.py
index 0cf460249..421187797 100644
--- a/fundraising/tests/test_templatetags.py
+++ b/fundraising/tests/test_templatetags.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 from decimal import Decimal
 
 from django.test import TestCase
@@ -17,6 +17,7 @@
 from ..templatetags.fundraising_extras import (
     display_django_heroes,
     donation_form_with_heart,
+    top_corporate_members,
 )
 
 
@@ -93,3 +94,76 @@ def create_hero_with_payment_date(days):
 
         response = display_django_heroes()
         self.assertEqual(response["heroes"], [hero2, hero3])
+
+
+class TestTopCorporateMembers(TestCase):
+    past_date = date(2000, 1, 1)
+    future_date = date(3000, 1, 1)
+
+    @classmethod
+    def setUpTestData(cls):
+        member_1 = CorporateMember.objects.create(membership_level=1)
+        member_2 = CorporateMember.objects.create(membership_level=2)
+        member_3 = CorporateMember.objects.create(membership_level=3)
+        member_4 = CorporateMember.objects.create(membership_level=4)
+        member_5 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_2.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_3.invoice_set.create(amount=5, expiration_date=cls.future_date)
+        member_4.invoice_set.create(amount=5, expiration_date=cls.past_date)
+        member_5.invoice_set.create(amount=5, expiration_date=cls.past_date)
+
+    def test_with_no_platinum_or_diamond_members(self):
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [])
+
+    def test_with_diamond_members_and_no_platinum_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=5)
+        member_2 = CorporateMember.objects.create(membership_level=5)
+        member_3 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [member_2, member_1, member_3])
+
+    def test_with_platinum_members_and_no_diamond_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=4)
+        member_2 = CorporateMember.objects.create(membership_level=4)
+        member_3 = CorporateMember.objects.create(membership_level=4)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        self.assertEqual(members, [member_2, member_1, member_3])
+
+    def test_with_diamond_members_and_platinum_members(self):
+        member_1 = CorporateMember.objects.create(membership_level=4)
+        member_2 = CorporateMember.objects.create(membership_level=4)
+        member_3 = CorporateMember.objects.create(membership_level=4)
+
+        member_4 = CorporateMember.objects.create(membership_level=5)
+        member_5 = CorporateMember.objects.create(membership_level=5)
+        member_6 = CorporateMember.objects.create(membership_level=5)
+
+        member_1.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_2.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_3.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        member_4.invoice_set.create(amount=4, expiration_date=self.future_date)
+        member_5.invoice_set.create(amount=8, expiration_date=self.future_date)
+        member_6.invoice_set.create(amount=2, expiration_date=self.future_date)
+
+        members = top_corporate_members()["members"]
+
+        expected = [member_5, member_4, member_6, member_2, member_1, member_3]
+
+        self.assertEqual(members, expected)
diff --git a/releases/views.py b/releases/views.py
index 73dcad684..291e49e6c 100644
--- a/releases/views.py
+++ b/releases/views.py
@@ -1,8 +1,6 @@
 from django.http import Http404, HttpResponsePermanentRedirect
 from django.shortcuts import get_object_or_404, render
 
-from members.models import CorporateMember
-
 from .models import Release
 
 
@@ -23,17 +21,12 @@ def index(request):
     # Get the list of earlier releases.
     unsupported = Release.objects.unsupported()
 
-    corporate_members = CorporateMember.objects.by_membership_level()
-
     context = {
         "current": current,
         "previous": previous,
         "lts": lts,
         "unsupported": unsupported,
         "preview": preview,
-        "corporate_members": (
-            corporate_members["diamond"] + corporate_members["platinum"]
-        ),
     }
     return render(request, "releases/download.html", context)
 

From 77a3818f2df452803f3a08eaa5d2ff635b46fdc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Haasser?= <agnes@hashbang.coop>
Date: Fri, 2 May 2025 16:49:17 +0200
Subject: [PATCH 06/17] Extract the arrow into CSS generated decorative content

---
 djangoproject/scss/_style.scss                  | 12 ++++++++++++
 djangoproject/templates/contact/foundation.html |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 7297a5624..b504c850b 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -1345,6 +1345,18 @@ label[for] {
   margin: 10px 0;
 }
 
+.cta.arrow {
+  height: auto;
+  &::after {
+    content: " →" / "";
+  }
+  &:dir(rtl) {
+    &::after {
+      content: " ←" / "";
+    }
+  }
+}
+
 .callout-right {
     @include respond-min(768px) {
         float: right;
diff --git a/djangoproject/templates/contact/foundation.html b/djangoproject/templates/contact/foundation.html
index 2dc3e5dde..ea5374122 100644
--- a/djangoproject/templates/contact/foundation.html
+++ b/djangoproject/templates/contact/foundation.html
@@ -29,7 +29,7 @@ <h1>{% translate "Contact the Django Software Foundation" %}</h1>
       <a href="https://forum.djangoproject.com">Django Forum</a>.
     {% endblocktranslate %}
   </p>
-  <form action="." method="post" accept-charset="utf-8" class="form-input">
+  <form action="." method="post" accept-charset="utf-8">
     {% csrf_token %}
     <div>
       {{ form.name.as_field_group }}
@@ -44,6 +44,8 @@ <h1>{% translate "Contact the Django Software Foundation" %}</h1>
       {{ form.body.as_field_group }}
     </div>
     {{ form.captcha }}
-    <p class="submit"><input type="submit" class="cta" value="{% translate "Send &rarr;" %}"></p>
+    <div class="submit">
+      <button type="submit" class="cta arrow">{% translate "Send" %}</button>
+    </div>
   </form>
 {% endblock %}

From 539f6184f9a84720cdf8ae90f2729ac20b578bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Haasser?= <agnes@hashbang.coop>
Date: Thu, 8 May 2025 10:45:25 +0200
Subject: [PATCH 07/17] Remove unused templates

---
 djangoproject/templates/contact/coc.html      |  9 --------
 djangoproject/templates/contact/coc_form.html | 23 -------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 djangoproject/templates/contact/coc.html
 delete mode 100644 djangoproject/templates/contact/coc_form.html

diff --git a/djangoproject/templates/contact/coc.html b/djangoproject/templates/contact/coc.html
deleted file mode 100644
index db307a7f8..000000000
--- a/djangoproject/templates/contact/coc.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base_3col.html" %}
-{% load i18n %}
-
-{% block title %}{% translate "Django Code of Conduct Feedback" %}{% endblock %}
-
-{% block content %}
-    <h1>{% translate "Django Code of Conduct Feedback" %}</h1>
-    {% include "contact/coc_form.html" %}
-{% endblock %}
diff --git a/djangoproject/templates/contact/coc_form.html b/djangoproject/templates/contact/coc_form.html
deleted file mode 100644
index 05d1aa4c1..000000000
--- a/djangoproject/templates/contact/coc_form.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-<form action="{% url "contact_coc" %}" method="post" accept-charset="utf-8" class="wide">
-  {% csrf_token %}
-
-{# hardcoding inputs because they'll be included on the CoC page itself #}
-  <p>
-    <label for="id_name">{% translate "Your name (optional):" %}</label>
-    {% if form.name.errors %}<p class="errors">{{ form.name.errors.as_text }}</p>{% endif %}
-    <input id="id_name" class="required" type="text" name="name">
-  </p>
-  <p>
-    <label for="id_email">{% translate "Your email address (optional):" %}</label>
-    {% if form.email.errors %}<p class="errors">{{ form.email.errors.as_text }}</p>{% endif %}
-    <input id="id_email" class="required" type="text" name="email">
-  </p>
-  <p>
-    <label for="id_body">{% translate "Your message:" %}</label>
-    {% if form.body.errors %}<p class="errors">{{ form.body.errors.as_text }}</p>{% endif %}
-    <textarea id="id_body" class="required" rows="10" name="body" cols="40"></textarea>
-  </p>
-  <p class="submit"><input type="submit" value="{% translate "Send &rarr;" %}"></p>
-
-</form>

From e4ee2b05fe7c52bc47a28a7d293823699e93f82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Haasser?= <agnes@hashbang.coop>
Date: Thu, 8 May 2025 22:46:10 +0200
Subject: [PATCH 08/17] Extract decorative arrows into CSS on fundraising form

---
 .../templates/fundraising/manage-donations.html    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html
index 340bc6550..810017e34 100644
--- a/djangoproject/templates/fundraising/manage-donations.html
+++ b/djangoproject/templates/fundraising/manage-donations.html
@@ -23,16 +23,16 @@ <h1>{% translate "Manage your donations to the Django Software Foundation" %}</h
     {% endblocktranslate %}
   </p>
 
-  <form enctype="multipart/form-data" action="" method="post" class="form-input django-hero-form"
+  <form enctype="multipart/form-data" action="" method="post" class="django-hero-form"
         data-stripe-key="{{ stripe_publishable_key }}" data-stripe-icon="{% static 'img/dj-stripe-icon.jpg' %}"
         data-update-card-url="{% url 'fundraising:update-card' %}">
     <h2>{% translate "Manage your participation in the fundraising campaigns" %}</h2>
     <p>{% translate "Information entered below will be visible on all of your donations to the Django Project." %}</p>
     {% csrf_token %}
     {% include 'fundraising/includes/_form.html' with form=hero_form %}
-    <p class="submit">
-      <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
-    </p>
+    <div class="submit">
+      <button type="submit" class="cta arrow">{% translate "Save" context "Save personal details about donation" %}</button>
+    </div>
   {# Always include to avoid "Management form has been tampered with" if no recurring donations exist #}
     {{ modify_donations_formset.management_form }}
     {% if recurring_donations %}
@@ -47,9 +47,9 @@ <h2>{% translate "Modify your recurring donations" %}</h2>
           <span class="change-card-result"></span>
         </div>
       {% endfor %}
-      <p class="submit">
-        <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
-      </p>
+      <div class="submit">
+        <button type="submit" class="cta arrow">{% translate "Save" context "Save personal details about donation" %}</button>
+      </div>
       </form>
       <hr />
       <h2>{% translate "Cancel your recurring donations" %}</h2>

From c162a77ecc19a7d113302f7e250ceff1c3aa0852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Haasser?= <agnes@hashbang.coop>
Date: Thu, 8 May 2025 22:47:31 +0200
Subject: [PATCH 09/17] Hide decorative <hr> from screen readers

---
 djangoproject/templates/fundraising/manage-donations.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html
index 810017e34..8812087b8 100644
--- a/djangoproject/templates/fundraising/manage-donations.html
+++ b/djangoproject/templates/fundraising/manage-donations.html
@@ -7,7 +7,7 @@
     {% for message in messages %}
       <p>{{ message }}</p>
     {% endfor %}
-    <hr>
+    <hr aria-hidden="true" />
   {% endif %}
 
 {% endblock %}
@@ -36,7 +36,7 @@ <h2>{% translate "Manage your participation in the fundraising campaigns" %}</h2
   {# Always include to avoid "Management form has been tampered with" if no recurring donations exist #}
     {{ modify_donations_formset.management_form }}
     {% if recurring_donations %}
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Modify your recurring donations" %}</h2>
       <p>{% translate "Update the time interval or amount of your recurring donation here:" %}</p>
       {% for form in modify_donations_formset %}
@@ -51,7 +51,7 @@ <h2>{% translate "Modify your recurring donations" %}</h2>
         <button type="submit" class="cta arrow">{% translate "Save" context "Save personal details about donation" %}</button>
       </div>
       </form>
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Cancel your recurring donations" %}</h2>
       <p>{% translate "You can cancel your recurring donation to the Django Software Foundation anytime." %}</p>
       <ul>
@@ -72,7 +72,7 @@ <h2>{% translate "Cancel your recurring donations" %}</h2>
       </form>
     {% endif %}
     {% if past_payments %}
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Your past donations" %}</h2>
       <ul>
         {% for payment in past_payments %}

From 0c83d30421b9841ebfae9db96fdcf8aa4cac57de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= <ulgensrkvk@gmail.com>
Date: Sun, 21 Sep 2025 17:03:01 +0300
Subject: [PATCH 10/17] Pin Django to patch version

Helps with reproducible builds
---
 requirements/common.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/common.txt b/requirements/common.txt
index 76766530f..17cb9c338 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -7,7 +7,7 @@ django-push @ git+https://github.com/brutasse/django-push.git@22fda99641cfbd2f30
 django-read-only==1.21.0
 django-recaptcha==4.1.0
 django-registration-redux==2.13
-Django==5.2
+Django==5.2.6
 docutils==0.21.2
 feedparser==6.0.12
 Jinja2==3.1.6

From 3ccf8ed8c55aada6511ac234917ca993124153f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 11:45:46 +0000
Subject: [PATCH 11/17] Bump sentry-sdk from 2.38.0 to 2.39.0 in /requirements

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 2.38.0 to 2.39.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/2.38.0...2.39.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-version: 2.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements/prod.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/prod.txt b/requirements/prod.txt
index f37aa471d..a6981bbf5 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -1,4 +1,4 @@
 -r common.txt
 gunicorn==23.0.0
 redis==6.4.0
-sentry-sdk==2.38.0
+sentry-sdk==2.39.0

From 0f855933888844baff6245db698655c4f97c02ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= <ulgensrkvk@gmail.com>
Date: Sat, 20 Sep 2025 13:58:51 +0300
Subject: [PATCH 12/17] Use the binary version of psycopg

---
 Dockerfile              | 16 ++++------------
 docker-compose.yml      |  1 +
 requirements/common.txt |  1 -
 requirements/dev.txt    |  1 +
 requirements/prod.txt   |  1 +
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e91f1bf63..5ee5efd9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
 # install deb packages
+# PostgreSQL dependencies are needed for dbshell and backup process
 RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         gettext \
@@ -23,23 +24,14 @@ RUN apt-get update \
     && apt-get distclean
 
 ARG REQ_FILE=requirements/prod.txt
+ARG BUILD_DEPENDENCIES="g++ gcc libc6-dev libpq-dev zlib1g-dev"
 
 # install python dependencies
 COPY ./requirements ./requirements
 RUN apt-get update \
-    && apt-get install --assume-yes --no-install-recommends \
-        g++ \
-        gcc \
-        libc6-dev \
-        libpq-dev \
-        zlib1g-dev \
+    && apt-get install --assume-yes --no-install-recommends ${BUILD_DEPENDENCIES} \
     && python3 -m pip install --no-cache-dir -r ${REQ_FILE} \
-    && apt-get purge --assume-yes --auto-remove \
-        g++ \
-        gcc \
-        libc6-dev \
-        libpq-dev \
-        zlib1g-dev \
+    && apt-get purge --assume-yes --auto-remove ${BUILD_DEPENDENCIES} \
     && apt-get distclean
 
 # copy project
diff --git a/docker-compose.yml b/docker-compose.yml
index 48fce609b..3cdd08525 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
             dockerfile: Dockerfile
             args:
                 - REQ_FILE=requirements/tests.txt
+                - BUILD_DEPENDENCIES=g++ gcc
         entrypoint: ./docker-entrypoint.dev.sh
         command: python manage.py runserver 0.0.0.0:8000
         volumes:
diff --git a/requirements/common.txt b/requirements/common.txt
index 17cb9c338..1904cfa7c 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -14,7 +14,6 @@ Jinja2==3.1.6
 libsass==0.23.0
 Markdown==3.9
 Pillow==11.3.0
-psycopg[c]==3.2.9
 Pygments==2.19.2
 pykismet3==0.1.1
 requests==2.32.5
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 87e4472fd..082591eff 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,4 +1,5 @@
 -r common.txt
 django-debug-toolbar==6.0.0
 pre-commit~=4.3.0
+psycopg[binary]==3.2.10
 watchdog==6.0.0
diff --git a/requirements/prod.txt b/requirements/prod.txt
index a6981bbf5..d54091965 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -1,4 +1,5 @@
 -r common.txt
 gunicorn==23.0.0
+psycopg[c]==3.2.10
 redis==6.4.0
 sentry-sdk==2.39.0

From 857db35ec1fe46a546c944d75b3026714178ee1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= <ulgensrkvk@gmail.com>
Date: Wed, 24 Sep 2025 14:36:30 +0300
Subject: [PATCH 13/17] Update pre-commit repos

---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0a089dec0..7a7c59a16 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,12 +33,12 @@ repos:
           - id: pyupgrade
             args: [--py312]
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.25.0"
+      rev: "1.28.0"
       hooks:
           - id: django-upgrade
             args: [--target-version, "5.2"]
     - repo: https://github.com/psf/black
-      rev: 25.1.0
+      rev: 25.9.0
       hooks:
           - id: black
             exclude: '(\/migrations\/)'
@@ -57,7 +57,7 @@ repos:
       hooks:
           - id: flake8
     - repo: https://github.com/rtts/djhtml
-      rev: "3.0.8"
+      rev: "3.0.9"
       hooks:
           - id: djhtml
             files: .*/templates/.*\.html$

From da67bd65e1a23a69f7e3476c34791e38491b81e3 Mon Sep 17 00:00:00 2001
From: Adam Zapletal <adamzap@gmail.com>
Date: Fri, 19 Sep 2025 18:21:10 -0500
Subject: [PATCH 14/17] Use sans-serif font everywhere

This change was requested for simplicity and accessibility.
---
 djangoproject/scss/_style.scss          | 3 +--
 djangoproject/scss/_utils.scss          | 4 ----
 djangoproject/templates/styleguide.html | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index b504c850b..3a6eb69d0 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -13,7 +13,7 @@ CSS rendered with Libsass 0.7.0
 
 //------------------- Globals
 body {
-    @include serif;
+    @include sans-serif;
     @include font-size(18);
     background: var(--sidebar-bg);
     color: var(--body-fg);
@@ -636,7 +636,6 @@ header {
     }
 
     p {
-        @include serif;
         @include font-size(18);
         color: var(--white-color);
         left: -9999px;
diff --git a/djangoproject/scss/_utils.scss b/djangoproject/scss/_utils.scss
index 2896cbf24..8277cdfa9 100644
--- a/djangoproject/scss/_utils.scss
+++ b/djangoproject/scss/_utils.scss
@@ -114,10 +114,6 @@ $logo-bg-dark: #272c27;
 }
 
 // Font Family Mixins
-@mixin serif {
-    font-family: Palatino, "Palatino Linotype", "Book Antiqua", "Hoefler Text", Georgia, "Lucida Bright", Cambria, Times, "Times New Roman", serif;
-}
-
 @mixin sans-serif {
     font-family: "Roboto", Corbel, Avenir, "Lucida Grande", "Lucida Sans", sans-serif;
 }
diff --git a/djangoproject/templates/styleguide.html b/djangoproject/templates/styleguide.html
index eac7540bd..7c7eb018b 100644
--- a/djangoproject/templates/styleguide.html
+++ b/djangoproject/templates/styleguide.html
@@ -104,7 +104,7 @@ <h3 id="colors-secondarycolor">Secondary colors</h3>
     <h2>Typography</h2>
 
     <p>
-      The djangoproject.com website is set in both serif and sans-serif fonts. The serif font is <em>Palatino</em>, which is widely available as a system font. The sans-serif font is <em><a href="https://fonts.google.com/specimen/Roboto">Roboto</a></em>, a web font that is loaded via Google Fonts. 5 styles of this typeface are loaded, <em>Light (300)</em>, <em>Normal (400)</em>, <em>Normal Italic</em>, <em>Bold (700)</em> and <em>Bold Italic</em>. Refrain from using weights and italics that are not loaded.
+      The djangoproject.com website is set in <em><a href="https://fonts.google.com/specimen/Roboto">Roboto</a></em>, a sans-serif font. 5 styles of this typeface are provided, <em>Light (300)</em>, <em>Normal (400)</em>, <em>Normal Italic</em>, <em>Bold (700)</em> and <em>Bold Italic</em>. Refrain from using weights and italics that are not loaded.
     </p>
 
     <p>

From 103c2635d8794eb6a0b8e5cab3a1fd42b41d03f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= <ulgensrkvk@gmail.com>
Date: Thu, 2 Oct 2025 16:11:59 +0300
Subject: [PATCH 15/17] Update Django version to 5.2.7

https://docs.djangoproject.com/en/5.2/releases/5.2.7/
---
 requirements/common.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/common.txt b/requirements/common.txt
index 1904cfa7c..7488cd775 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -7,7 +7,7 @@ django-push @ git+https://github.com/brutasse/django-push.git@22fda99641cfbd2f30
 django-read-only==1.21.0
 django-recaptcha==4.1.0
 django-registration-redux==2.13
-Django==5.2.6
+Django==5.2.7
 docutils==0.21.2
 feedparser==6.0.12
 Jinja2==3.1.6

From 366a7ebeaa09216a211418b4884f2cc4fc738d98 Mon Sep 17 00:00:00 2001
From: Alice Wong <146962159+alarthast@users.noreply.github.com>
Date: Thu, 2 Oct 2025 16:01:29 +0100
Subject: [PATCH 16/17] Added `Cache-Control` header to never cache draft blog
 posts (#2223)

Fixes #2158.

Added `Cache-Control` header to never cache draft blog posts (since we
want changes to be reflected immediately).

Django's cache middleware will not cache responses when the
Cache-Control header is set to no-cache, no-store, or private, which is
our case here for draft blog posts.

Co-authored-by: Tobias McNulty <tobias@caktusgroup.com>
---
 blog/tests.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
 blog/views.py |  7 +++++
 2 files changed, 80 insertions(+)

diff --git a/blog/tests.py b/blog/tests.py
index cb484c6ee..b5c1b1802 100644
--- a/blog/tests.py
+++ b/blog/tests.py
@@ -3,10 +3,12 @@
 from io import StringIO
 
 import time_machine
+from django.conf import settings
 from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.base import ContentFile
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.urls import reverse
 from django.utils import timezone, translation
 
@@ -407,6 +409,77 @@ def test_user_cannot_see_unpublished_entries(self):
         self.assertEqual(response.status_code, 200)
 
 
+@override_settings(
+    # Caching middleware is added in the production settings file;
+    # simulate that here for the tests.
+    MIDDLEWARE=(
+        ["django.middleware.cache.UpdateCacheMiddleware"]
+        + settings.MIDDLEWARE
+        + ["django.middleware.cache.FetchFromCacheMiddleware"]
+    ),
+)
+class ViewsCachingTestCase(DateTimeMixin, TestCase):
+    def test_drafts_have_no_cache_headers(self):
+        """
+        Draft (unpublished) entries have no-cache headers.
+        """
+        user = User.objects.create(username="staff", is_staff=True)
+        content_type = ContentType.objects.get_for_model(Entry)
+        change_permission = Permission.objects.get(
+            content_type=content_type, codename="change_entry"
+        )
+        user.user_permissions.add(change_permission)
+        self.client.force_login(user)
+
+        unpublished_entry = Entry.objects.create(
+            pub_date=self.tomorrow,
+            is_active=True,
+            headline="unpublished",
+            slug="unpublished",
+        )
+        unpublished_url = reverse(
+            "weblog:entry",
+            kwargs={
+                "year": unpublished_entry.pub_date.year,
+                "month": unpublished_entry.pub_date.strftime("%b").lower(),
+                "day": unpublished_entry.pub_date.day,
+                "slug": unpublished_entry.slug,
+            },
+        )
+
+        response = self.client.get(unpublished_url)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("Cache-Control", response.headers)
+        self.assertEqual(
+            response.headers["Cache-Control"],
+            "max-age=0, no-cache, no-store, must-revalidate, private",
+        )
+
+    def test_published_blogs_have_cache_control_headers(self):
+        """
+        Published blog posts has Cache-Control header.
+        """
+        entry = Entry.objects.create(
+            pub_date=self.yesterday,
+            is_active=True,
+            headline="published",
+            slug="published",
+        )
+        url = reverse(
+            "weblog:entry",
+            kwargs={
+                "year": entry.pub_date.year,
+                "month": entry.pub_date.strftime("%b").lower(),
+                "day": entry.pub_date.day,
+                "slug": entry.slug,
+            },
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers["Cache-Control"], "max-age=300")
+
+
 class SitemapTests(DateTimeMixin, TestCase):
     def test_sitemap(self):
         entry = Entry.objects.create(
diff --git a/blog/views.py b/blog/views.py
index dc1012ac7..ac51f7c1f 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -1,3 +1,4 @@
+from django.utils.cache import add_never_cache_headers
 from django.views.generic.dates import (
     ArchiveIndexView,
     DateDetailView,
@@ -58,3 +59,9 @@ def get_queryset(self):
             return Entry.objects.all()
         else:
             return super().get_queryset()
+
+    def get(self, request, *args, **kwargs):
+        response = super().get(request, *args, **kwargs)
+        if not self.object.is_published():
+            add_never_cache_headers(response)
+        return response

From 7a888e92f5428d5c5c01251727d3bff08d416998 Mon Sep 17 00:00:00 2001
From: Natalia <124304+nessita@users.noreply.github.com>
Date: Thu, 18 Sep 2025 22:07:37 -0300
Subject: [PATCH 17/17] Automatically generate Django series roadmaps from
 Release data

This branch adds a new view that replaces the Roadmap wiki pages, e.g.:

  * https://code.djangoproject.com/wiki/Version5.2Roadmap
  * https://code.djangoproject.com/wiki/Version6.0Roadmap
  * https://code.djangoproject.com/wiki/Version6.1Roadmap

The wiki pages were almost identical except for version-specific details
and target dates. This information is now generated dynamically from the
Release model in the database.

The supported and future Roadmap tables were reorganized so they follow
a more intuitive timeline (from older to newer versions).
---
 djangoproject/scss/_style.scss                |  62 +++++----
 .../templates/releases/download.html          |  40 +++---
 djangoproject/templates/releases/roadmap.html | 120 ++++++++++++++++++
 releases/tests.py                             |  87 +++++++++++++
 releases/urls.py                              |   3 +-
 releases/views.py                             |  14 ++
 6 files changed, 281 insertions(+), 45 deletions(-)
 create mode 100644 djangoproject/templates/releases/roadmap.html

diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 3a6eb69d0..2fe7c0cfd 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -2529,14 +2529,48 @@ dl.data {
     white-space: normal;
 }
 
+table {
+    th {
+        background: var(--sidebar-bg);
+        font-weight: bold;
+        text-align: left;
+    }
+
+    td {
+        border-bottom: 1px solid var(--hairline-color);
+    }
+
+    td,
+    th {
+        padding: 0.5em 1em;
+    }
+}
+
 table.foundation td {
-    border-bottom: 1px solid var(--hairline-color);
     padding: 0 5px;
 }
 
-table.docutils td,
-table.docutils th {
-    border-bottom: 1px solid var(--hairline-color);
+table.django-supported-versions,
+table.django-unsupported-versions {
+    border: 1px solid var(--hairline-color);
+    color: var(--table-color);
+
+    th,
+    td {
+        border-bottom: none;
+        padding: 5px;
+        text-align: center;
+    }
+}
+
+table.django-supported-versions th,
+table.django-supported-versions tr {
+    background-color: var(--secondary-accent);
+}
+
+table.django-unsupported-versions th,
+table.django-unsupported-versions tr {
+    background-color: var(--error-light);
 }
 
 .list-links {
@@ -3420,26 +3454,6 @@ form .footnote {
     }
 }
 
-table.django-supported-versions,
-table.django-unsupported-versions {
-    border: 1px solid black;
-    text-align: center;
-    color: var(--table-color);
-
-    th,
-    td {
-        padding: 5px;
-    }
-}
-
-table.django-supported-versions tr {
-    background-color: var(--secondary-accent);
-}
-
-table.django-unsupported-versions tr {
-    background-color: var(--error-light);
-}
-
 /* Corporate membership list page */
 
 ul.corporate-members li {
diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html
index bb8b9e472..21d31c81a 100644
--- a/djangoproject/templates/releases/download.html
+++ b/djangoproject/templates/releases/download.html
@@ -85,10 +85,10 @@ <h2 id="supported-versions">Supported Versions</h2>
       <th>End of extended support<sup><a href="#ft2">2</a></sup></th>
     </tr>
     <tr>
-      <td>5.2 LTS</td>
-      <td>{% get_latest_micro_release '5.2' %}</td>
-      <td>December 2025</td>
-      <td>April 2028</td>
+      <td>4.2 LTS</td>
+      <td>{% get_latest_micro_release '4.2' %}</td>
+      <td>December 4, 2023</td>
+      <td>April 2026</td>
     </tr>
     <tr>
       <td>5.1</td>
@@ -97,10 +97,10 @@ <h2 id="supported-versions">Supported Versions</h2>
       <td>December 2025</td>
     </tr>
     <tr>
-      <td>4.2 LTS</td>
-      <td>{% get_latest_micro_release '4.2' %}</td>
-      <td>December 4, 2023</td>
-      <td>April 2026</td>
+      <td>5.2 LTS</td>
+      <td>{% get_latest_micro_release '5.2' %}</td>
+      <td>December 2025</td>
+      <td>April 2028</td>
     </tr>
   </table>
 
@@ -114,28 +114,28 @@ <h2 id="future-versions">Future Roadmap</h2>
       <th>End of extended support<sup><a href="#ft2">2</a></sup></th>
     </tr>
     <tr>
-      <td>7.0</td>
-      <td>December 2027</td>
-      <td>August 2028</td>
-      <td>April 2029</td>
+      <td><a href="{% url 'roadmap' '6.0' %}">6.0</a></td>
+      <td>December 2025</td>
+      <td>August 2026</td>
+      <td>April 2027</td>
     </tr>
     <tr>
-      <td>6.2 LTS</td>
+      <td><a href="{% url 'roadmap' '6.1' %}">6.1</a></td>
+      <td>August 2026</td>
       <td>April 2027</td>
       <td>December 2027</td>
-      <td>April 2030</td>
     </tr>
     <tr>
-      <td>6.1</td>
-      <td>August 2026</td>
+      <td><a href="{% url 'roadmap' '6.2' %}">6.2 LTS</a></td>
       <td>April 2027</td>
       <td>December 2027</td>
+      <td>April 2030</td>
     </tr>
     <tr>
-      <td>6.0</td>
-      <td>December 2025</td>
-      <td>August 2026</td>
-      <td>April 2027</td>
+      <td><a href="{% url 'roadmap' '7.0' %}">7.0</a></td>
+      <td>December 2027</td>
+      <td>August 2028</td>
+      <td>April 2029</td>
     </tr>
   </table>
 
diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html
new file mode 100644
index 000000000..7892c9ff8
--- /dev/null
+++ b/djangoproject/templates/releases/roadmap.html
@@ -0,0 +1,120 @@
+{% extends "base.html" %}
+{% load date_format %}
+
+{% block sectionid %}roadmap{% endblock %}
+{% block title %}Django {{ series }} Roadmap{% endblock %}
+{% block layout_class %}sidebar-right{% endblock %}
+
+{% block header %}
+  <p>Download</p>
+{% endblock %}
+
+{% block content %}
+  <h1>Django {{ series }} Roadmap</h1>
+  <p>This document details the schedule and roadmap towards Django {{ series }}.</p>
+
+  <section id="what-features-will-be-released">
+    <h2>What features will be in Django {{ series }}?</h2>
+    <p>Whatever gets committed by the alpha feature freeze!</p>
+    <p>Django {{ series }} will be a time-based release. Any features completed and committed
+      to main by the alpha feature freeze deadline noted below will be included. Any
+      that miss the deadline won't.</p>
+    <p>If you have a major feature you'd like to contribute, please introduce yourself
+      on the <a href="https://forum.djangoproject.com/c/internals/5">django-internals forum</a>
+      so you can find a shepherd for your feature.</p>
+    <p>Minor features and bug fixes will be merged as they are completed. If you
+      have submitted a patch, ensure the flags on the Trac ticket are correct so it
+      appears in the "Patches needing review" filter of the
+      <a href="https://dashboard.djangoproject.com/">Django Development Dashboard</a>.
+      Better yet, find someone to review your patch and mark the ticket as
+      "Ready for checkin". Tickets marked "Ready for checkin" are regularly reviewed
+      by mergers.</p>
+  </section>
+
+  <section id="schedule">
+    <h2>Schedule</h2>
+    <p>
+      Major milestones along the way to {{ series }} are scheduled below.
+      See <a href="#process">Process</a> for more details. Dates are subject to change.
+    </p>
+    <div class="table-wrapper">
+      <table>
+        <thead>
+          <tr>
+            <th scope="col">Date</th>
+            <th scope="col">Milestone</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>{{ releases.a.date|default:"TBD" }}</td>
+            <td>Django {{ series }} alpha; feature freeze.</td>
+          </tr>
+          <tr>
+            <td>{{ releases.b.date|default:"TBD" }}</td>
+            <td>Django {{ series }} beta; non-release blocking bug fix freeze.</td>
+          </tr>
+          <tr>
+            <td>{{ releases.c.date|default:"TBD" }}</td>
+            <td>Django {{ series }} RC 1; translation string freeze.</td>
+          </tr>
+          <tr>
+            <td>{{ releases.f.date|default:"TBD" }}</td>
+            <td>Django {{ series }} final.</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </section>
+
+  <section id="process">
+    <h2>Process</h2>
+    <p>Any features not completed by the feature freeze date won't make it into {{ series }}.</p>
+    <p>The release manager will keep the schedule updated and ensure efficient
+      routing of issues and reminders for deadlines.</p>
+
+    <section id="feature-freeze-alpha-1">
+      <h3>Feature freeze / Alpha 1</h3>
+      <p>All major and minor features must be merged by the Alpha 1 deadline. Any
+        features not done by this point will be deferred or dropped. At this time, we
+        will fork <code>stable/{{ series }}.x</code> from <code>main</code>.</p>
+      <p>After the alpha, non-release blocking bug fixes may be backported at the
+        mergers' discretion.</p>
+    </section>
+
+    <section id="beta-1">
+      <h3>Beta 1</h3>
+      <p>Beta 1 marks the end of changes that aren't release blocking bugs. Only release
+        blocking bug fixes will be allowed to be backported after the beta.</p>
+    </section>
+
+    <section id="rc-1">
+      <h3>RC 1</h3>
+      <p>If release blockers are still coming in at the planned release candidate date,
+        we'll release beta 2 to encourage further testing. RC 1 marks the freeze for
+        translation strings; translators will have two weeks to submit updates. Release
+        blocking bug fixes may continue to be backported.</p>
+    </section>
+
+    <section id="final">
+      <h3>Final</h3>
+      <p>Django {{ series }} final will ideally ship two weeks after the last RC. If no major bugs
+        are found by then, {{ series }} final will be issued; otherwise, the timeline will be
+        adjusted as needed.</p>
+    </section>
+
+    <section id="how-to-help">
+      <h3>How you can help</h3>
+      <p>Community effort is key. You can help by:</p>
+      <ul>
+        <li>Reading the <a href="http://docs.djangoproject.com/en/dev/internals/contributing/">guide to contributing</a>
+          and <a href="http://docs.djangoproject.com/en/dev/internals/release-process/">Django's release process</a>.</li>
+        <li>Working on patches and <a href="https://docs.djangoproject.com/en/dev/internals/contributing/triaging-tickets/">triaging tickets</a>.</li>
+        <li>Attending sprints.</li>
+        <li>Testing release snapshots (alphas, betas) against your code and reporting bugs.</li>
+        <li>Providing as many testers as possible to ensure a bug-free release.</li>
+      </ul>
+    </section>
+  </section>
+
+{% endblock %}
diff --git a/releases/tests.py b/releases/tests.py
index f838eb435..c48116350 100644
--- a/releases/tests.py
+++ b/releases/tests.py
@@ -4,6 +4,7 @@
 from django.contrib import admin
 from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
+from django.template.defaultfilters import date as datefilter
 from django.test import SimpleTestCase, TestCase, override_settings
 from django.urls import reverse
 from django.utils.safestring import SafeString
@@ -567,3 +568,89 @@ def test_no_diamond_and_platinum_members(self):
             self.assertNotContains(response, member.display_name)
             self.assertNotContains(response, member.url)
             self.assertNotContains(response, member.description)
+
+
+class RoadmapViewTestCase(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        # Define release schedule for 5.2, 6.0, and 6.1 series.
+        cls.release_schedule = {
+            "5.2": [
+                ("a1", datetime.date(2025, 1, 15)),
+                ("b1", datetime.date(2025, 2, 19)),
+                ("rc1", datetime.date(2025, 3, 19)),
+                ("", datetime.date(2025, 4, 2)),  # final
+            ],
+            "6.0": [
+                ("a1", datetime.date(2025, 9, 17)),
+                ("b1", datetime.date(2025, 10, 22)),
+                ("rc1", datetime.date(2025, 11, 19)),
+                ("", datetime.date(2025, 12, 3)),  # final
+            ],
+            "6.1": [
+                ("a1", datetime.date(2026, 5, 20)),
+                ("b1", datetime.date(2026, 6, 24)),
+                ("rc1", datetime.date(2026, 7, 22)),
+                ("", datetime.date(2026, 8, 5)),  # final
+            ],
+        }
+        for series, milestones in cls.release_schedule.items():
+            for milestone, date in milestones:
+                version = f"{series}{milestone}" if milestone else series
+                Release.objects.create(
+                    version=version,
+                    is_active=True,
+                    date=date,
+                    is_lts=series.endswith(".2"),
+                )
+
+    def test_roadmap_page_renders_series_title(self):
+        for series in self.release_schedule.keys():
+            url = reverse("roadmap", kwargs={"series": series})
+            response = self.client.get(url)
+            self.assertContains(response, f"Django {series} Roadmap", html=True)
+
+    def test_roadmap_page_contains_milestones(self):
+        for series, releases in self.release_schedule.items():
+            with self.subTest(series=series):
+                url = reverse("roadmap", kwargs={"series": series})
+                response = self.client.get(url)
+                for detail, date in [
+                    (f"Django {series} alpha; feature freeze.", releases[0][1]),
+                    (
+                        f"Django {series} beta; non-release blocking bug fix freeze.",
+                        releases[1][1],
+                    ),
+                    (
+                        f"Django {series} RC 1; translation string freeze.",
+                        releases[2][1],
+                    ),
+                    (f"Django {series} final.", releases[3][1]),
+                ]:
+                    expected = f"<tr><td>{datefilter(date)}</td><td>{detail}</td></tr>"
+                    self.assertContains(response, expected, html=True)
+
+    def test_series_non_digits(self):
+        for series in (0, "", "a.b", "2.2.0"):
+            with self.subTest(series=series):
+                response = self.client.get(f"/download/{series}/roadmap/")
+                self.assertEqual(response.status_code, 404)
+
+    def test_major_lower_bound(self):
+        for minor in (0, 1, 2, 3, 11):
+            with self.subTest(minor=minor):
+                response = self.client.get(f"/download/1.{minor}/roadmap/")
+                self.assertEqual(response.status_code, 404)
+
+    def test_links_to_contributing_and_release_process_present(self):
+        url = reverse("roadmap", kwargs={"series": "20.0"})
+        response = self.client.get(url)
+        self.assertContains(
+            response,
+            'href="http://docs.djangoproject.com/en/dev/internals/contributing/"',
+        )
+        self.assertContains(
+            response,
+            'href="http://docs.djangoproject.com/en/dev/internals/release-process/"',
+        )
diff --git a/releases/urls.py b/releases/urls.py
index 3e1feb598..96f26b088 100644
--- a/releases/urls.py
+++ b/releases/urls.py
@@ -1,10 +1,11 @@
 from django.urls import path, re_path
 
-from .views import index, redirect
+from .views import index, redirect, roadmap
 
 urlpatterns = [
     path("", index, name="download"),
     re_path(
         "^([0-9a-z_.-]+)/(tarball|wheel|checksum)/$", redirect, name="download-redirect"
     ),
+    re_path(r"^(?P<series>\d{1,2}\.[0-2])/roadmap/$", roadmap, name="roadmap"),
 ]
diff --git a/releases/views.py b/releases/views.py
index 291e49e6c..e894ea3f7 100644
--- a/releases/views.py
+++ b/releases/views.py
@@ -31,6 +31,20 @@ def index(request):
     return render(request, "releases/download.html", context)
 
 
+def roadmap(request, series):
+    major, minor = series.split(".")
+    major = int(major)
+    if major < 2:
+        raise Http404
+
+    releases = Release.objects.filter(major=major, minor=minor, micro=0)
+    context = {
+        "series": series,
+        "releases": {r.status: r for r in releases},
+    }
+    return render(request, "releases/roadmap.html", context)
+
+
 def redirect(request, version, kind):
     release = get_object_or_404(Release, version=version)