summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2015-01-15 08:24:54 +0000
committerLuke Plant <L.Plant.98@cantab.net>2015-01-15 08:32:32 +0000
commit57671dd0b91ed4def9c7a49c486944f4e98fed9d (patch)
treec63aad971cadb9030b4c84b508710147585fc17d
parent1d5dfd01ec56fe8bb5ee6648490fd4094139f7c8 (diff)
[1.5.x] Direct readers to format_html() in mark_safe() docs.
Backport of 4832c004e88a68b98b976b4f68a1c9fdb4ea3530 from master
-rw-r--r--docs/ref/utils.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 4f338be06b..f2baaddbf4 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -762,6 +762,9 @@ appropriate entities.
Can be called multiple times on a single string.
+ For building up fragments of HTML, you should normally be using
+ :func:`django.utils.html.format_html` instead.
+
String marked safe will become unsafe again if modified. For example::
>>> mystr = '<b>Hello World</b> '