Removed current_app argument to render() and TemplateResponse().

Per deprecation timeline.

4 files changed, 3 insertions, 35 deletions

diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index ecf984cdf3..8fbc7b1c99 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -189,7 +189,7 @@ TemplateResponse objects
 Methods
 -------
 
-.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, current_app=None, charset=None, using=None)
+.. method:: TemplateResponse.__init__(request, template, context=None, content_type=None, status=None, charset=None, using=None)
 
     Instantiates a :class:`~django.template.response.TemplateResponse` object
     with the given request, template, context, content type, HTTP status, and
@@ -224,16 +224,6 @@ Methods
     ``status``
         The HTTP status code for the response.
 
-    ``current_app``
-        A hint indicating which application contains the current view. See the
-        :ref:`namespaced URL resolution strategy <topics-http-reversing-url-namespaces>`
-        for more information.
-
-        .. deprecated:: 1.8
-
-           The ``current_app`` argument is deprecated. Instead you should set
-           ``request.current_app``.
-
     ``charset``
         The charset in which the response will be encoded. If not given it will
         be extracted from ``content_type``, and if that is unsuccessful, the
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 5f6e12934c..ba649aa60f 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -194,7 +194,7 @@ Once you have a compiled :class:`Template` object, you can render a context
 with it. You can reuse the same template to render it several times with
 different contexts.
 
-.. class:: Context(dict_=None, current_app=_current_app_undefined)
+.. class:: Context(dict_=None)
 
     This class lives at ``django.template.Context``. The constructor takes
     two optional arguments:
@@ -205,11 +205,6 @@ different contexts.
       to help :ref:`resolve namespaced URLs<topics-http-reversing-url-namespaces>`.
       If you're not using namespaced URLs, you can ignore this argument.
 
-      .. deprecated:: 1.8
-
-          The ``current_app`` argument is deprecated. If you need it, you must
-          now use a :class:`RequestContext` instead of a :class:`Context`.
-
     For details, see :ref:`playing-with-context` below.
 
 .. method:: Template.render(context)
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index ab8c237ee9..43b5ef5868 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -15,7 +15,7 @@ introduce controlled coupling for convenience's sake.
 ``render``
 ==========
 
-.. function:: render(request, template_name, context=None, context_instance=_context_instance_undefined, content_type=None, status=None, current_app=_current_app_undefined, dirs=_dirs_undefined, using=None)
+.. function:: render(request, template_name, context=None, context_instance=_context_instance_undefined, content_type=None, status=None, dirs=_dirs_undefined, using=None)
 
    Combines a given template with a given context dictionary and returns an
    :class:`~django.http.HttpResponse` object with that rendered text.
@@ -67,16 +67,6 @@ Optional arguments
 ``status``
     The status code for the response. Defaults to ``200``.
 
-``current_app``
-    A hint indicating which application contains the current view. See the
-    :ref:`namespaced URL resolution strategy <topics-http-reversing-url-namespaces>`
-    for more information.
-
-    .. deprecated:: 1.8
-
-       The ``current_app`` argument is deprecated. Instead you should set
-       ``request.current_app``.
-
 ``using``
     The :setting:`NAME <TEMPLATES-NAME>` of a template engine to use for
     loading the template.
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index e48ac9d7ee..7bd8fc21a3 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -680,13 +680,6 @@ the fully qualified name into parts and then tries the following lookup:
    setting the current application on the :attr:`request.current_app
    <django.http.HttpRequest.current_app>` attribute.
 
-   .. versionchanged:: 1.8
-
-      In previous versions of Django, you had to set the ``current_app``
-      attribute on any :class:`~django.template.Context` or
-      :class:`~django.template.RequestContext` that is used to render a
-      template.
-
    .. versionchanged:: 1.9
 
       Previously, the :ttag:`url` template tag did not use the namespace of the