From 65ab92f6a83644bbb555d0eff3a02d8d9301aba4 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Wed, 30 Jul 2025 02:50:16 +0200 Subject: [PATCH 1/2] Fixed writer_name deprecation warning in docutils 0.22+. --- django/contrib/admindocs/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py index f8e329a79d55..334d9907eaee 100644 --- a/django/contrib/admindocs/utils.py +++ b/django/contrib/admindocs/utils.py @@ -82,7 +82,7 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None): source % text, source_path=thing_being_parsed, destination_path=None, - writer_name="html", + writer="html", settings_overrides=overrides, ) return mark_safe(parts["fragment"]) From f96c8f07e45f56f1f72125aca7f33eb3092f51b3 Mon Sep 17 00:00:00 2001 From: nessita <124304+nessita@users.noreply.github.com> Date: Tue, 29 Jul 2025 21:51:33 -0300 Subject: [PATCH 2/2] Refs #36500 -- Ignored formatting changes in git blame. --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d979bc49b4cb..0ee1fa059b45 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,3 +8,6 @@ c18861804feb6a97afbeabb51be748dd60a04458 534ac4829764f317cf2fbc4a18354fcc998c1425 ba755ca13123d2691a0926ddb64e5d0a2906a880 14459f80ee3a9e005989db37c26fd13bb6d2fab2 +1ecf6889cabc9f3f60d3fdd651468cddd8f4da6e +69a93a88edb56ba47f624dac7a21aacc47ea474f +78298b51629e14c0e472898b635bc819d47b7f27