[1.8.x] Fixed #25963 -- Clarified render_to_response() context_instance deprecation.

Backport of 36d0aa43036090685cebe6c9f757631cdadb1400 from stable/1.9.x

2 files changed, 15 insertions, 1 deletions

diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index bab4f07f96..adc7df1531 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -1571,6 +1571,19 @@ pass a :class:`dict` in the ``context`` parameter instead. If you're passing a
 :class:`~django.template.RequestContext`, pass the request separately in the
 ``request`` parameter.
 
+If you're using ``context_instance=RequestContext(request))`` with
+``render_to_response()``, use :func:`django.shortcuts.render`, which always
+makes ``RequestContext`` available, instead. For example::
+
+    from django.shortcuts import render_to_response
+    from django.template import RequestContext
+    render_to_response('template.html', {...}, context_instance=RequestContext(request))
+
+becomes::
+
+    from django.shortcuts import render
+    render(request, 'template.html', {...})
+
 ``dirs`` argument of template-finding functions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index da95598f1c..4f418d7f69 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -162,7 +162,8 @@ Optional arguments
 
     .. deprecated:: 1.8
 
-       The ``context_instance`` argument is deprecated. Simply use ``context``.
+       The ``context_instance`` argument is deprecated. Use the :func:`render`
+       function instead which always makes ``RequestContext`` available.
 
 ``content_type``
     The MIME type to use for the resulting document. Defaults to the value of