summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/request-response.txt6
-rw-r--r--docs/ref/settings.txt2
2 files changed, 6 insertions, 2 deletions
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`