From 42435fc55cbf7c04c1389ee46cc50e2565b40e37 Mon Sep 17 00:00:00 2001
From: Natalia <124304+nessita@users.noreply.github.com>
Date: Tue, 9 Apr 2024 17:45:30 -0300
Subject: [PATCH] Fixed #35361 -- Added release notes for 4.2.12 and 5.0.5 for
 backport of b231bcd19e57267ce1fc21d42d46f0b65fdcfcf8.

---
 docs/releases/4.2.12.txt | 14 ++++++++++++++
 docs/releases/5.0.5.txt  |  4 ++++
 docs/releases/index.txt  |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 docs/releases/4.2.12.txt

diff --git a/docs/releases/4.2.12.txt b/docs/releases/4.2.12.txt
new file mode 100644
index 0000000000..cd5b674476
--- /dev/null
+++ b/docs/releases/4.2.12.txt
@@ -0,0 +1,14 @@
+===========================
+Django 4.2.12 release notes
+===========================
+
+*Expected May 6, 2024*
+
+Django 4.2.12 fixes a bug in 4.2.11.
+
+Bugfixes
+========
+
+* Fixed a crash in Django 4.2 when validating email max line lengths with
+  content decoded using the ``surrogateescape`` error handling scheme,
+  particularly in Python versions 3.11.9+ and 3.12.3+ (:ticket:`35361`).
diff --git a/docs/releases/5.0.5.txt b/docs/releases/5.0.5.txt
index 506127b0ca..ab619c05ad 100644
--- a/docs/releases/5.0.5.txt
+++ b/docs/releases/5.0.5.txt
@@ -12,3 +12,7 @@ Bugfixes
 * Fixed a bug in Django 5.0 that caused a crash of ``Model.save()`` when
   creating an instance of a model with a ``GeneratedField`` and providing a
   primary key (:ticket:`35350`).
+
+* Fixed a crash in Django 5.0 when validating email max line lengths with
+  content decoded using the ``surrogateescape`` error handling scheme,
+  particularly in Python versions 3.11.9+ and 3.12.3+ (:ticket:`35361`).
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 19d3d9e458..928b4e0788 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -45,6 +45,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   4.2.12
    4.2.11
    4.2.10
    4.2.9