[1.0.X] Fixed #11493 -- Added an internal document listing the APIs that have been formally deprecated. Thanks to Alex Gaynor for the draft text.

Merge of r11277 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11280 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/index.txt

@@ -178,6 +178,10 @@ And all the rest
 :ref:`Release notes <releases-index>`
     See what is and was new in each release of Django.
 
+:ref:`Deprecation Timeline <internals-deprecation>`
+    See the APIs that have been marked for deprecation in future releases of 
+    Django.
+
 :ref:`Miscellany <misc-index>`
     Stuff we can't find a more organized place for. Like that drawer in your
     kitchen with the scissors, batteries and duct tape.

docs/internals/deprecation.txt

@@ -0,0 +1,21 @@
+.. _internals-deprecation:
+
+===========================
+Django Deprecation Timeline
+===========================
+
+This document outlines when various pieces of Django will be removed, following
+their deprecation, as per the :ref:`Django deprecation policy
+<internal-release-deprecation-policy>`
+
+    * 1.3
+        * ``AdminSite.root()``.  This release will remove the old method for
+          hooking up admin URLs.  This has been deprecated since the 1.1
+          release.
+
+    * 2.0
+        * ``django.views.defaults.shortcut()``. This function has been moved
+          to ``django.contrib.contenttypes.views.shortcut()`` as part of the
+          goal of removing all ``django.contrib`` references from the core
+          Django codebase. The old shortcut will be removed in the 2.0
+          release.

docs/internals/index.txt

@@ -22,3 +22,4 @@ the hood".
    documentation
    committers
    release-process
+   deprecation

docs/internals/release-process.txt

@@ -50,6 +50,8 @@ Minor releases
 Minor release (1.1, 1.2, etc.) will happen roughly every six months -- see
 `release process`_, below for details.
 
+.. _internal-release-deprecation-policy:
+
 These releases will contain new features, improvements to existing features, and
 such. A minor release may deprecate certain features from previous releases. If a
 feature in version ``A.B`` is deprecated, it will continue to work in version
@@ -203,4 +205,3 @@ development will be happening in a bunch of places:
 
     * On feature branches, development of major features is done. These
       branches will be merged into trunk before the end of phase two.
-