diff options
Diffstat (limited to 'docs/topics/http')
| -rw-r--r-- | docs/topics/http/shortcuts.txt | 12 | ||||
| -rw-r--r-- | docs/topics/http/urls.txt | 7 |
2 files changed, 1 insertions, 18 deletions
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 |