From 9afeb6b9b6d4e025306c918e7e717288049cbdfd Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Sat, 18 Nov 2023 15:56:29 +0100
Subject: [PATCH] [4.2.x] Refs #34118 -- Doc'd Python 3.12 compatibility in
 Django 4.2.x.

Backport of ecfea054ee2b8ddfa027459ff8b6aecba05facf7 from main.
---
 docs/faq/install.txt         | 2 +-
 docs/intro/reusable-apps.txt | 3 +++
 docs/releases/4.2.8.txt      | 3 ++-
 docs/releases/4.2.txt        | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index fc19dda0ab..6642b200ca 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -53,7 +53,7 @@ Django version Python versions
 3.2            3.6, 3.7, 3.8, 3.9, 3.10 (added in 3.2.9)
 4.0            3.8, 3.9, 3.10
 4.1            3.8, 3.9, 3.10, 3.11 (added in 4.1.3)
-4.2            3.8, 3.9, 3.10, 3.11
+4.2            3.8, 3.9, 3.10, 3.11, 3.12 (added in 4.2.8)
 ============== ===============
 
 For each version of Python, only the latest micro release (A.B.C) is officially
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 4ae51896e1..dba37286d3 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -221,6 +221,9 @@ this. For a small app like polls, this process isn't too difficult.
             Programming Language :: Python :: 3 :: Only
             Programming Language :: Python :: 3.8
             Programming Language :: Python :: 3.9
+            Programming Language :: Python :: 3.10
+            Programming Language :: Python :: 3.11
+            Programming Language :: Python :: 3.12
             Topic :: Internet :: WWW/HTTP
             Topic :: Internet :: WWW/HTTP :: Dynamic Content
 
diff --git a/docs/releases/4.2.8.txt b/docs/releases/4.2.8.txt
index 2229324362..5c2d089b7f 100644
--- a/docs/releases/4.2.8.txt
+++ b/docs/releases/4.2.8.txt
@@ -4,7 +4,8 @@ Django 4.2.8 release notes
 
 *Expected December 4, 2023*
 
-Django 4.2.8 fixes several bugs in 4.2.7.
+Django 4.2.8 fixes several bugs in 4.2.7 and adds compatibility with Python
+3.12.
 
 Bugfixes
 ========
diff --git a/docs/releases/4.2.txt b/docs/releases/4.2.txt
index aeda95d7af..59f144a15c 100644
--- a/docs/releases/4.2.txt
+++ b/docs/releases/4.2.txt
@@ -23,8 +23,9 @@ end in April 2024.
 Python compatibility
 ====================
 
-Django 4.2 supports Python 3.8, 3.9, 3.10, and 3.11. We **highly recommend**
-and only officially support the latest release of each series.
+Django 4.2 supports Python 3.8, 3.9, 3.10, 3.11, and 3.12 (as of 4.2.8). We
+**highly recommend** and only officially support the latest release of each
+series.
 
 .. _whats-new-4.2: