Commit d4a5019b authored by Tim Graham's avatar Tim Graham
Browse files

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

parent ab922c5c

docs/internals/deprecation.txt

+410 −109

File changed.

Preview size limit exceeded, changes collapsed.

docs/releases/1.4.txt

+5 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ Welcome to Django 1.4! 
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.3 or older versions. We've also dropped some

features, which are detailed in :doc:`our deprecation plan

</internals/deprecation>`, and we've `begun the deprecation process for some

features`_.

features, which are detailed in :ref:`our deprecation plan

<deprecation-removed-in-1.4>`, and we've `begun the deprecation process for

some features`_.



.. _`new features`: `What's new in Django 1.4`_

.. _`backwards incompatible changes`: `Backwards incompatible changes in 1.4`_
@@ -1175,6 +1175,8 @@ class ``initial`` dictionary. This has been fixed to return a copy of this 
dictionary, so form instances can modify their initial data without messing

with the class variable.



.. _deprecated-features-1.4:



Features deprecated in 1.4

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

docs/releases/1.5.txt

+5 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ Welcome to Django 1.5! 
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.4 or older versions. We've also dropped some

features, which are detailed in :doc:`our deprecation plan

</internals/deprecation>`, and we've `begun the deprecation process for some

features`_.

features, which are detailed in :ref:`our deprecation plan

<deprecation-removed-in-1.5>`, and we've `begun the deprecation process for

some features`_.



.. _`new features`: `What's new in Django 1.5`_

.. _`backwards incompatible changes`: `Backwards incompatible changes in 1.5`_
@@ -715,6 +715,8 @@ Miscellaneous 
  :meth:`~django.db.models.query.QuerySet.select_related` now raises

  :exc:`~django.core.exceptions.DoesNotExist` instead of returning ``None``.



.. _deprecated-features-1.5:



Features deprecated in 1.5

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

docs/releases/1.6.txt

+3 −1
Original line number Diff line number Diff line
@@ -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

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

docs/releases/1.7.txt

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Welcome to Django 1.7! 
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.6 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.7>`, and we've `begun the

deprecation process for some features`_.



.. _`new features`: `What's new in Django 1.7`_
@@ -959,6 +959,8 @@ Miscellaneous 
  to ``False``). If you maintain a custom database backend, you should check

  that method.



.. _deprecated-features-1.7:



Features deprecated in 1.7

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