1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Reordered deprecation timeline and added back old info; refs #21920.

This commit is contained in:
Tim Graham
2014-02-03 08:09:27 -05:00
parent ab922c5cd8
commit d4a5019bef
5 changed files with 460 additions and 151 deletions

View File

@@ -27,7 +27,7 @@ Welcome to Django 1.6!
These release notes cover the `new features`_, as well as some `backwards
incompatible changes`_ you'll want to be aware of when upgrading from Django
1.5 or older versions. We've also dropped some features, which are detailed in
:doc:`our deprecation plan </internals/deprecation>`, and we've `begun the
:ref:`our deprecation plan <deprecation-removed-in-1.6>`, and we've `begun the
deprecation process for some features`_.
.. _`new features`: `What's new in Django 1.6`_
@@ -955,6 +955,8 @@ Miscellaneous
which may result in a ``TypeError`` if you don't update the signature of your
custom method.
.. _deprecated-features-1.6:
Features deprecated in 1.6
==========================