From b3df75339904fb0bc5742d0b458ac59b8e68835b Mon Sep 17 00:00:00 2001
From: nessita <124304+nessita@users.noreply.github.com>
Date: Wed, 23 Apr 2025 17:26:48 -0300
Subject: [PATCH] [4.2.x] Refs #36341 -- Added release note for 4.2.21 for fix
 in wordwrap template filter.

Revision 1e9db35836d42a3c72f3d1015c2f302eb6fee046 fixed a regression in
55d89e25f4115c5674cdd9b9bcba2bb2bb6d820b, which also needs to be
backported to the stable branches in extended support.

Backport of c86242d61ff81bddbead115c458c1eb532d43b43 from main.
---
 docs/releases/4.2.21.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/releases/4.2.21.txt b/docs/releases/4.2.21.txt
index 36e24df12f..1064dcf202 100644
--- a/docs/releases/4.2.21.txt
+++ b/docs/releases/4.2.21.txt
@@ -4,7 +4,7 @@ Django 4.2.21 release notes
 
 *Expected May 7, 2025*
 
-Django 4.2.21 fixes a data loss bug in 4.2.20.
+Django 4.2.21 fixes a data loss bug and a regression in 4.2.20.
 
 Bugfixes
 ========
@@ -13,3 +13,8 @@ Bugfixes
   ``allow_overwrite=True``, where leftover content from a previously larger
   file could remain after overwriting with a smaller one due to lack of
   truncation (:ticket:`36298`).
+
+* Fixed a regression in Django 4.2.20, introduced when fixing
+  :cve:`2025-26699`, where the :tfilter:`wordwrap` template filter did not
+  preserve empty lines between paragraphs after wrapping text
+  (:ticket:`36341`).