Commit c8c2d606 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.6.x] Small doc changes missed in 66076268. 

Partial backport of 253e8ac2 from master.
parent 0726482c

docs/internals/deprecation.txt

+3 −0
Original line number Diff line number Diff line
@@ -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``

docs/ref/settings.txt

+1 −1
Original line number Diff line number Diff line
@@ -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