From 6cbee65e1fdc193bf762321a5f2e805afd736325 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Wed, 22 Jul 2026 15:50:58 -0400 Subject: [PATCH 1/2] Added expected end of support dates for 6.1. --- docs/releases/6.1.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/releases/6.1.txt b/docs/releases/6.1.txt index 7614a23ce4a5..4316a00dba04 100644 --- a/docs/releases/6.1.txt +++ b/docs/releases/6.1.txt @@ -15,6 +15,9 @@ want to be aware of when upgrading from Django 6.0 or earlier. We've See the :doc:`/howto/upgrade-version` guide if you're updating an existing project. +Mainstream support is expected to end in April 2027. Extended support is +expected to end in December 2027. + Python compatibility ==================== From 21b3a4c4c528ca827adda14b6c4cf045afba6d4f Mon Sep 17 00:00:00 2001 From: James Aylett Date: Sun, 1 Mar 2026 15:54:57 +0000 Subject: [PATCH 2/2] Fixed #36925 -- Listed further shared features for InlineModelAdmin. --- docs/ref/contrib/admin/index.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index ef448c6f7904..0d449a52b6f5 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -2335,6 +2335,9 @@ adds some of its own (the shared features are actually defined in the - :meth:`~ModelAdmin.get_queryset` - :attr:`~ModelAdmin.radio_fields` - :attr:`~ModelAdmin.readonly_fields` +- :attr:`~ModelAdmin.view_on_site` +- :attr:`~ModelAdmin.empty_value_display` +- :attr:`~ModelAdmin.autocomplete_fields` - :attr:`~InlineModelAdmin.raw_id_fields` - :meth:`~ModelAdmin.formfield_for_choice_field` - :meth:`~ModelAdmin.formfield_for_foreignkey`