summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2016-02-27 17:55:10 +0200
committerShai Berger <shai@platonix.com>2016-02-28 19:36:54 +0200
commite9234569f69e0afcc97b3b1ff5293bad1678a076 (patch)
tree02e0eddb16873e30c1d589fa2fe478cca5ad9ef0 /docs
parente96cdc6f99923621f543751d4cc0fddef1514422 (diff)
[1.9.x] Fixed docs: release-process, Supported Versions section, concrete example
Security & data loss fixes are applied to the two last feature releases, not just one. Thanks Loic Bistuer and Tim Graham for review Backport of 3dd4e92+72e5778 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/release-process.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index e56ac9ab2a..8c18de97a1 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -161,8 +161,9 @@ Django 5.1 and 5.2. At this point in time:
released as 5.1.1, 5.1.2, etc.
* Security fixes and bug fixes for data loss issues will be applied to
- ``master`` and to the ``stable/5.1.x``, and ``stable/4.2.x`` (LTS) branches.
- They will trigger the release of ``5.1.1``, ``4.2.1``, etc.
+ ``master`` and to the ``stable/5.1.x``, ``stable/5.0.x``, and
+ ``stable/4.2.x`` (LTS) branches. They will trigger the release of ``5.1.1``,
+ ``5.0.5``, ``4.2.8``, etc.
* Documentation fixes will be applied to master, and, if easily backported, to
the latest stable branch, ``5.1.x``.