summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2024-12-12 17:01:49 +0100
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2025-01-15 22:28:37 +0100
commit1e331911a88f289f52e3d81340e209d0b78abdbb (patch)
tree024e5262f039d73f86eacf8251ee0cdedbf7186b /docs
parent8081557508b197af975e0c6306d9b2af5e57d477 (diff)
Refs #34609 -- Removed support for calling format_html() without arguments per deprecation timeline.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/utils.txt5
-rw-r--r--docs/releases/6.0.txt3
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 72e7eb31c8..3f72672622 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -687,11 +687,6 @@ escaping HTML.
through :func:`conditional_escape` which (ultimately) calls
:func:`~django.utils.encoding.force_str` on the values.
- .. deprecated:: 5.0
-
- Support for calling ``format_html()`` without passing args or kwargs is
- deprecated.
-
.. function:: format_html_join(sep, format_string, args_generator)
A wrapper of :func:`format_html`, for the common case of a group of
diff --git a/docs/releases/6.0.txt b/docs/releases/6.0.txt
index 865c11b47b..5a58dcf599 100644
--- a/docs/releases/6.0.txt
+++ b/docs/releases/6.0.txt
@@ -265,6 +265,9 @@ to remove usage of these features.
* ``request`` is required in the signature of ``ModelAdmin.lookup_allowed()``
subclasses.
+* Support for calling ``format_html()`` without passing args or kwargs is
+ removed.
+
See :ref:`deprecated-features-5.1` for details on these changes, including how
to remove usage of these features.