From e9950ed897fba3a98dd1221ad9e9b610bb5bc0c1 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 18 Jul 2018 20:15:42 +0200 Subject: [PATCH] [2.1.x] Fixed utils.html.escape()'s docs with regards to string coercion. As of 301de774c21d055e9e5a7073e5bffdb52bc71079. Backport of 1ed8527e3df930ae54ef237e77f1a53faa0ff5ed from master --- docs/ref/utils.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index d48ea27009..63b2e3be4b 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -589,8 +589,7 @@ escaping HTML. .. function:: escape(text) Returns the given text with ampersands, quotes and angle brackets encoded - for use in HTML. The input is first passed through - :func:`~django.utils.encoding.force_text` and the output has + for use in HTML. The input is first coerced to a string and the output has :func:`~django.utils.safestring.mark_safe` applied. .. function:: conditional_escape(text)