summaryrefslogtreecommitdiff
path: root/django/utils/html.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-01-25 06:53:40 -0500
committerTim Graham <timograham@gmail.com>2013-01-25 06:53:40 -0500
commiteafc0364764ba12babd76194d8e1f78b876471ec (patch)
tree5040892ea4116794048304c7e03c6ce039dda12c /django/utils/html.py
parent1f6b2e7a658594e6ae9507c5f98eb429d19c0c9d (diff)
Fixed #19577 - Added HTML escaping to admin examples.
Thanks foo@ for the report and Florian Apolloner for the review.
Diffstat (limited to 'django/utils/html.py')
-rw-r--r--django/utils/html.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/html.py b/django/utils/html.py
index 25605bea04..ec7b28d330 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -87,8 +87,8 @@ def format_html(format_string, *args, **kwargs):
def format_html_join(sep, format_string, args_generator):
"""
- A wrapper format_html, for the common case of a group of arguments that need
- to be formatted using the same format string, and then joined using
+ A wrapper of format_html, for the common case of a group of arguments that
+ need to be formatted using the same format string, and then joined using
'sep'. 'sep' is also passed through conditional_escape.
'args_generator' should be an iterator that returns the sequence of 'args'