diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 22:09:57 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-21 22:11:50 +0100 |
| commit | c8c2d60614c614174ef30f5bc69601264713a8ef (patch) | |
| tree | 552b826d5dcc92b362b5552a4b4992214da184b6 | |
| parent | 0726482c9d77195946a67bad533a5a95a4a1086b (diff) | |
[1.6.x] Small doc changes missed in 66076268.
Partial backport of 253e8ac2 from master.
| -rw-r--r-- | docs/internals/deprecation.txt | 3 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 9577e53800..4a1695b7de 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -174,6 +174,9 @@ these changes. :class:`django.middleware.common.BrokenLinkEmailsMiddleware` middleware to your :setting:`MIDDLEWARE_CLASSES` setting instead. +* ``django.middleware.doc.XViewMiddleware`` will be removed. Use + ``django.contrib.admindocs.middleware.XViewMiddleware`` instead. + * ``Model._meta.module_name`` was renamed to ``model_name``. * Remove the backward compatible shims introduced to rename ``get_query_set`` diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 296ac7bbf5..7f5e05c8f4 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1267,7 +1267,7 @@ A tuple of IP addresses, as strings, that: * See debug comments, when :setting:`DEBUG` is ``True`` * Receive X headers in admindocs if the ``XViewMiddleware`` is installed (see - :doc:`/topics/http/middleware`) + :doc:`/ref/contrib/admin/admindocs`) .. setting:: LANGUAGE_CODE |