Browse files

Clarified wording about deprecated features (thanks, Wilson)

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 3373447 commit 568a9264528d45b9fa2136a98f7b766c5e10152b @jacobian jacobian committed Nov 29, 2005
Showing with 2 additions and 2 deletions.
  1. +2 −2 docs/contributing.txt
4 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%

0 comments on commit 568a926

Please sign in to comment.