summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-07-18 20:15:42 +0200
committerTim Graham <timograham@gmail.com>2018-07-18 14:15:42 -0400
commit1ed8527e3df930ae54ef237e77f1a53faa0ff5ed (patch)
tree8f2d18e1569b341ff2e1f454f2dd1ccfddb4f0cc /docs
parenta73cf8110e6cccbf46bf77fd4ddce2df99df53ca (diff)
Fixed utils.html.escape()'s docs with regards to string coercion.
As of 301de774c21d055e9e5a7073e5bffdb52bc71079.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/utils.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index a0bdf424ad..1350bd6af7 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)