From b9101fa7a2180f121fc828174149b61e9151e69d Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Thu, 15 Jan 2015 08:24:54 +0000
Subject: [PATCH] [1.6.x] Direct readers to format_html() in mark_safe() docs.

Backport of 4832c004e88a68b98b976b4f68a1c9fdb4ea3530 from master
---
 docs/ref/utils.txt | 3 +++
 1 file changed, 3 insertions(+)

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>   '