p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Partial backport of 253e8ac2 from master.
This commit is contained in:
Aymeric Augustin 2014-03-21 22:09:57 +01:00
parent 0726482c9d
commit c8c2d60614
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/internals/deprecation.txt
View File

@ -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``

2
docs/ref/settings.txt
View File

@ -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