diff --git a/docs/index.txt b/docs/index.txt
index d03f90c117..b946600aec 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -201,7 +201,5 @@ The Django open-source project
 
     * **Django over time:**
       :ref:`API stability <misc-api-stability>` |
-      :ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_ |
+      :ref:`Release notes <releases-index>` |
       :ref:`Deprecation Timeline <internals-deprecation>`
-
-.. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
index cd4bdc5e96..c69a4de2e4 100644
--- a/docs/releases/1.1.txt
+++ b/docs/releases/1.1.txt
@@ -14,8 +14,10 @@ fixes, and an easy upgrade path from Django 1.0.
 
 .. _new features: `What's new in Django 1.1`_
 
-Backwards-incompatible changes
-==============================
+.. _backwards-incompatible-changes-1.1:
+
+Backwards-incompatible changes in 1.1
+=====================================
 
 Django has a policy of :ref:`API stability <misc-api-stability>`. This means
 that, in general, code you develop against Django 1.0 should continue to work
@@ -150,6 +152,8 @@ Django 1.1 adds a ``permanent`` argument to the
 backwards-incompatible if you were using the ``redirect_to`` view with a
 format-string key called 'permanent', which is highly unlikely.
 
+.. _deprecated-features-1.1:
+
 Features deprecated in 1.1
 ==========================
 
diff --git a/docs/releases/1.2-alpha.txt b/docs/releases/1.2.txt
similarity index 81%
rename from docs/releases/1.2-alpha.txt
rename to docs/releases/1.2.txt
index 5a0815bf36..f67588926c 100644
--- a/docs/releases/1.2-alpha.txt
+++ b/docs/releases/1.2.txt
@@ -1,6 +1,17 @@
+.. _releases-1.2:
 
-Backwards-incompatible changes
-==============================
+============================================
+Django 1.2 release notes — UNDER DEVELOPMENT
+============================================
+
+This page documents release notes for the as-yet-unreleased Django 1.2.  As such
+it is tentative and subject to change.  It provides up-to-date information for
+those who are following trunk.
+
+.. _backwards-incompatible-changes-1.2:
+
+Backwards-incompatible changes in 1.2
+=====================================
 
 CSRF Protection
 ---------------
@@ -50,3 +61,10 @@ changes:
    support for Python < 2.6, add the following code to the class::
 
        __members__ = property(lambda self: self.__dir__())
+
+.. _deprecated-features-1.2:
+
+Features deprecated in 1.2
+==========================
+
+None.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index e5c4fde537..7b0f30e9a2 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -24,11 +24,20 @@ changes made in that version.
    1.1-rc-1
    1.1
 
-.. seealso::
+Upgrading
+=========
 
-    The list of `backwards-incompatible changes`_ made in the current
-    development "trunk". If you're running versions of Django newer than an
-    official release, you should keep track of new pieces pointed there. It's
-    also fun reading if you're looking forward to new versions of Django.
+For those upgrading to a new version of Django, you will need to check all the
+backwards-incompatible changes and deprecated features for each 'final' release
+from the one after your old version up to and including your new version.  The
+relevant sections of the release notes are linked below below for your
+convenience.
 
-.. _backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
+For those following trunk, the tentative release notes for the next version to
+be released are also included at the bottom.  This is kept up to date with new
+features and changes that you need to be aware of.
+
+ * :ref:`backwards-incompatible-changes-1.1`
+ * :ref:`deprecated-features-1.1`
+ * :ref:`backwards-incompatible-changes-1.2`
+ * :ref:`deprecated-features-1.2`