diff --git a/accounts/tests.py b/accounts/tests.py
index c41d893b1a..c90377e919 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -6,17 +6,19 @@
 from django_hosts.resolvers import reverse
 
 from accounts.forms import DeleteProfileForm
+from djangoproject.tests import ReleaseMixin
 from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
 
 
 @override_settings(TRAC_URL="https://code.djangoproject.com/")
-class UserProfileTests(TracDBCreateDatabaseMixin, TestCase):
+class UserProfileTests(TracDBCreateDatabaseMixin, ReleaseMixin, TestCase):
     databases = {"default", "trac"}
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         User.objects.create_user(username="user1", password="password")
         User.objects.create_user(username="user2", password="password")
         cls.user1_url = reverse("user_profile", args=["user1"])
@@ -175,7 +177,7 @@ def test_caches_trac_stats(self):
         self.assertIsNotNone(cache.get(key))
 
 
-class ViewsTests(TestCase):
+class ViewsTests(ReleaseMixin, TestCase):
 
     def test_login_redirect(self):
         credentials = {"username": "a-user", "password": "password"}
@@ -193,7 +195,7 @@ def test_profile_view_reversal(self):
             reverse("user_profile", host="www", args=[username])
 
 
-class UserDeletionTests(TestCase):
+class UserDeletionTests(ReleaseMixin, TestCase):
     def create_user_and_form(self, bound=True, **userkwargs):
         userkwargs.setdefault("username", "test")
         userkwargs.setdefault("email", "test@example.com")
diff --git a/aggregator/tests.py b/aggregator/tests.py
index 9f705be184..a8e583decf 100644
--- a/aggregator/tests.py
+++ b/aggregator/tests.py
@@ -26,7 +26,7 @@ def setUp(self, mocker):
         )
         DocumentRelease.objects.update_or_create(
             release=release,
-            lang="en",
+            lang=settings.DEFAULT_LANGUAGE_CODE,
             defaults={"is_default": True},
         )
 
@@ -92,7 +92,7 @@ def setUp(self, mocker):
     def test_community_index_number_of_queries(self):
         """Intended to prevent an n+1 issue on the community index view"""
         url = reverse("community-index")
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(7):
             self.client.get(url)
 
     def test_empty_feed_type_not_rendered(self):
@@ -119,7 +119,7 @@ def test_feed_list_number_of_queries(self):
         url = reverse(
             "community-feed-list", kwargs={"feed_type_slug": self.feed_type.slug}
         )
-        with self.assertNumQueries(7):
+        with self.assertNumQueries(8):
             self.client.get(url)
 
     def test_management_command_sends_no_email_with_no_pending_feeds(self):
diff --git a/blog/models.py b/blog/models.py
index 988c607eb4..c365185ca1 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -196,7 +196,7 @@ def invalidate_cached_entry(self):
         )
         is_secure = url.scheme == "https"
         request = rf.get(url.path, secure=is_secure)
-        request.LANGUAGE_CODE = "en"
+        request.LANGUAGE_CODE = settings.DEFAULT_LANGUAGE_CODE
         cache = caches[settings.CACHE_MIDDLEWARE_ALIAS]
         cache_key = _generate_cache_header_key(
             settings.CACHE_MIDDLEWARE_KEY_PREFIX, request
diff --git a/blog/tests.py b/blog/tests.py
index b5c1b1802b..2f68edb9ba 100644
--- a/blog/tests.py
+++ b/blog/tests.py
@@ -12,6 +12,8 @@
 from django.urls import reverse
 from django.utils import timezone, translation
 
+from djangoproject.tests import ReleaseMixin
+
 from .models import ContentFormat, Entry, Event, ImageUpload
 from .sitemaps import WeblogSitemap
 
@@ -189,7 +191,7 @@ def test_past_future_ordering(self):
         )
 
 
-class ViewsTestCase(DateTimeMixin, TestCase):
+class ViewsTestCase(ReleaseMixin, DateTimeMixin, TestCase):
     def test_staff_with_change_permission_can_see_unpublished_detail_view(self):
         """
         Staff users with change permission on BlogEntry can't see unpublished entries
@@ -418,7 +420,7 @@ def test_user_cannot_see_unpublished_entries(self):
         + ["django.middleware.cache.FetchFromCacheMiddleware"]
     ),
 )
-class ViewsCachingTestCase(DateTimeMixin, TestCase):
+class ViewsCachingTestCase(ReleaseMixin, DateTimeMixin, TestCase):
     def test_drafts_have_no_cache_headers(self):
         """
         Draft (unpublished) entries have no-cache headers.
diff --git a/contact/tests.py b/contact/tests.py
index a11ea52241..cf5f0b5028 100644
--- a/contact/tests.py
+++ b/contact/tests.py
@@ -6,6 +6,8 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from djangoproject.tests import ReleaseMixin
+
 from .views import FoundationContactForm
 
 
@@ -21,7 +23,7 @@ def check_network_connection():
 
 
 @override_settings(AKISMET_TESTING=True)
-class ContactFormTests(TestCase):
+class ContactFormTests(ReleaseMixin, TestCase):
     def setUp(self):
         self.url = "/contact/foundation/"
 
diff --git a/dashboard/tests.py b/dashboard/tests.py
index 577158959e..5049825067 100644
--- a/dashboard/tests.py
+++ b/dashboard/tests.py
@@ -9,6 +9,7 @@
 from django.test import RequestFactory, TestCase
 from django_hosts.resolvers import reverse
 
+from djangoproject.tests import ReleaseMixin
 from tracdb.models import Ticket
 from tracdb.testutils import TracDBCreateDatabaseMixin
 from tracdb.tractime import datetime_to_timestamp
@@ -24,7 +25,7 @@
 from .views import index, metric_detail, metric_json
 
 
-class ViewTests(TestCase):
+class ViewTests(ReleaseMixin, TestCase):
     fixtures = ["dashboard_test_data"]
 
     def setUp(self):
diff --git a/djangoproject/scss/_dark-mode.scss b/djangoproject/scss/_dark-mode.scss
index c7365abf35..53b26067d2 100644
--- a/djangoproject/scss/_dark-mode.scss
+++ b/djangoproject/scss/_dark-mode.scss
@@ -346,20 +346,28 @@ html[data-theme="light"] .theme-toggle .theme-label-when-light {
     background-color: var(--body-bg);
 }
 
-.mobile-toggle {
-    width: 45px;
-    height: 45px;
+// Section of the header that is only visible on mobile.
+.header-mobile-only {
     line-height: 45px;
     text-align: center;
-    margin: 4px 10px;
+    display: flex;
+    align-items: center;
 
-    @include respond-min(768px) {
+    @include respond-min(1080px) {
         display: none;
     }
+
+    .light-dark-mode-toggle {
+      height: 45px;
+      width: 45px;
+      margin: 2px;
+    }
 }
 
-header nav li:last-child {
-    @include respond-max(768px) {
+// The last 2 items of the nav list are the searchbar and the light/dark mode toggle.
+// These are not visible on mobile as they are within the .header-mobile-only section.
+header nav li:nth-last-child(-n+2) {
+    @include respond-max(1080px) {
         display: none;
     }
 }
diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 2fe7c0cfd1..1a580b655e 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -425,7 +425,6 @@ main {
 .container {
     @include respond-min(768px) {
         margin: 0 auto;
-        max-width: 1400px;
         padding: 0 (32/768) * 100%;
     }
 
@@ -463,13 +462,10 @@ header {
 
     .container {
         display: flex;
-        flex-direction: row;
-        @include respond-min(768px) {
-            position: relative;
-        }
+        align-items: center;
     }
 
-    .mobile-toggle {margin-left: auto}
+    .header-mobile-only {margin-left: auto}
 
     .meta {
         @include font-size(13);
@@ -479,7 +475,7 @@ header {
         margin: 8px 0 0 10px;
         display: none;
 
-        @include respond-min(1150px) {
+        @include respond-min(1080px) {
             width: 200px;
             display: block;
         }
@@ -490,19 +486,26 @@ header {
     .logo {
         @include font-size(40);
         @include sans-serif;
-        background: url(../img/logo-django.svg) center center no-repeat;
+        // Small screens less than 500px use the dj logo. This gives more
+        // horizontal space for a searchbar in the header.
+        background: url(../img/logo-dj.svg) center center no-repeat;
         color: var(--white-color);
         display: block;
         font-weight: 700;
-        margin: 10px;
+        margin: 10px 4px;
         overflow: hidden;
         text-decoration: none;
         text-indent: 100%;
-        width: 104px;
+        width: 45px;
         height: 36px;
 
-        @include respond-min(768px) {
-            margin-left: 0;
+        @include respond-min(500px) {
+            background: url(../img/logo-django.svg) center center no-repeat;
+            width: 104px;
+        }
+
+        @include respond-min(1080px) {
+            margin-left: 10px;
         }
     }
 
@@ -514,13 +517,12 @@ header {
         cursor: pointer;
         display: block;
         height: 45px;
-        line-height: 48px;
-        margin: 4px 10px;
+        margin: 2px;
         text-align: center;
         text-decoration: none;
         width: 45px;
 
-        @include respond-min(768px) {
+        @include respond-min(1080px) {
             display: none;
         }
 
@@ -544,7 +546,7 @@ header {
             max-height: 580px;
         }
 
-        @include respond-min(768px) {
+        @include respond-min(1080px) {
             width: auto;
             max-height: none; // always show menu on a desktop width
         }
@@ -553,7 +555,9 @@ header {
             margin: 10px 0 0;
             padding: 0;
 
-            @include respond-min(768px) {
+            @include respond-min(1080px) {
+                display: flex;
+                align-items: center;
                 margin: 0;
             }
         }
@@ -568,14 +572,18 @@ header {
             text-transform: uppercase;
             margin: 0 10px;
             border-top: 1px solid lighten($green-dark, 5%);
-            padding: 20px 0px;
+            > :not(.search){
+              padding: 20px 0px;
+            }
 
-            @include respond-min(768px) {
+            @include respond-min(1080px) {
                 margin: 0;
                 border: 0;
                 float: left;
                 text-align: left;
-                padding: 20px 10px;
+                > :not(.search){
+                  padding: 10px;
+                }
             }
 
             &.active a {
@@ -608,18 +616,11 @@ header {
                 color: var(--secondary-accent);
             }
 
-            @include respond-min(768px) {
+            @include respond-min(1080px) {
                 padding: 20px 10px;
             }
         }
 
-        .nav-primary {
-            @include respond-min(768px) {
-                position: absolute;
-                right: 0;
-                top: 45px;
-            }
-        }
     }
 }
 
@@ -645,7 +646,7 @@ header {
         top: 0;
         max-width: 660px;
 
-        @include respond-min(768px) {
+        @include respond-min(1080px) {
             position: static;
         }
     }
@@ -2646,7 +2647,7 @@ search.filters {
     position: relative;
 
     a {
-      padding: 10px 20px;
+      padding: 10px 15px;
       text-decoration: none;
       border-bottom: 3px solid transparent;
       transition: color 0.3s ease, border-bottom 0.3s ease;
@@ -3005,14 +3006,10 @@ form {
         height: 40px;
         padding: 0;
         position: absolute;
-        right: 2%;
+        right: 0;
         top: 6%;
         width: 40px;
 
-        @include respond-min(768px) {
-            right: 1%;
-        }
-
         i {
             @include font-size(20);
             line-height: 1;
@@ -3054,16 +3051,15 @@ form {
     }
 
     &.search {
-        @include respond-min(768px) {
-            flex: 0 0 40%;
-            margin: 10px 0;
-        }
-
-        flex: 0 0 100%;
-        margin: 0 0 10px 0;
-
-        button {
-            top: 19%;
+        width: 20%;
+        min-width: 200px;
+        margin: 10px;
+        margin-left: 0;
+        input {
+          margin: 0;
+          @include respond-min(1080px) {
+            margin: 0 10px;
+          }
         }
     }
 }
@@ -3602,7 +3598,7 @@ ul.corporate-members li {
         justify-content: space-between;
     }
 
-    @include respond-max(1200px) {
+    @include respond-max(1080px) {
         .community-title {
             text-align: center;
         }
diff --git a/djangoproject/settings/common.py b/djangoproject/settings/common.py
index 82819c3cc0..a607f68cf9 100644
--- a/djangoproject/settings/common.py
+++ b/djangoproject/settings/common.py
@@ -313,3 +313,5 @@
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 FORMS_URLFIELD_ASSUME_HTTPS = True
+
+DEFAULT_LANGUAGE_CODE = "en"
diff --git a/djangoproject/static/img/logo-dj.svg b/djangoproject/static/img/logo-dj.svg
new file mode 100644
index 0000000000..5ecd24d91d
--- /dev/null
+++ b/djangoproject/static/img/logo-dj.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <title>django-dj-centered</title>
+  <g transform="translate(5,3)" fill="#FFFFFF" fill-rule="evenodd">
+    <!-- "d" -->
+    <path d="M10.2602817,0 L15.9509859,0 L15.9509859,26.0824248 C13.0360563,26.6338042 10.8901408,26.8507285 8.5684507,26.8507285 C1.6180282,26.8434735 -2,23.7383366 -2,17.7747325 C-2,12.0287781 1.8377465,8.2997118 7.7847887,8.2997118 C8.7076056,8.2997118 9.4107042,8.3722617 10.2602817,8.5899115 L10.2602817,0 Z M10.2602817,13.1242821 C9.5938028,12.9066323 9.044507,12.8340823 8.3414085,12.8340823 C5.4630986,12.8340823 3.8005634,14.5897906 3.8005634,17.6666331 C3.8005634,20.6622196 5.3898592,22.316358 8.3047887,22.316358 C8.9346479,22.316358 9.4473239,22.2808085 10.2602817,22.1719836 L10.2602817,13.1242821 Z"/>
+    <!-- "j" -->
+    <path d="M24.9960563,8.6987364 L24.9960563,21.7577235 C24.9960563,26.2550936 24.6591549,28.417807 23.6704225,30.2823401 C22.7476056,32.0750489 21.531831,33.2053768 19.0197183,34.453961 L13.7391549,31.9654985 C16.2512676,30.7981701 17.4670423,29.7665101 18.2433803,28.1921767 C19.056338,26.5822938 19.3126761,24.7177606 19.3126761,19.8133855 L19.3126761,8.6987364 L24.9960563,8.6987364 Z M19.3126761,0.02901997 L25.0033803,0.02901997 L25.0033803,5.8112493 L19.3126761,5.8112493 L19.3126761,0.02901997 Z"/>
+  </g>
+</svg>
diff --git a/djangoproject/templates/includes/header.html b/djangoproject/templates/includes/header.html
index 8c9da6cd65..b51fb9fe72 100644
--- a/djangoproject/templates/includes/header.html
+++ b/djangoproject/templates/includes/header.html
@@ -1,3 +1,4 @@
+{% load docs %}
 {% if 'preview.djangoproject.com' in request.get_host %}
   <div class="copy-banner" style="background: #fff78e; padding: 10px;"></div>
 {% endif %}
@@ -5,8 +6,11 @@
   <div class="container container--flex--wrap--mobile">
     <a class="logo" href="{% url 'homepage' %}">Django</a>
     <p class="meta">The web framework for perfectionists with deadlines.</p>
-    <div class="mobile-toggle">
-      {% include "includes/toggle_theme.html" %}
+    <div class="header-mobile-only">
+      {% search_form %}
+      <div class="light-dark-mode-toggle">
+        {% include "includes/toggle_theme.html" %}
+      </div>
     </div>
     <button class="menu-button">
       <i class="icon icon-reorder"></i>
@@ -21,7 +25,7 @@
         <li{% if 'download' in request.path %} class="active"{% endif %}>
           <a href="{% url 'download' %}">Download</a>
         </li>
-        <li{% if request.host.name == 'docs' %} class="active"{% endif %}>
+        <li{% if request.host.name == 'docs' and 'search' not in request.path %} class="active"{% endif %}>
           <a href="{% block doc_url %}{% url 'homepage' host 'docs' %}{% endblock %}">Documentation</a>
         </li>
         <li{% if 'weblog' in request.path %} class="active"{% endif %}>
@@ -42,6 +46,9 @@
         <li{% if 'fundraising' in request.path %} class="active"{% endif %}>
           <a href="{% url 'fundraising:index' %}">&#9829; Donate</a>
         </li>
+        <li>
+          {% search_form %}
+        </li>
         <li>
           {% include "includes/toggle_theme.html" %}
         </li>
diff --git a/docs/templates/docs/search_form.html b/djangoproject/templates/search_form.html
similarity index 100%
rename from docs/templates/docs/search_form.html
rename to djangoproject/templates/search_form.html
diff --git a/djangoproject/tests.py b/djangoproject/tests.py
index 127332bfdc..2c67432110 100644
--- a/djangoproject/tests.py
+++ b/djangoproject/tests.py
@@ -1,6 +1,7 @@
 from http import HTTPStatus
 from io import StringIO
 
+from django.conf import settings
 from django.core.management import call_command
 from django.test import TestCase
 from django.urls import NoReverseMatch, get_resolver
@@ -10,6 +11,16 @@
 from docs.models import DocumentRelease, Release
 
 
+class ReleaseMixin:
+    @classmethod
+    def setUpTestData(cls):
+        r2, _ = Release.objects.get_or_create(version="2.0")
+        DocumentRelease.objects.get_or_create(
+            is_default=True,
+            defaults={"lang": settings.DEFAULT_LANGUAGE_CODE, "release": r2},
+        )
+
+
 class LocaleSmokeTests(TestCase):
     """
     Smoke test a translated string from each of the 3 locale directories
@@ -47,7 +58,7 @@ def test_project_locale(self):
         )
 
 
-class TemplateViewTests(TestCase):
+class TemplateViewTests(ReleaseMixin, TestCase):
     """
     Tests for views that are instances of TemplateView.
     """
@@ -83,7 +94,7 @@ def test_styleguide(self):
         self.assertView("styleguide")
 
 
-class ExcludeHostsLocaleMiddlewareTests(TestCase):
+class ExcludeHostsLocaleMiddlewareTests(ReleaseMixin, TestCase):
     """
     djangoproject.middleware.ExcludeHostsLocaleMiddleware properly prevents
     the hosts in settings.LOCALE_MIDDLEWARE_EXCLUDED_HOSTS from being
@@ -95,11 +106,6 @@ class ExcludeHostsLocaleMiddlewareTests(TestCase):
     docs_host = "docs.djangoproject.localhost"
     www_host = "www.djangoproject.localhost"
 
-    @classmethod
-    def setUpTestData(cls):
-        r2 = Release.objects.create(version="2.0")
-        DocumentRelease.objects.create(lang="en", release=r2, is_default=True)
-
     def test_docs_host_excluded(self):
         """We get no Content-Language or Vary headers when docs host is excluded"""
         with self.settings(LOCALE_MIDDLEWARE_EXCLUDED_HOSTS=[self.docs_host]):
@@ -175,7 +181,7 @@ def test_no_pending_migrations(self):
             raise AssertionError("Pending migrations:\n" + out.getvalue()) from None
 
 
-class Header1Tests(TestCase):
+class Header1Tests(ReleaseMixin, TestCase):
     def extract_patterns(self, patterns, prefix="", urls=None):
         urls = urls or []
         for pattern in patterns:
diff --git a/djangoproject/utils.py b/djangoproject/utils.py
new file mode 100644
index 0000000000..d06f1863d3
--- /dev/null
+++ b/djangoproject/utils.py
@@ -0,0 +1,36 @@
+from django import template
+
+
+class CachedLibrary(template.Library):
+    def cached_context_inclusion_tag(self, template_name, *, name=None):
+        """
+        Wraps @register.inclusion_tag(template_name, takes_context=True) to
+        automatically cache the returned context dictionary inside the
+        template's render_context for the duration of a single render pass.
+
+        This is useful when a tag may be rendered multiple times within the
+        same template and computing its context is expensive (e.g. due to
+        database queries).
+        """
+
+        def decorator(func):
+            tag_name = name or func.__name__
+
+            @self.inclusion_tag(template_name, takes_context=True, name=tag_name)
+            def wrapper(context, *args, **kwargs):
+                render_context = getattr(context, "render_context", None)
+                cache_key = f"{tag_name}_cached_context"
+
+                if render_context is not None and cache_key in render_context:
+                    return render_context[cache_key]
+
+                result = func(context, *args, **kwargs)
+
+                if render_context is not None:
+                    render_context[cache_key] = result
+
+                return result
+
+            return wrapper
+
+        return decorator
diff --git a/docs/forms.py b/docs/forms.py
index 37d5ab9856..21472de900 100644
--- a/docs/forms.py
+++ b/docs/forms.py
@@ -1,11 +1,11 @@
 from django import forms
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
-search_placeholder = _("Search %s documentation")
+search_label_placeholder = pgettext_lazy("Action to search the whole site", "Search")
 
 
 class DocSearchForm(forms.Form):
-    q = forms.CharField(required=False, label=_("Search"))
+    q = forms.CharField(required=False, label=search_label_placeholder)
 
     def __init__(self, data=None, **kwargs):
         self.release = kwargs.pop("release")
@@ -13,6 +13,6 @@ def __init__(self, data=None, **kwargs):
         self.fields["q"].widget = forms.TextInput(
             attrs={
                 "type": "search",
-                "placeholder": search_placeholder % self.release.human_version,
+                "placeholder": search_label_placeholder,
             }
         )
diff --git a/docs/management/commands/update_docs.py b/docs/management/commands/update_docs.py
index d1f3df0486..06161bb2fa 100644
--- a/docs/management/commands/update_docs.py
+++ b/docs/management/commands/update_docs.py
@@ -79,7 +79,9 @@ def _get_doc_releases(self, versions, options):
 
         # Skip translated non-stable versions to avoid a crash:
         # https://github.com/django/djangoproject.com/issues/627
-        queryset = queryset.filter(Q(lang="en") | Q(release=default_docs_version))
+        queryset = queryset.filter(
+            Q(lang=settings.DEFAULT_LANGUAGE_CODE) | Q(release=default_docs_version)
+        )
 
         if options["language"]:
             queryset = queryset.filter(lang=options["language"])
@@ -132,6 +134,8 @@ def build_doc_release(self, release, force=False, interactive=False):
         if self.verbosity >= 1:
             self.stdout.write(f"Starting update for {release} at {datetime.now()}...")
 
+        release.sync_from_sitemap(force=force)
+
         # checkout_dir is shared for all languages.
         checkout_dir = settings.DOCS_BUILD_ROOT.joinpath("sources", release.version)
         parent_build_dir = settings.DOCS_BUILD_ROOT.joinpath(
@@ -161,7 +165,7 @@ def build_doc_release(self, release, force=False, interactive=False):
 
         source_dir = checkout_dir.joinpath("docs")
 
-        if release.lang != "en":
+        if release.lang != settings.DEFAULT_LANGUAGE_CODE:
             scm_url = release.scm_url.replace(
                 "django.git", "django-docs-translations.git"
             )
diff --git a/docs/models.py b/docs/models.py
index 17c2cca01a..9b95e462e2 100644
--- a/docs/models.py
+++ b/docs/models.py
@@ -5,6 +5,7 @@
 from functools import partial, reduce
 from pathlib import Path
 
+import requests
 from django.conf import settings
 from django.contrib.postgres.indexes import GinIndex
 from django.contrib.postgres.search import (
@@ -34,14 +35,22 @@
     START_SEL,
     STOP_SEL,
     TSEARCH_CONFIG_LANGUAGES,
+    DocumentationCategory,
+    fetch_html,
     get_document_search_vector,
 )
+from .utils import extract_inner_html
+
+
+def get_search_config(lang):
+    """Determine the PostgreSQL search language"""
+    return TSEARCH_CONFIG_LANGUAGES.get(lang[:2], DEFAULT_TEXT_SEARCH_CONFIG)
 
 
 class DocumentReleaseQuerySet(models.QuerySet):
-    def current(self, lang="en"):
+    def current(self, lang=settings.DEFAULT_LANGUAGE_CODE):
         current = self.get(is_default=True)
-        if lang != "en":
+        if lang != settings.DEFAULT_LANGUAGE_CODE:
             try:
                 return self.get(lang=lang, release=current.release)
             except DocumentRelease.DoesNotExist:
@@ -91,7 +100,9 @@ class DocumentRelease(models.Model):
 
     DEFAULT_CACHE_KEY = "%s_docs_version" % settings.CACHE_MIDDLEWARE_KEY_PREFIX
 
-    lang = models.CharField(max_length=7, choices=settings.LANGUAGES, default="en")
+    lang = models.CharField(
+        max_length=7, choices=settings.LANGUAGES, default=settings.DEFAULT_LANGUAGE_CODE
+    )
     release = models.ForeignKey(
         Release,
         null=True,
@@ -175,7 +186,7 @@ def sync_to_db(self, decoded_documents):
         the database. Deletes all the release's documents first then
         reinserts them as needed.
         """
-        self.documents.all().delete()
+        self.documents.exclude(metadata__parents=DocumentationCategory.WEBSITE).delete()
 
         # Read excluded paths from robots.docs.txt.
         robots_path = settings.BASE_DIR.joinpath(
@@ -206,16 +217,66 @@ def sync_to_db(self, decoded_documents):
                 path=document_path,
                 title=html.unescape(strip_tags(document["title"])),
                 metadata=document,
-                config=TSEARCH_CONFIG_LANGUAGES.get(
-                    self.lang[:2], DEFAULT_TEXT_SEARCH_CONFIG
-                ),
+                config=get_search_config(self.lang),
             )
-        for document in self.documents.all():
+        for document in self.documents.exclude(
+            metadata__parents=DocumentationCategory.WEBSITE
+        ):
             document.metadata["breadcrumbs"] = list(
                 Document.objects.breadcrumbs(document).values("title", "path")
             )
             document.save(update_fields=("metadata",))
 
+    def sync_from_sitemap(self, force=False):
+        from djangoproject.urls.www import sitemaps
+
+        if not self.is_dev:
+            return
+
+        if force:
+            Document.objects.filter(
+                metadata__parents=DocumentationCategory.WEBSITE
+            ).delete()
+
+        doc_urls = set(
+            Document.objects.filter(
+                metadata__parents=DocumentationCategory.WEBSITE
+            ).values_list("path", flat=True)
+        )
+
+        for sitemap in sitemaps.values():
+            for url in sitemap().get_urls():
+                path = url["location"]
+                if path in doc_urls:
+                    continue
+                try:
+                    page_html = fetch_html(path)
+                except requests.RequestException:
+                    continue
+                try:
+                    main_html = extract_inner_html(page_html, tag="main")
+                    title = extract_inner_html(page_html, tag="h1")
+                except ValueError:
+                    continue
+                Document.objects.create(
+                    release=self,
+                    path=path,
+                    title=title,
+                    metadata={
+                        "body": main_html,
+                        "breadcrumbs": [
+                            {
+                                "path": DocumentationCategory.WEBSITE,
+                                "title": "Website",
+                            },
+                        ],
+                        "parents": DocumentationCategory.WEBSITE,
+                        "title": title,
+                        "toc": "",
+                    },
+                    config=get_search_config(self.lang),
+                )
+
 
 def _clean_document_path(path):
     # We have to be a bit careful to reverse-engineer the correct
@@ -228,7 +289,9 @@ def _clean_document_path(path):
 
 
 def document_url(doc):
-    if doc.path:
+    if doc.metadata.get("parents") == DocumentationCategory.WEBSITE:
+        return doc.path
+    elif doc.path:
         kwargs = {
             "lang": doc.release.lang,
             "version": doc.release.version,
@@ -273,6 +336,14 @@ def search(self, query_text, release, document_category=None):
                 config=models.F("config"),
             )
             base_filter = Q(release_id=release.id)
+            if release.lang == settings.DEFAULT_LANGUAGE_CODE and not release.is_dev:
+                dev_release = DocumentRelease.objects.get_by_version_and_lang(
+                    version="dev", lang=settings.DEFAULT_LANGUAGE_CODE
+                )
+                base_filter |= Q(
+                    release_id=dev_release.id,
+                    metadata__parents=DocumentationCategory.WEBSITE,
+                )
             if document_category:
                 base_filter &= Q(metadata__parents__startswith=document_category)
             base_qs = (
diff --git a/docs/search.py b/docs/search.py
index 3a99978d58..d6d1ec9959 100644
--- a/docs/search.py
+++ b/docs/search.py
@@ -1,3 +1,4 @@
+import requests
 from django.contrib.postgres.search import SearchVector
 from django.db.models import TextChoices
 from django.db.models.fields.json import KeyTextTransform
@@ -67,6 +68,7 @@ class DocumentationCategory(TextChoices):
     TOPICS = "topics", _("Using Django")
     HOWTO = "howto", _("How-to guides")
     RELEASE_NOTES = "releases", _("Release notes")
+    WEBSITE = "website", _("Django Website")
 
     @classmethod
     def parse(cls, value, default=None):
@@ -74,3 +76,33 @@ def parse(cls, value, default=None):
             return cls(value)
         except ValueError:
             return None
+
+
+def fetch_html(url, timeout=10):
+    """
+    Fetch the HTML of a page if status code is 200.
+    Simulates a human browser and accepts only text/html.
+    """
+
+    headers = {
+        "User-Agent": (
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+            "AppleWebKit/537.36 (KHTML, like Gecko) "
+            "Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0"
+        ),
+        "Accept": "text/html",
+        "Accept-Language": "en-US,en;q=0.9",
+    }
+
+    response = requests.get(url, headers=headers, timeout=timeout)
+
+    if response.status_code == 200:
+        content_type = response.headers.get("Content-Type", "")
+        if "text/html" in content_type:
+            return response.text
+        else:
+            raise requests.RequestException(f"Unexpected Content-Type: {content_type}")
+    else:
+        raise requests.RequestException(
+            f"Failed to fetch {url}, status code: {response.status_code}"
+        )
diff --git a/docs/sitemaps.py b/docs/sitemaps.py
index c6a9ba0c84..6f520aa753 100644
--- a/docs/sitemaps.py
+++ b/docs/sitemaps.py
@@ -1,6 +1,7 @@
 from django.contrib.sitemaps import Sitemap
 
 from .models import Document
+from .search import DocumentationCategory
 
 
 class DocsSitemap(Sitemap):
@@ -10,6 +11,7 @@ def __init__(self, lang):
     def items(self):
         return (
             Document.objects.filter(release__lang=self.lang)
+            .exclude(metadata__parents=DocumentationCategory.WEBSITE)
             .order_by("-release__release", "path")
             .select_related("release__release")
         )
diff --git a/docs/templates/base_docs.html b/docs/templates/base_docs.html
index 453818ab18..82d6a3a739 100644
--- a/docs/templates/base_docs.html
+++ b/docs/templates/base_docs.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n docs %}
+{% load i18n %}
 
 {% block html_language_code %}{{ lang|default:"en" }}{% endblock %}
 
@@ -11,7 +11,6 @@
 
 {% block header %}
   <p><a href="{% block doc_url %}{% url 'homepage' %}{% endblock %}">{% trans 'Documentation' %}</a></p>
-  {% search_form %}
 {% endblock %}
 
 {% block layout_class %}sidebar-right{% endblock %}
diff --git a/docs/templates/docs/search_results.html b/docs/templates/docs/search_results.html
index f4308132c6..8d42d30e53 100644
--- a/docs/templates/docs/search_results.html
+++ b/docs/templates/docs/search_results.html
@@ -1,7 +1,8 @@
 {% extends "docs/doc.html" %}
 {% load i18n docs %}
 
-{% block title %}{% translate "Search | Django documentation" %}{% endblock %}
+{% block title %}{% translate "Search" %}{% endblock %}
+{% block header %}{% endblock %}
 
 {% block toc-wrapper %}{% endblock %}
 {% block breadcrumbs-wrapper %}{% endblock %}
@@ -19,19 +20,11 @@
       {% endfor %}
     </search>
     <h2>
-      {% if release.is_dev %}
-        {% blocktranslate count num_results=paginator.count trimmed %}
-          {{ num_results }} result for <em>{{ query }}</em> in the development version
-        {% plural %}
-          {{ num_results }} results for <em>{{ query }}</em> in the development version
-        {% endblocktranslate %}
-      {% else %}
-        {% blocktranslate count num_results=paginator.count trimmed %}
-          {{ num_results }} result for <em>{{ query }}</em> in version {{ version }}
-        {% plural %}
-          {{ num_results }} results for <em>{{ query }}</em> in version {{ version }}
-        {% endblocktranslate %}
-      {% endif %}
+      {% blocktranslate count num_results=paginator.count trimmed %}
+        {{ num_results }} result for <em>{{ query }}</em>
+      {% plural %}
+        {{ num_results }} results for <em>{{ query }}</em>
+      {% endblocktranslate %}
     </h2>
   {% else %}
     <h2>{% translate "No search query given" %}</h2>
@@ -43,11 +36,11 @@ <h2>{% translate "No search query given" %}</h2>
         {% for result in page.object_list %}
           <dt>
             <h2 class="result-title">
-              <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=result.path host 'docs' %}{% if not start_sel in result.headline %}{{ result.highlight|fragment }}{% endif %}">{{ result.headline|safe }}</a>
+              <a href="{{ result.get_absolute_url }}{% if not start_sel in result.headline %}{{ result.highlight|fragment }}{% endif %}">{{ result.headline|safe }}</a>
             </h2>
             <span class="meta breadcrumbs">
               {% for breadcrumb in result.breadcrumbs %}
-                <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=breadcrumb.path host 'docs' %}">{{ breadcrumb.title }}</a>{% if not forloop.last %} <span class="arrow">»</span>{% endif %}
+                <a href="{{ result.get_absolute_url }}">{{ breadcrumb.title }}</a>{% if not forloop.last %} <span class="arrow">»</span>{% endif %}
               {% endfor %}
             </span>
           </dt>
@@ -60,7 +53,7 @@ <h2 class="result-title">
               <ul class="code-links">
                 {% for name, value in result_code_links.items %}
                   <li>
-                    <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=result.path host 'docs' %}#{{ value.full_path }}">
+                    <a href="{{ result.get_absolute_url }}#{{ value.full_path }}">
                       <div>
                         <code>{{ name }}</code>
                         {% if value.module_path %}<div class="meta">{{ value.module_path }}</div>{% endif %}
@@ -74,9 +67,12 @@ <h2 class="result-title">
         {% empty %}
           {% if active_category %}
             <dt>
+              {% if active_category == "website" and lang != "en" %}
+                <p>{% blocktranslate trimmed %}The website content can only be searched in English.{% endblocktranslate %}</p>
+              {% endif %}
               <p>
                 {% querystring category=None page=None as all_search %}
-                {% blocktranslate trimmed %}Please try searching <a href="{{ all_search }}">all documentation results</a>.{% endblocktranslate %}
+                {% blocktranslate trimmed %}Please try searching <a href="{{ all_search }}">all results</a>.{% endblocktranslate %}
               </p>
             </dt>
           {% endif %}
diff --git a/docs/templatetags/docs.py b/docs/templatetags/docs.py
index 3410ec65cc..012ca9478e 100644
--- a/docs/templatetags/docs.py
+++ b/docs/templatetags/docs.py
@@ -2,6 +2,7 @@
 from urllib.parse import quote
 
 from django import template
+from django.conf import settings
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 from django.utils.version import get_version_tuple
@@ -9,25 +10,42 @@
 from pygments.formatters.html import HtmlFormatter
 from pygments.lexers import get_lexer_by_name
 
+from djangoproject.utils import CachedLibrary
+
 from ..forms import DocSearchForm
 from ..models import DocumentRelease
 from ..search import START_SEL, STOP_SEL
 from ..utils import get_doc_path, get_doc_root, get_module_path
 
-register = template.Library()
+register = CachedLibrary()
 
 
-@register.inclusion_tag("docs/search_form.html", takes_context=True)
+@register.cached_context_inclusion_tag("search_form.html")
 def search_form(context):
+    if "request" not in context:
+        # Django's built-in error views (like django.views.defaults.server_error)
+        # render templates without attaching a RequestContext — meaning the 'request'
+        # variable is not present in the template context.
+        return {
+            "form": DocSearchForm(release=None),
+            "version": "dev",
+            "lang": settings.DEFAULT_LANGUAGE_CODE,
+        }
+
     request = context["request"]
-    release = DocumentRelease.objects.get_by_version_and_lang(
-        context["version"],
-        context["lang"],
-    )
+    lang = context.get("lang", settings.DEFAULT_LANGUAGE_CODE)
+
+    if "version" in context:
+        release = DocumentRelease.objects.select_related(
+            "release"
+        ).get_by_version_and_lang(context["version"], lang)
+    else:
+        release = DocumentRelease.objects.select_related("release").current()
+
     return {
         "form": DocSearchForm(request.GET, release=release),
-        "version": context["version"],
-        "lang": context["lang"],
+        "version": release.version,
+        "lang": lang,
     }
 
 
@@ -38,7 +56,7 @@ def get_all_doc_versions(context, url=None):
 
     Usage: {% get_all_doc_versions <url> as "varname" %}
     """
-    lang = context.get("lang", "en")
+    lang = context.get("lang", settings.DEFAULT_LANGUAGE_CODE)
     versions = []
 
     # Look for each version of the docs.
diff --git a/docs/tests/test_models.py b/docs/tests/test_models.py
index d17bd4d051..05dfe46611 100644
--- a/docs/tests/test_models.py
+++ b/docs/tests/test_models.py
@@ -1,13 +1,18 @@
 import datetime
 from operator import attrgetter
+from unittest import mock
 
+import requests_mock
 from django.conf import settings
 from django.db import connection
 from django.test import TestCase
+from django.utils import timezone
 
+from blog.models import ContentFormat, Entry
 from releases.models import Release
 
 from ..models import Document, DocumentRelease
+from ..search import DocumentationCategory
 
 
 class ModelsTests(TestCase):
@@ -118,9 +123,9 @@ def setUpTestData(cls):
         DocumentRelease.objects.bulk_create(
             DocumentRelease(lang=lang, release=release)
             for lang, release in [
-                ("en", None),
-                ("en", r1),
-                ("en", r2),
+                (settings.DEFAULT_LANGUAGE_CODE, None),
+                (settings.DEFAULT_LANGUAGE_CODE, r1),
+                (settings.DEFAULT_LANGUAGE_CODE, r2),
                 ("sv", r1),
                 ("ar", r1),
             ]
@@ -129,7 +134,7 @@ def setUpTestData(cls):
     def test_by_version(self):
         self.assertQuerySetEqual(
             DocumentRelease.objects.by_version("1.0"),
-            [("en", "1.0"), ("sv", "1.0"), ("ar", "1.0")],
+            [(settings.DEFAULT_LANGUAGE_CODE, "1.0"), ("sv", "1.0"), ("ar", "1.0")],
             transform=attrgetter("lang", "version"),
             ordered=False,
         )
@@ -137,7 +142,7 @@ def test_by_version(self):
     def test_by_version_dev(self):
         self.assertQuerySetEqual(
             DocumentRelease.objects.by_version("dev"),
-            [("en", "dev")],
+            [(settings.DEFAULT_LANGUAGE_CODE, "dev")],
             transform=attrgetter("lang", "version"),
             ordered=False,
         )
@@ -145,7 +150,12 @@ def test_by_version_dev(self):
     def test_by_versions(self):
         self.assertQuerySetEqual(
             DocumentRelease.objects.by_versions("1.0", "dev"),
-            [("en", "dev"), ("en", "1.0"), ("sv", "1.0"), ("ar", "1.0")],
+            [
+                (settings.DEFAULT_LANGUAGE_CODE, "dev"),
+                (settings.DEFAULT_LANGUAGE_CODE, "1.0"),
+                ("sv", "1.0"),
+                ("ar", "1.0"),
+            ],
             transform=attrgetter("lang", "version"),
             ordered=False,
         )
@@ -155,9 +165,11 @@ def test_by_versions_empty(self):
             DocumentRelease.objects.by_versions()
 
     def test_get_by_version_and_lang_exists(self):
-        doc = DocumentRelease.objects.get_by_version_and_lang("1.0", "en")
+        doc = DocumentRelease.objects.get_by_version_and_lang(
+            "1.0", settings.DEFAULT_LANGUAGE_CODE
+        )
         self.assertEqual(doc.release.version, "1.0")
-        self.assertEqual(doc.lang, "en")
+        self.assertEqual(doc.lang, settings.DEFAULT_LANGUAGE_CODE)
 
     def test_get_by_version_and_lang_missing(self):
         with self.assertRaises(DocumentRelease.DoesNotExist):
@@ -165,14 +177,17 @@ def test_get_by_version_and_lang_missing(self):
 
     def test_get_available_languages_by_version(self):
         get = DocumentRelease.objects.get_available_languages_by_version
-        self.assertEqual(list(get("1.0")), ["ar", "en", "sv"])
-        self.assertEqual(list(get("2.0")), ["en"])
+        self.assertEqual(list(get("1.0")), ["ar", settings.DEFAULT_LANGUAGE_CODE, "sv"])
+        self.assertEqual(list(get("2.0")), [settings.DEFAULT_LANGUAGE_CODE])
         self.assertEqual(list(get("3.0")), [])
 
 
 class DocumentManagerTest(TestCase):
     @classmethod
     def setUpTestData(cls):
+        cls.dev_release = DocumentRelease.objects.create(
+            lang=settings.DEFAULT_LANGUAGE_CODE
+        )
         cls.release = DocumentRelease.objects.create(
             release=Release.objects.create(version="1.2.3"),
         )
@@ -347,6 +362,20 @@ def setUpTestData(cls):
                 "release": cls.release_fr,
                 "title": "Notes de publication de Django 1.9.4",
             },
+            {
+                "metadata": {
+                    "body": "Main 1",
+                    "breadcrumbs": [
+                        {"path": DocumentationCategory.WEBSITE, "title": "Website"}
+                    ],
+                    "parents": DocumentationCategory.WEBSITE,
+                    "title": "Title 1",
+                    "toc": "",
+                },
+                "path": "example",
+                "release": cls.dev_release,
+                "title": "Blog post",
+            },
         ]
         Document.objects.bulk_create(Document(**doc) for doc in documents)
 
@@ -440,12 +469,22 @@ def test_search_title(self):
         with self.assertNumQueries(1):
             self.assertQuerySetEqual(
                 misspelled_query,
-                [("Generic views", "en", "1.2.3")],
+                [("Generic views", settings.DEFAULT_LANGUAGE_CODE, "1.2.3")],
                 transform=attrgetter(
                     "headline", "release.lang", "release.release.version"
                 ),
             )
 
+    def test_website_document_items_included_english(self):
+        self.assertQuerySetEqual(
+            Document.objects.search("Main", self.release),
+            ["Blog post"],
+            transform=attrgetter("title"),
+        )
+
+    def test_website_document_items_excluded_non_english(self):
+        self.assertEqual(Document.objects.search("Main", self.release_fr).count(), 0)
+
 
 class UpdateDocTests(TestCase):
     @classmethod
@@ -547,3 +586,162 @@ def test_excluded_documents(self):
         )
         document = release.documents.get()
         self.assertEqual(document.path, "nonexcluded/bar")
+
+    def test_sync_to_db_not_delete_website_docs(self):
+        Document.objects.create(
+            release=self.release,
+            path="example_path",
+            title="Title 1",
+            metadata={
+                "body": "Main 1",
+                "breadcrumbs": [
+                    {"path": DocumentationCategory.WEBSITE, "title": "Website"}
+                ],
+                "parents": DocumentationCategory.WEBSITE,
+                "title": "Title 1",
+                "toc": "",
+            },
+        )
+        self.release.sync_to_db([])
+        self.assertEqual(Document.objects.filter(release=self.release).count(), 1)
+
+    def test_sync_from_sitemap_skip_non_en_dev_release(self):
+        release = Release.objects.create(version="5.2")
+        Entry.objects.create(
+            pub_date=timezone.now() - datetime.timedelta(days=2),
+            slug="a",
+            body="<strong>test</strong>",
+            content_format=ContentFormat.HTML,
+            is_active=True,
+        )
+        for lang, release_obj in [
+            ("fr", None),
+            ("fr", release),
+            (settings.DEFAULT_LANGUAGE_CODE, release),
+        ]:
+            doc_release = DocumentRelease.objects.create(
+                lang=lang,
+                release=release_obj,
+            )
+            with self.subTest(lang=lang, release=release_obj):
+                doc_release.sync_from_sitemap()
+                self.assertFalse(Document.objects.exists())
+
+    @requests_mock.mock()
+    def test_sync_from_sitemap(self, mocker):
+        blog_entry = Entry.objects.create(
+            pub_date=timezone.now() - datetime.timedelta(days=2),
+            slug="a",
+            body="<strong>test</strong>",
+            content_format=ContentFormat.HTML,
+            is_active=True,
+        )
+        mocker.get(
+            blog_entry.get_absolute_url(),
+            text="<html><main>Main 1</main><h1>Title 1</h1></html>",
+            headers={"Content-Type": "text/html"},
+        )
+        self.release.sync_from_sitemap()
+
+        document = Document.objects.get(release=self.release)
+        self.assertEqual(
+            document.path,
+            blog_entry.get_absolute_url(),
+        )
+        self.assertEqual(
+            document.title,
+            "Title 1",
+        )
+        self.assertEqual(
+            document.metadata,
+            {
+                "body": "Main 1",
+                "breadcrumbs": [
+                    {"path": DocumentationCategory.WEBSITE, "title": "Website"}
+                ],
+                "parents": DocumentationCategory.WEBSITE,
+                "title": "Title 1",
+                "toc": "",
+            },
+        )
+
+    @mock.patch("docs.search.fetch_html")
+    def test_sync_from_sitemap_only_requests_non_existing(self, mock_fetch_html):
+        blog_entry = Entry.objects.create(
+            pub_date=timezone.now() - datetime.timedelta(days=2),
+            slug="a",
+            body="<strong>test</strong>",
+            content_format=ContentFormat.HTML,
+            is_active=True,
+        )
+        Document.objects.create(
+            release=self.release,
+            metadata={"parents": DocumentationCategory.WEBSITE},
+            path=blog_entry.get_absolute_url(),
+        )
+        self.release.sync_from_sitemap()
+
+        mock_fetch_html.assert_not_called()
+
+        document = Document.objects.get(release=self.release)
+        # Confirm Document has not been updated.
+        self.assertEqual(
+            document.path,
+            blog_entry.get_absolute_url(),
+        )
+        self.assertEqual(
+            document.metadata,
+            {"parents": DocumentationCategory.WEBSITE},
+        )
+
+    @requests_mock.mock()
+    def test_sync_from_sitemap_force(self, mocker):
+        Document.objects.create(
+            release=self.release,
+            metadata={"parents": DocumentationCategory.WEBSITE},
+            path="some_path",
+        )
+        blog_entry = Entry.objects.create(
+            pub_date=timezone.now() - datetime.timedelta(days=2),
+            slug="a",
+            body="<strong>test</strong>",
+            content_format=ContentFormat.HTML,
+            is_active=True,
+        )
+        blog_url = blog_entry.get_absolute_url()
+        Document.objects.create(
+            release=self.release,
+            metadata={"parents": DocumentationCategory.WEBSITE},
+            path=blog_url,
+        )
+        mocker.get(
+            blog_url,
+            text="<html><main>Main 1</main><h1>Title 1</h1></html>",
+            headers={"Content-Type": "text/html"},
+        )
+        self.release.sync_from_sitemap(force=True)
+
+        self.assertEqual(Document.objects.count(), 1)
+
+        document = Document.objects.get(release=self.release, path=blog_url)
+        # Confirm Document has been updated.
+        self.assertEqual(
+            document.path,
+            blog_url,
+        )
+        self.assertEqual(
+            document.title,
+            "Title 1",
+        )
+        self.assertEqual(
+            document.metadata,
+            {
+                "body": "Main 1",
+                "breadcrumbs": [
+                    {"path": DocumentationCategory.WEBSITE, "title": "Website"}
+                ],
+                "parents": DocumentationCategory.WEBSITE,
+                "title": "Title 1",
+                "toc": "",
+            },
+        )
diff --git a/docs/tests/test_templates.py b/docs/tests/test_templates.py
index 66f221eeff..eb5e33f763 100644
--- a/docs/tests/test_templates.py
+++ b/docs/tests/test_templates.py
@@ -2,10 +2,13 @@
 import shutil
 import tempfile
 from pathlib import Path
+from unittest.mock import Mock
 
+from django.conf import settings
 from django.template import Context, Template
 from django.template.loader import render_to_string
 from django.test import RequestFactory, TestCase
+from django_hosts.resolvers import reverse as reverse_with_host
 
 from releases.models import Release
 
@@ -27,8 +30,16 @@ def test_get_all_doc_versions_empty(self):
     def test_get_all_doc_versions(self):
         tmp_docs_build_root = Path(tempfile.mkdtemp())
         self.addCleanup(shutil.rmtree, tmp_docs_build_root)
-        os.makedirs(tmp_docs_build_root.joinpath("en", "1.8", "_built", "json"))
-        os.makedirs(tmp_docs_build_root.joinpath("en", "1.11", "_built", "json"))
+        os.makedirs(
+            tmp_docs_build_root.joinpath(
+                settings.DEFAULT_LANGUAGE_CODE, "1.8", "_built", "json"
+            )
+        )
+        os.makedirs(
+            tmp_docs_build_root.joinpath(
+                settings.DEFAULT_LANGUAGE_CODE, "1.11", "_built", "json"
+            )
+        )
         with self.settings(DOCS_BUILD_ROOT=tmp_docs_build_root):
             self.assertEqual(get_all_doc_versions({}), ["1.8", "1.11", "dev"])
 
@@ -193,7 +204,7 @@ class TemplateTestCase(TestCase):
     def _assertOGTitleEqual(self, doc, expected):
         output = render_to_string(
             "docs/doc.html",
-            {"doc": doc, "lang": "en", "version": "5.0"},
+            {"doc": doc, "lang": settings.DEFAULT_LANGUAGE_CODE, "version": "5.0"},
             request=RequestFactory().get("/"),
         )
         self.assertInHTML(f'<meta property="og:title" content="{expected}" />', output)
@@ -201,7 +212,7 @@ def _assertOGTitleEqual(self, doc, expected):
     def test_opengraph_title(self):
         doc = Document.objects.create(
             release=DocumentRelease.objects.create(
-                lang="en",
+                lang=settings.DEFAULT_LANGUAGE_CODE,
                 release=Release.objects.create(version="5.0"),
             ),
         )
@@ -216,3 +227,39 @@ def test_opengraph_title(self):
             doc.title = title
             with self.subTest(title=title):
                 self._assertOGTitleEqual(doc, f"{expected} | Django documentation")
+
+
+class TemplateTagTestCase(TestCase):
+    def test_search_form_renders_without_request_in_template(self):
+        """
+        Ensures the tag doesn't crash when rendered inside a template that
+        lacks a 'request' variable e.g. during Django's built-in error views.
+        """
+        template = Template("{% load docs %}{% search_form %}")
+        rendered = template.render(Context({}))
+        self.assertIn(
+            '<search class="search form-input" aria-labelledby="docs-search-label">',
+            rendered,
+        )
+        docs_search_url = reverse_with_host(
+            "document-search",
+            host="docs",
+            kwargs={"lang": settings.DEFAULT_LANGUAGE_CODE, "version": "dev"},
+        )
+        self.assertIn(f'<form action="{docs_search_url}">', rendered)
+
+    def test_search_form_queries_multiple_renders(self):
+        r2 = Release.objects.create(version="2.0")
+        DocumentRelease.objects.create(
+            lang=settings.DEFAULT_LANGUAGE_CODE, release=r2, is_default=True
+        )
+        template = Template("{% load docs %}{% search_form %}{% search_form %}")
+        with self.assertNumQueries(1):
+            rendered = template.render(Context({"request": Mock()}))
+
+        docs_search_url = reverse_with_host(
+            "document-search",
+            host="docs",
+            kwargs={"lang": settings.DEFAULT_LANGUAGE_CODE, "version": "2.0"},
+        )
+        self.assertEqual(rendered.count(f'<form action="{docs_search_url}">'), 2)
diff --git a/docs/tests/test_utils.py b/docs/tests/test_utils.py
index 4ab650020a..f676540b08 100644
--- a/docs/tests/test_utils.py
+++ b/docs/tests/test_utils.py
@@ -3,7 +3,7 @@
 
 from django.test import SimpleTestCase
 
-from ..utils import get_doc_path, sanitize_for_trigram
+from ..utils import extract_inner_html, get_doc_path, sanitize_for_trigram
 
 
 class TestUtils(SimpleTestCase):
@@ -38,3 +38,39 @@ def test_sanitize_for_trigram(self):
         ]:
             with self.subTest(query=query):
                 self.assertEqual(sanitize_for_trigram(query), sanitized_query)
+
+    def test_extract_inner_html(self):
+        for html, expected_output in [
+            ("<main><p>Hello</p></main>", "<p>Hello</p>"),
+            (
+                '<header>Test</header><main id="app" class="container">'
+                "<h1>Title</h1></main>",
+                "<h1>Title</h1>",
+            ),
+            ("<main>&amp; &lt; &gt; &#169;</main>", "& < > ©"),
+            ("<main></main>", ""),
+            ("<main>Hello world</main>", "Hello world"),
+            ("<main><h1>Hi</h1>Text<p>Bye</p></main>", "<h1>Hi</h1>Text<p>Bye</p>"),
+        ]:
+            with self.subTest(html=html):
+                self.assertEqual(extract_inner_html(html, tag="main"), expected_output)
+
+    def test_extract_inner_html_multiple_same_tags_raises(self):
+        with self.assertRaisesMessage(
+            ValueError, "<main> occurs more than once in HTML."
+        ):
+            extract_inner_html(
+                "<main>One main</main><main id='dupe'>Two main</main>", tag="main"
+            )
+
+    def test_extract_inner_html_multiple_same_tags_nested_raises(self):
+        with self.assertRaisesMessage(
+            ValueError, "Nested <main> tags are not allowed."
+        ):
+            extract_inner_html(
+                "<main>One main<main id='dupe'>Two main</main></main>", tag="main"
+            )
+
+    def test_extract_inner_html_tag_not_found_raises(self):
+        with self.assertRaisesMessage(ValueError, "<main> not found in HTML."):
+            extract_inner_html("<p>Test</p>", tag="main")
diff --git a/docs/tests/test_views.py b/docs/tests/test_views.py
index b72603a950..d811ddfec3 100644
--- a/docs/tests/test_views.py
+++ b/docs/tests/test_views.py
@@ -1,8 +1,10 @@
 from http import HTTPStatus
 
+from django.conf import settings
 from django.contrib.sites.models import Site
 from django.test import SimpleTestCase, TestCase
 from django.urls import reverse, set_urlconf
+from django.utils.translation import activate, gettext as _
 from django_hosts.resolvers import reverse as reverse_with_host
 
 from djangoproject.urls import www as www_urls
@@ -83,6 +85,10 @@ def test_empty_get(self):
             "/en/dev/search/", headers={"host": "docs.djangoproject.localhost:8000"}
         )
         self.assertEqual(response.status_code, 200)
+        # No header item is active.
+        self.assertNotContains(response, '<li class="active">')
+        # The search result page does not have the Documentation banner.
+        self.assertNotContains(response, '<div class="copy-banner">')
 
     def test_search_type_filter_all(self):
         response = self.client.get(
@@ -90,9 +96,7 @@ def test_search_type_filter_all(self):
             headers={"host": "docs.djangoproject.localhost:8000"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertContains(
-            response, "4 results for <em>generic</em> in version 5.1", html=True
-        )
+        self.assertContains(response, "5 results for <em>generic</em>", html=True)
         self.assertContains(response, self.active_filter, count=1)
         self.assertContains(response, f"{self.active_filter}All</a>", html=True)
 
@@ -106,7 +110,7 @@ def test_search_type_filter_by_doc_types(self):
                 self.assertEqual(response.status_code, 200)
                 self.assertContains(
                     response,
-                    "1 result for <em>generic</em> in version 5.1",
+                    "1 result for <em>generic</em>",
                     html=True,
                 )
                 self.assertContains(response, self.active_filter, count=1)
@@ -121,9 +125,7 @@ def test_search_category_filter_invalid_doc_categories(self):
             headers={"host": "docs.djangoproject.localhost:8000"},
         )
         self.assertEqual(response.status_code, 200)
-        self.assertContains(
-            response, "4 results for <em>generic</em> in version 5.1", html=True
-        )
+        self.assertContains(response, "5 results for <em>generic</em>", html=True)
         self.assertContains(response, self.active_filter, count=1)
         self.assertContains(response, f"{self.active_filter}All</a>", html=True)
 
@@ -137,12 +139,28 @@ def test_search_category_filter_no_results(self):
         self.assertContains(
             response, f"{self.active_filter}API Reference</a>", html=True
         )
+        self.assertContains(response, "0 results for <em>potato</em>", html=True)
+        self.assertContains(
+            response,
+            'Please try searching <a href="?q=potato">all results</a>.',
+            html=True,
+        )
+
+    def test_search_website_category_french(self):
+        DocumentRelease.objects.create(release=self.release, lang="fr")
+        response = self.client.get(
+            "/fr/5.1/search/?q=potato&category=website",
+            headers={"host": "docs.djangoproject.localhost:8000"},
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, self.active_filter, count=1)
+        activate("fr")
         self.assertContains(
-            response, "0 results for <em>potato</em> in version 5.1", html=True
+            response, f"{self.active_filter}{_('Django Website')}</a>", html=True
         )
         self.assertContains(
             response,
-            'Please try searching <a href="?q=potato">all documentation results</a>.',
+            _("The website content can only be searched in English."),
             html=True,
         )
 
@@ -198,7 +216,11 @@ def test_code_links(self):
         base_url = reverse_with_host(
             "document-detail",
             host="docs",
-            kwargs={"lang": "en", "version": "5.1", "url": "refs/query"},
+            kwargs={
+                "lang": settings.DEFAULT_LANGUAGE_CODE,
+                "version": "5.1",
+                "url": "refs/query",
+            },
         )
         for query, expected_code_links in [
             (
@@ -225,7 +247,7 @@ def test_code_links(self):
                 self.assertEqual(response.status_code, 200)
                 self.assertContains(
                     response,
-                    f"1 result for <em>{query}</em> in version 5.1",
+                    f"1 result for <em>{query}</em>",
                     html=True,
                 )
                 self.assertContains(response, expected_code_links, html=True)
@@ -246,14 +268,24 @@ def test_sitemap_index(self):
         )
         self.assertContains(response, "<sitemap>", count=2)
         en_sitemap_url = reverse_with_host(
-            "document-sitemap", host="docs", kwargs={"section": "en"}
+            "document-sitemap",
+            host="docs",
+            kwargs={"section": settings.DEFAULT_LANGUAGE_CODE},
         )
         self.assertContains(response, f"<loc>{en_sitemap_url}</loc>")
 
     def test_sitemap(self):
         doc_release = DocumentRelease.objects.create()
-        document = Document.objects.create(release=doc_release)
-        sitemap = DocsSitemap("en")
+        document = Document.objects.create(
+            release=doc_release,
+            metadata={"parents": DocumentationCategory.TOPICS},
+        )
+        Document.objects.create(
+            release=doc_release,
+            metadata={"parents": DocumentationCategory.WEBSITE},
+            path="example",
+        )
+        sitemap = DocsSitemap(settings.DEFAULT_LANGUAGE_CODE)
         urls = sitemap.get_urls()
         self.assertEqual(len(urls), 1)
         url_info = urls[0]
diff --git a/docs/utils.py b/docs/utils.py
index 500104df9c..b031867dcb 100644
--- a/docs/utils.py
+++ b/docs/utils.py
@@ -1,5 +1,6 @@
 import re
 import unicodedata
+from html.parser import HTMLParser
 
 from django.conf import settings
 from django.http import Http404
@@ -92,3 +93,59 @@ def get_module_path(name, full_path):
     if full_path.endswith(name_suffix):
         return full_path.removesuffix(name_suffix)
     return None
+
+
+class SingleTagInnerHTMLExtractor(HTMLParser):
+    def __init__(self, target_tag):
+        super().__init__()
+        self.target_tag = target_tag.lower()
+        self.capturing = False
+        self.inner_html = []
+        self.tag_count = 0
+
+    def handle_starttag(self, tag, attrs):
+        tag = tag.lower()
+        if tag == self.target_tag:
+            self.tag_count += 1
+            if self.capturing:
+                # Nested target tag not allowed.
+                raise ValueError(f"Nested <{self.target_tag}> tags are not allowed.")
+            self.capturing = True
+        elif self.capturing:
+            self.inner_html.append(self.get_starttag_text())
+
+    def handle_endtag(self, tag):
+        tag = tag.lower()
+        if self.capturing:
+            if tag == self.target_tag:
+                self.capturing = False
+            else:
+                self.inner_html.append(f"</{tag}>")
+
+    def handle_data(self, data):
+        if self.capturing:
+            self.inner_html.append(data)
+
+    def handle_entityref(self, name):
+        if self.capturing:
+            self.inner_html.append(f"&{name};")
+
+    def handle_charref(self, name):
+        if self.capturing:
+            self.inner_html.append(f"&#{name};")
+
+
+def extract_inner_html(html, tag):
+    """
+    Extracts the inner HTML of a tag that appears exactly once.
+    """
+    parser = SingleTagInnerHTMLExtractor(tag)
+    parser.feed(html)
+    parser.close()
+
+    if parser.tag_count == 0:
+        raise ValueError(f"<{tag}> not found in HTML.")
+    if parser.tag_count > 1:
+        raise ValueError(f"<{tag}> occurs more than once in HTML.")
+
+    return "".join(parser.inner_html)
diff --git a/docs/views_debug.py b/docs/views_debug.py
index f2813211c8..0bd405e9cc 100644
--- a/docs/views_debug.py
+++ b/docs/views_debug.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.views import static
 
 from .models import DocumentRelease
@@ -24,5 +25,7 @@ def objects_inventory(request, lang, version):
 
 def pot_file(request, pot_name):
     version = DocumentRelease.objects.current().version
-    doc_root = get_doc_root_or_404("en", version, builder="gettext")
+    doc_root = get_doc_root_or_404(
+        settings.DEFAULT_LANGUAGE_CODE, version, builder="gettext"
+    )
     return static.serve(request, document_root=doc_root, path=pot_name)
diff --git a/foundation/tests.py b/foundation/tests.py
index 38569f3756..3b1a88acb7 100644
--- a/foundation/tests.py
+++ b/foundation/tests.py
@@ -5,12 +5,15 @@
 from django.urls import reverse
 from djmoney.money import Money
 
+from djangoproject.tests import ReleaseMixin
+
 from .models import ApprovedGrant, BoardMember, Business, Meeting, Office, Term
 
 
-class MeetingTestCase(TestCase):
+class MeetingTestCase(ReleaseMixin, TestCase):
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         cls.user = User.objects.create_superuser(
             "admin", "admin@example.com", "password"
         )
diff --git a/fundraising/tests/test_views.py b/fundraising/tests/test_views.py
index aca9d85903..c748ae72ca 100644
--- a/fundraising/tests/test_views.py
+++ b/fundraising/tests/test_views.py
@@ -12,19 +12,20 @@
 from django_hosts.resolvers import reverse as django_hosts_reverse
 from django_recaptcha.client import RecaptchaResponse
 
+from djangoproject.tests import ReleaseMixin
 from members.models import CorporateMember, Invoice
 
 from ..models import DjangoHero, Donation
 from .utils import ImageFileFactory, TemporaryMediaRootMixin
 
 
-class TestIndex(TestCase):
+class TestIndex(ReleaseMixin, TestCase):
     def test_redirect(self):
         response = self.client.get(reverse("fundraising:index"))
         self.assertEqual(response.status_code, 200)
 
 
-class TestCampaign(TemporaryMediaRootMixin, TestCase):
+class TestCampaign(ReleaseMixin, TemporaryMediaRootMixin, TestCase):
     def setUp(self):
         self.index_url = reverse("fundraising:index")
 
@@ -163,7 +164,7 @@ def test_cancel_already_cancelled_donation(self, retrieve_customer):
         self.assertFalse(retrieve_customer.called)
 
 
-class TestThankYou(TestCase):
+class TestThankYou(ReleaseMixin, TestCase):
     def setUp(self):
         self.url = reverse("fundraising:thank-you")
 
@@ -172,11 +173,12 @@ def test_template(self):
         self.assertTemplateUsed(response, "fundraising/thank-you.html")
 
 
-class TestManageDonations(TestCase):
+class TestManageDonations(ReleaseMixin, TestCase):
     past_donations_header = "<h2>Your past donations</h2>"
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         cls.hero = DjangoHero.objects.create()
         cls.donation1 = cls.hero.donation_set.create(
             interval="onetime",
@@ -249,7 +251,7 @@ def _stripe_signature_header(data):
     return f"t={timestamp},v1={signature}"
 
 
-class TestWebhooks(TestCase):
+class TestWebhooks(ReleaseMixin, TestCase):
     def setUp(self):
         self.hero = DjangoHero.objects.create(email="hero@djangoproject.com")
         self.donation = Donation.objects.create(
diff --git a/legacy/tests.py b/legacy/tests.py
index ca35fb7897..b89e4f3f60 100644
--- a/legacy/tests.py
+++ b/legacy/tests.py
@@ -1,8 +1,10 @@
 from django.test import TestCase, override_settings
 
+from djangoproject.tests import ReleaseMixin
+
 
 @override_settings(ROOT_URLCONF="legacy.urls")
-class LegacyTests(TestCase):
+class LegacyTests(ReleaseMixin, TestCase):
     def test_gone(self):
         response = self.client.get("/comments/")
         self.assertEqual(response.status_code, 410)
diff --git a/members/test_views.py b/members/test_views.py
index 579c03b83a..ed42415509 100644
--- a/members/test_views.py
+++ b/members/test_views.py
@@ -3,15 +3,18 @@
 from django.test import TestCase
 from django.urls import reverse
 
+from djangoproject.tests import ReleaseMixin
+
 from .models import CorporateMember, IndividualMember, Team
 from .utils import get_temporary_image
 
 
-class IndividualMemberListViewTests(TestCase):
+class IndividualMemberListViewTests(ReleaseMixin, TestCase):
     url = reverse("members:individual-members")
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         IndividualMember.objects.create(
             name="DjangoDeveloper", email="developer@example.com"
         )
@@ -37,11 +40,12 @@ def test_view_should_only_render_former_members_once(self):
         self.assertContains(response, "FormerDjangoDeveloper", count=1)
 
 
-class CorporateMemberListViewTests(TestCase):
+class CorporateMemberListViewTests(ReleaseMixin, TestCase):
     url = reverse("members:corporate-members")
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         cls.today = today = date.today()
         cls.member = CorporateMember.objects.create(
             display_name="Corporation",
@@ -90,7 +94,7 @@ def test_view_renders_orgs_by_tier(self):
         self.assertSequenceEqual(members["silver"], [self.member, member])
 
 
-class CorporateMemberJoinViewTests(TestCase):
+class CorporateMemberJoinViewTests(ReleaseMixin, TestCase):
     def test_get(self):
         response = self.client.get(reverse("members:corporate-members-join"))
         self.assertContains(response, "Become a DSF corporate member")
@@ -117,9 +121,10 @@ def test_submit_success(self):
         self.assertEqual(member.invoice_set.get().amount, data["amount"])
 
 
-class CorporateMemberRenewalViewTests(TestCase):
+class CorporateMemberRenewalViewTests(ReleaseMixin, TestCase):
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         cls.member = CorporateMember.objects.create(
             display_name="Corporation",
             contact_email="c@example.com",
@@ -137,11 +142,12 @@ def test_invalid_token(self):
         self.assertEqual(response.status_code, 404)
 
 
-class TeamListViewTests(TestCase):
+class TeamListViewTests(ReleaseMixin, TestCase):
     url = reverse("members:teams")
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         dev = IndividualMember.objects.create(
             name="DjangoDeveloper",
             email="developer@example.com",
diff --git a/releases/templatetags/release_notes.py b/releases/templatetags/release_notes.py
index 4d2fd45bc5..4e9d6cced0 100644
--- a/releases/templatetags/release_notes.py
+++ b/releases/templatetags/release_notes.py
@@ -1,4 +1,5 @@
 from django import template
+from django.conf import settings
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
 from django_hosts.resolvers import reverse
@@ -26,7 +27,7 @@ def release_notes(version, show_version=False):
             "document-detail",
             host="docs",
             kwargs={
-                "lang": "en",
+                "lang": settings.DEFAULT_LANGUAGE_CODE,
                 "version": version_x_dot_y,
                 "url": release_notes_path,
             },
diff --git a/releases/tests.py b/releases/tests.py
index 3147b188f7..da7d893f2c 100644
--- a/releases/tests.py
+++ b/releases/tests.py
@@ -12,6 +12,7 @@
 from django.urls import reverse
 from django.utils.safestring import SafeString
 
+from djangoproject.tests import ReleaseMixin
 from members.models import MEMBERSHIP_LEVELS, PLATINUM_MEMBERSHIP, CorporateMember
 
 from .models import Release, upload_to_artifact, upload_to_checksum
@@ -538,9 +539,10 @@ def test_redirect_is_not_published(self):
                     self.assertEqual(response.status_code, status_code)
 
 
-class CorporateMembersTestCase(TestCase):
+class CorporateMembersTestCase(ReleaseMixin, TestCase):
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         cls.today = today = datetime.date.today()
         day = datetime.timedelta(1)
         Release.objects.create(
@@ -609,10 +611,11 @@ def test_no_diamond_and_platinum_members(self):
             self.assertNotContains(response, member.description)
 
 
-class RoadmapViewTestCase(TestCase):
+class RoadmapViewTestCase(ReleaseMixin, TestCase):
 
     @classmethod
     def setUpTestData(cls):
+        super().setUpTestData()
         # Define release schedule for 5.2, 6.0, and 6.1 series.
         cls.release_schedule = {
             "5.2": [
diff --git a/svntogit/tests.py b/svntogit/tests.py
index 5d69100e34..61e4e7af66 100644
--- a/svntogit/tests.py
+++ b/svntogit/tests.py
@@ -1,7 +1,9 @@
 from django.test import TestCase
 
+from djangoproject.tests import ReleaseMixin
 
-class SvnToGitTests(TestCase):
+
+class SvnToGitTests(ReleaseMixin, TestCase):
     def test_redirect(self):
         response = self.client.get("/svntogit/1/", follow=False)
         target = "https://github.com/django/django/commit/d6ded0e91b"
diff --git a/tracdb/tests.py b/tracdb/tests.py
index 6185a8b0db..88349b315d 100644
--- a/tracdb/tests.py
+++ b/tracdb/tests.py
@@ -5,6 +5,8 @@
 from django.test import SimpleTestCase, TestCase
 from django.urls import reverse
 
+from djangoproject.tests import ReleaseMixin
+
 from .models import (
     Attachment,
     Milestone,
@@ -29,7 +31,7 @@ def test_router(self):
         self.assertEqual(Revision.objects.db, "trac")
 
 
-class TicketTestCase(TracDBCreateDatabaseMixin, TestCase):
+class TicketTestCase(TracDBCreateDatabaseMixin, ReleaseMixin, TestCase):
     databases = {"default", "trac"}
 
     def _create_ticket(self, custom=None, **kwargs):