diff options
| author | Chris Cahoon <chris.cahoon@gmail.com> | 2009-08-13 22:57:16 +0000 |
|---|---|---|
| committer | Chris Cahoon <chris.cahoon@gmail.com> | 2009-08-13 22:57:16 +0000 |
| commit | bcec8b2c43bd3726fb764044a6e872168abef674 (patch) | |
| tree | f933b33aa96a8b43ab07088d6d0fc03c760103cd | |
| parent | b15984b179953e93c74f47d06761c9a5c22b0716 (diff) | |
| download | django-soc2009/http-wsgi-improvements.tar.gz | |
[soc2009/http-wsgi-improvements] Update versions in docs for the various new HttpResponse features, and fixed an error on the argument list for HttpResponse.__init__.archive/soc2009/http-wsgi-improvementssoc2009/http-wsgi-improvements
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/howto/response-sendfile.txt | 2 | ||||
| -rw-r--r-- | docs/ref/request-response.txt | 6 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/topics/http/shortcuts.txt | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/docs/howto/response-sendfile.txt b/docs/howto/response-sendfile.txt index a333c26dca..f73e5fc2a0 100644 --- a/docs/howto/response-sendfile.txt +++ b/docs/howto/response-sendfile.txt @@ -7,6 +7,8 @@ How to serve large files via HttpResponseSendFile .. module:: django.http :synopsis: Serving of large files via handler-specific mechanisms. +.. versionadded:: 1.2 + There are cases when you may wish to serve files in a response, but only want to provide access to them through your application. As discussed in :ref:`the how-to for serving static files <howto-static-files>`, Django is not tuned at all for this sort of serving. Thus, diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index ebb20505af..5196162670 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -502,6 +502,8 @@ Methods Otherwise, ``content_type`` is used. If neither is given, the ``DEFAULT_CONTENT_TYPE`` setting is used. + .. versionadded:: 1.2 + ``request`` is the request that triggered this response. It can be used in the event that a view cares about dealing with request headers, in particular the Accept-Charset header. @@ -577,7 +579,7 @@ live in :mod:`django.http`. .. class:: HttpResponseSendFile - .. versionadded:: 1.1 + .. versionadded:: 1.2 A special response class for efficient file serving. It informs the HTTP protocol handler to use platform-specific file serving mechanism (if @@ -599,7 +601,7 @@ live in :mod:`django.http`. .. class:: HttpResponseStreaming - .. versionadded:: 1.1 + .. versionadded:: 1.2 A special response class that does not consume generators before returning the response. To do this, it bypasses middleware that is not useful for diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 0f0fd6802d..a2caf5a6a6 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -838,6 +838,8 @@ link). This is only used if ``CommonMiddleware`` is installed (see SENDFILE_HEADER ----------------------------- +.. versionadded:: 1.2 + Default: ``None`` If not ``None``, this defines the header that an :func:`~django.http.HttpResponseSendFile` diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt index 15aa6c4fa7..8c7afcfe4c 100644 --- a/docs/topics/http/shortcuts.txt +++ b/docs/topics/http/shortcuts.txt @@ -17,7 +17,7 @@ introduce controlled coupling for convenience's sake. ``render_to_response`` ====================== -.. function:: render_to_response(template[, dictionary][, context_instance][, mimetype, content_type, status]) +.. function:: render_to_response(template[, dictionary][, context_instance][, mimetype, content_type, request]) Renders a given template with a given context dictionary and returns an :class:`~django.http.HttpResponse` object with that rendered text. |