diff options
| author | Claude Paroz <claude@2xlibre.net> | 2018-07-18 20:15:42 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-07-18 14:20:17 -0400 |
| commit | e9950ed897fba3a98dd1221ad9e9b610bb5bc0c1 (patch) | |
| tree | 054aa8ad8c86afefdc48989ab339d19510591976 /docs/ref/utils.txt | |
| parent | 16fdcf67c8a26ba1d14dc3c8d608edb4a7febc0d (diff) | |
[2.1.x] Fixed utils.html.escape()'s docs with regards to string coercion.
As of 301de774c21d055e9e5a7073e5bffdb52bc71079.
Backport of 1ed8527e3df930ae54ef237e77f1a53faa0ff5ed from master
Diffstat (limited to 'docs/ref/utils.txt')
| -rw-r--r-- | docs/ref/utils.txt | 3 |
1 files changed, 1 insertions, 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) |