diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-03-11 12:04:29 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-03-11 12:04:29 +0100 |
| commit | 9cec689e6a7e299b3416519ee075b2316ecc5a64 (patch) | |
| tree | 0de521911252f62caa99f4b71e8cfeb7d797fd05 | |
| parent | ce76fbfc5a14b0dbfdf28badb4bff874c8286d48 (diff) | |
Moved a warning in the 1.6 notes back to its expected location.
| -rw-r--r-- | docs/releases/1.6.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index dd7a9a463e..d78d594c90 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -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 ========================== |