summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-16 07:59:44 -0500
committerGitHub <noreply@github.com>2017-02-16 07:59:44 -0500
commit80493b087136a151bf4d11ba394f36e047159040 (patch)
tree8b9df561f9eb919deda285da05b6d4b3c1f7c71b /docs
parentb008f7cc5655d01817a8825e6317877b43c92181 (diff)
Fixed #27829 -- Deprecated settings.DEFAULT_CONTENT_TYPE.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/ref/settings.txt5
-rw-r--r--docs/releases/2.0.txt4
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 56aa7adacf..4f025f8d1f 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -19,6 +19,8 @@ details on these changes.
* ``django.shortcuts.render_to_response()`` will be removed.
+* The ``DEFAULT_CONTENT_TYPE`` setting will be removed.
+
.. _deprecation-removed-in-2.1:
2.1
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 2dd7e57588..02f84d90c6 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1140,6 +1140,11 @@ Default content type to use for all ``HttpResponse`` objects, if a MIME type
isn't manually specified. Used with :setting:`DEFAULT_CHARSET` to construct
the ``Content-Type`` header.
+.. deprecated:: 2.0
+
+ This setting is deprecated because it doesn't interact well with
+ third-party apps and is obsolete since HTML5 has mostly superseded XHTML.
+
.. setting:: DEFAULT_EXCEPTION_REPORTER_FILTER
``DEFAULT_EXCEPTION_REPORTER_FILTER``
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index c4f65ec9ac..82cc840ddc 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -301,6 +301,10 @@ Miscellaneous
:func:`django.shortcuts.render`. ``render()`` takes the same arguments
except that is also requires a ``request``.
+* The ``DEFAULT_CONTENT_TYPE`` setting is deprecated. It doesn't interact well
+ well with third-party apps and is obsolete since HTML5 has mostly superseded
+ XHTML.
+
.. _removed-features-2.0:
Features removed in 2.0