diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 2 | ||||
| -rw-r--r-- | docs/ref/template-response.txt | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 5513c79966..ee38df12a1 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -295,7 +295,7 @@ these changes. :class:`~django.template.response.TemplateResponse`, will be removed. ``content_type`` should be used instead. This also applies to the :func:`~django.shortcuts.render_to_response` shortcut and - the sitemamp views, :func:`~django.contrib.sitemaps.views.index` and + the sitemap views, :func:`~django.contrib.sitemaps.views.index` and :func:`~django.contrib.sitemaps.views.sitemap`. * When :class:`~django.http.HttpResponse` is instantiated with an iterator, diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt index 4f34d150ed..a8fb8dfee6 100644 --- a/docs/ref/template-response.txt +++ b/docs/ref/template-response.txt @@ -82,8 +82,7 @@ Methods deprecated), but since this is actually the value included in the HTTP ``Content-Type`` header, it can also include the character set encoding, which makes it more than just a MIME type specification. If - ``mimetype`` is specified (not ``None``), that value is used. - Otherwise, ``content_type`` is used. If neither is given, + ``content_type`` is specified, then its value is used. Otherwise, :setting:`DEFAULT_CONTENT_TYPE` is used. @@ -175,8 +174,7 @@ Methods deprecated), but since this is actually the value included in the HTTP ``Content-Type`` header, it can also include the character set encoding, which makes it more than just a MIME type specification. If - ``mimetype`` is specified (not ``None``), that value is used. - Otherwise, ``content_type`` is used. If neither is given, + ``content_type`` is specified, then its value is used. Otherwise, :setting:`DEFAULT_CONTENT_TYPE` is used. ``current_app`` |