Refs #27829 -- Removed settings.DEFAULT_CONTENT_TYPE per deprecation timeline.

6 files changed, 9 insertions, 25 deletions

diff --git a/docs/ref/class-based-views/mixins-simple.txt b/docs/ref/class-based-views/mixins-simple.txt
index 2d1bbdeb57..d220737340 100644
--- a/docs/ref/class-based-views/mixins-simple.txt
+++ b/docs/ref/class-based-views/mixins-simple.txt
@@ -83,7 +83,7 @@ Simple mixins
 
         The content type to use for the response. ``content_type`` is passed
         as a keyword argument to ``response_class``. Default is ``None`` --
-        meaning that Django uses :setting:`DEFAULT_CONTENT_TYPE`.
+        meaning that Django uses ``'text/html'``.
 
     **Methods**
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index b04d3b9d17..9c75383ef0 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -748,7 +748,7 @@ Methods
 
     ``content_type`` is the MIME type optionally completed by a character set
     encoding and is used to fill the HTTP ``Content-Type`` header. If not
-    specified, it is formed by the :setting:`DEFAULT_CONTENT_TYPE` and
+    specified, it is formed by ``'text/html'`` and the
     :setting:`DEFAULT_CHARSET` settings, by default: "`text/html; charset=utf-8`".
 
     ``status`` is the :rfc:`HTTP status code <7231#section-6>` for the response.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 0aefd6bce5..ef83842aa0 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1195,24 +1195,7 @@ See also :setting:`NUMBER_GROUPING`, :setting:`THOUSAND_SEPARATOR` and
 Default: ``'utf-8'``
 
 Default charset to use for all ``HttpResponse`` objects, if a MIME type isn't
-manually specified. Used with :setting:`DEFAULT_CONTENT_TYPE` to construct the
-``Content-Type`` header.
-
-.. setting:: DEFAULT_CONTENT_TYPE
-
-``DEFAULT_CONTENT_TYPE``
-------------------------
-
-Default: ``'text/html'``
-
-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.
+manually specified. Used when constructing the ``Content-Type`` header.
 
 .. setting:: DEFAULT_EXCEPTION_REPORTER_FILTER
 
@@ -3436,7 +3419,6 @@ HTTP
 * :setting:`DATA_UPLOAD_MAX_MEMORY_SIZE`
 * :setting:`DATA_UPLOAD_MAX_NUMBER_FIELDS`
 * :setting:`DEFAULT_CHARSET`
-* :setting:`DEFAULT_CONTENT_TYPE`
 * :setting:`DISALLOWED_USER_AGENTS`
 * :setting:`FORCE_SCRIPT_NAME`
 * :setting:`INTERNAL_IPS`
diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt
index 6e2f736281..e51e99605e 100644
--- a/docs/ref/template-response.txt
+++ b/docs/ref/template-response.txt
@@ -76,7 +76,7 @@ Methods
         The value included in the HTTP ``Content-Type`` header, including the
         MIME type specification and the character set encoding. If
         ``content_type`` is specified, then its value is used. Otherwise,
-        :setting:`DEFAULT_CONTENT_TYPE` is used.
+        ``'text/html'`` is used.
 
     ``status``
         The HTTP status code for the response.
@@ -171,7 +171,7 @@ Methods
         The value included in the HTTP ``Content-Type`` header, including the
         MIME type specification and the character set encoding. If
         ``content_type`` is specified, then its value is used. Otherwise,
-        :setting:`DEFAULT_CONTENT_TYPE` is used.
+        ``'text/html'`` is used.
 
     ``status``
         The HTTP status code for the response.
diff --git a/docs/releases/3.0.txt b/docs/releases/3.0.txt
index c07a995bd6..ac69ab8714 100644
--- a/docs/releases/3.0.txt
+++ b/docs/releases/3.0.txt
@@ -240,6 +240,8 @@ to remove usage of these features.
 
 * ``django.shortcuts.render_to_response()`` is removed.
 
+* The ``DEFAULT_CONTENT_TYPE`` setting is removed.
+
 See :ref:`deprecated-features-2.1` for details on these changes, including how
 to remove usage of these features.
 
diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt
index a0eac39012..68e8fa3bf9 100644
--- a/docs/topics/http/shortcuts.txt
+++ b/docs/topics/http/shortcuts.txt
@@ -46,8 +46,8 @@ Optional arguments
     view will call it just before rendering the template.
 
 ``content_type``
-    The MIME type to use for the resulting document. Defaults to the value of
-    the :setting:`DEFAULT_CONTENT_TYPE` setting.
+    The MIME type to use for the resulting document. Defaults to
+    ``'text/html'``.
 
 ``status``
     The status code for the response. Defaults to ``200``.