From d334713ea2c827064e4d9dadec998f541095dcc6 Mon Sep 17 00:00:00 2001 From: James Bennett Date: Sat, 6 Feb 2010 20:48:55 +0000 Subject: [PATCH] Clarify number of deprecations in the beta release. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12395 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/releases/1.2-beta-1.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/releases/1.2-beta-1.txt b/docs/releases/1.2-beta-1.txt index d53bb1b5a10..650971de2b4 100644 --- a/docs/releases/1.2-beta-1.txt +++ b/docs/releases/1.2-beta-1.txt @@ -26,15 +26,15 @@ updated features in Django between 1.1 and 1.2 alpha. 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 -:ref:`our API stability policy `, 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. +This beta release deprecates two portions of public API, and +introduces a potentially backwards-incompatible change to +another. Under :ref:`our API stability policy `, +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