summaryrefslogtreecommitdiff
path: root/docs
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:30:38 +0000
commitb9101fa7a2180f121fc828174149b61e9151e69d (patch)
tree0dfc56303bb456ee95393d7edb9102ccdb4401ca /docs
parent79df62f4d2254a1158f5fda4bfddbfcea570c735 (diff)
[1.6.x] Direct readers to format_html() in mark_safe() docs.
Backport of 4832c004e88a68b98b976b4f68a1c9fdb4ea3530 from master
Diffstat (limited to 'docs')
-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 22c6c9ee99..cb7c1e8012 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -804,6 +804,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> '