From bce5cc57e915914708f9cd4c8bd6bbc6a68195d4 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 26 Apr 2017 09:40:48 -0400
Subject: [PATCH] Fixed #28125 -- Clarified 1.11 release note about
 Template.render() prohibiting non-dict context.

---
 docs/releases/1.11.txt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 953a7a5493..023b55240e 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -601,14 +601,15 @@ Some widget values, such as ``<select>`` options, are now localized if
 widget templates that uses the :ttag:`localize` template tag to turn off
 localization.
 
-``django.Template.render()`` prohibits non-dict context
--------------------------------------------------------
+``django.template.backends.django.Template.render()`` prohibits non-dict context
+--------------------------------------------------------------------------------
 
-For compatibility with multiple template engines, ``django.Template.render()``
-must receive a dictionary of context rather than ``Context`` or
-``RequestContext``. If you were passing either of the two classes, pass a
-dictionary instead -- doing so is backwards-compatible with older versions of
-Django.
+For compatibility with multiple template engines,
+``django.template.backends.django.Template.render()`` (returned from high-level
+template loader APIs such as ``loader.get_template()``) must receive a
+dictionary of context rather than ``Context`` or ``RequestContext``. If you
+were passing either of the two classes, pass a dictionary instead -- doing so
+is backwards-compatible with older versions of Django.
 
 Model state changes in migration operations
 -------------------------------------------