summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2010-02-06 05:48:03 +0000
committerJames Bennett <ubernostrum@gmail.com>2010-02-06 05:48:03 +0000
commit8c43d2e32a7e6410210e624f5e5cfdf19769f648 (patch)
treedde925d87b1279dbc56e6707b995ab6175281495 /docs
parent8c50f9de6a116ebfeca3ae34f6994a5c8d31293e (diff)
Couple final tweaks to the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.2-beta-1.txt15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/releases/1.2-beta-1.txt b/docs/releases/1.2-beta-1.txt
index 0ee7cfd8f3..d53bb1b5a1 100644
--- a/docs/releases/1.2-beta-1.txt
+++ b/docs/releases/1.2-beta-1.txt
@@ -27,13 +27,14 @@ Deprecations and other changes in 1.2 beta
==========================================
This beta release deprecates one portion of public API, and introduces
-a potentially backwards-incompatible change to another. Under `our API
-stability policy <misc-api-stability>`, deprecation proceeds over
-multiple release cycles: initially, the deprecated API will raise
-``PendingDeprecationWarning``, followed by raising
-``DeprecationWarning`` in the following release, and finally removal
-of the deprecated API. APIs beginning the deprecation process in
-Django 1.2 will be removed in the Django 1.4 release.
+a potentially backwards-incompatible change to another. Under
+:ref:`our API stability policy <misc-api-stability>`, deprecation
+proceeds over multiple release cycles: initially, the deprecated API
+will raise ``PendingDeprecationWarning``, followed by raising
+``DeprecationWarning`` in the next release, and finally removal of the
+deprecated API in the release after that. APIs beginning the
+deprecation process in Django 1.2 will be removed in the Django 1.4
+release.
Unit test runners