Commit 9cec689e authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

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

parent ce76fbfc

docs/releases/1.6.txt

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

==========================