From 568a9264528d45b9fa2136a98f7b766c5e10152b Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 29 Nov 2005 15:30:06 +0000 Subject: [PATCH] Clarified wording about deprecated features (thanks, Wilson) git-svn-id: http://code.djangoproject.com/svn/django/trunk@1491 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/contributing.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing.txt b/docs/contributing.txt index b91f62dae8..1470b7a1f6 100644 --- a/docs/contributing.txt +++ b/docs/contributing.txt @@ -234,8 +234,8 @@ Django's release numbering works as follows: feature in version ``A.B`` is deprecated, it will continue to work in version ``A.B+1``. In version ``A.B+2``, use of the feature will raise a ``PendingDeprecationWarning`` but will continue to work. Version - ``A.B+3`` will remove the feature entirely. However, a release of version - ``A+1`` will remove the feature entirely. + ``A.B+3`` will remove the feature entirely. Major point releases will + always remove deprecated features immediately. * ``C`` is the micro version number which, is incremented for bug and security fixes. A new micro-release will always be 100%