mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-29 22:19:13 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
As of 301de774c21d055e9e5a7073e5bffdb52bc71079.
Backport of 1ed8527e3df930ae54ef237e77f1a53faa0ff5ed 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) .. function:: escape(text)
Returns the given text with ampersands, quotes and angle brackets encoded Returns the given text with ampersands, quotes and angle brackets encoded
for use in HTML. The input is first passed through for use in HTML. The input is first coerced to a string and the output has
:func:`~django.utils.encoding.force_text` and the output has
:func:`~django.utils.safestring.mark_safe` applied. :func:`~django.utils.safestring.mark_safe` applied.
.. function:: conditional_escape(text) .. function:: conditional_escape(text)