summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/writing-code/submitting-patches.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-20 08:58:10 -0400
committerTim Graham <timograham@gmail.com>2015-06-25 11:36:17 -0400
commitaed437d56738698e9f33f80bcce09906de33f847 (patch)
tree338eb718813396557c93b5ebaf31297ccddc24bf /docs/internals/contributing/writing-code/submitting-patches.txt
parentbdb382b2a49de4a2426c3dde944776c1bdd08eb7 (diff)
Updated release process for new release schedule.
Diffstat (limited to 'docs/internals/contributing/writing-code/submitting-patches.txt')
-rw-r--r--docs/internals/contributing/writing-code/submitting-patches.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index 826bbfc48c..d9302169b6 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -236,11 +236,11 @@ Finally, there are a couple of updates to Django's documentation to make:
the "Features deprecated in A.B" heading.
#) Add an entry in the deprecation timeline (``docs/internals/deprecation.txt``)
- under the ``A.B+2`` version describing what code will be removed.
+ under the appropriate version describing what code will be removed.
Once you have completed these steps, you are finished with the deprecation.
-In each major release, all ``RemovedInDjangoXXWarning``\s matching the new
-version are removed.
+In each :term:`feature release`, all ``RemovedInDjangoXXWarning``\s matching
+the new version are removed.
JavaScript patches
------------------