diff options
| author | Tim Graham <timograham@gmail.com> | 2015-06-20 08:58:10 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-25 11:36:17 -0400 |
| commit | aed437d56738698e9f33f80bcce09906de33f847 (patch) | |
| tree | 338eb718813396557c93b5ebaf31297ccddc24bf /docs/internals/contributing | |
| parent | bdb382b2a49de4a2426c3dde944776c1bdd08eb7 (diff) | |
Updated release process for new release schedule.
Diffstat (limited to 'docs/internals/contributing')
| -rw-r--r-- | docs/internals/contributing/localizing.txt | 10 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/submitting-patches.txt | 6 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt index f5837dbd8f..bd86e62591 100644 --- a/docs/internals/contributing/localizing.txt +++ b/docs/internals/contributing/localizing.txt @@ -46,11 +46,11 @@ translating or add a language that isn't yet translated, here's what to do: `Transifex User Guide`_. Translations from Transifex are only integrated into the Django repository at -the time of a new major release. We try to update them a second time during one -of the following minor releases, but that depends on the translation manager's -availability. So don't miss the string freeze period (between the release -candidate and the major release) to take the opportunity to complete and fix -the translations for your language! +the time of a new :term:`feature release`. We try to update them a second time +during one of the following :term:`patch release`\s, but that depends on the +translation manager's availability. So don't miss the string freeze period +(between the release candidate and the feature release) to take the opportunity +to complete and fix the translations for your language! Formats ------- 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 ------------------ diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 82a16d826b..1159b94c38 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -192,7 +192,7 @@ __ http://sphinx-doc.org/markup/ To link, use ``:djadminopt:`--traceback```. -* Links to Trac tickets (typically reserved for minor release notes):: +* Links to Trac tickets (typically reserved for patch release notes):: :ticket:`12345` |