Moved a warning in the 1.6 notes back to its expected location.

This commit is contained in:
Aymeric Augustin 2013-03-11 12:04:29 +01:00
parent ce76fbfc5a
commit 9cec689e6a
1 changed files with 8 additions and 9 deletions

View File

@ -140,6 +140,14 @@ Minor features
Backwards incompatible changes in 1.6
=====================================
.. warning::
In addition to the changes outlined in this section, be sure to review the
:doc:`deprecation plan </internals/deprecation>` for any features that
have been removed. If you haven't updated your code within the
deprecation timeline for a given feature, its removal may appear as a
backwards incompatible change.
* The ``django.db.models.query.EmptyQuerySet`` can't be instantiated any more -
it is only usable as a marker class for checking if
:meth:`~django.db.models.query.QuerySet.none` has been called:
@ -223,15 +231,6 @@ Backwards incompatible changes in 1.6
are silently truncated; on Oracle, an exception is generated. No database
change is needed for SQLite or PostgreSQL databases.
.. warning::
In addition to the changes outlined in this section, be sure to review the
:doc:`deprecation plan </internals/deprecation>` for any features that
have been removed. If you haven't updated your code within the
deprecation timeline for a given feature, its removal may appear as a
backwards incompatible change.
Features deprecated in 1.6
==========================