p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[2.1.x] Fixed utils.html.escape()'s docs with regards to string coercion. 

As of 301de774c2.
Backport of 1ed8527e3d from master
This commit is contained in:
Claude Paroz 2018-07-18 20:15:42 +02:00 committed by Tim Graham
parent 16fdcf67c8
commit e9950ed897
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/ref/utils.txt
View File

@ -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)