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 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"])