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 18:44:47 +0200
commit3dd4e9203a64f99fdbe52f522619b98ec4a10a9f (patch)
treeff0289499797e10f96b66195ccf0f15b1db6a0f7 /docs
parentb84f5ab4ec2d1edbe9a7effa9f75a3caa189bace (diff)
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 for review
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 2c05f909d9..a259388714 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -163,8 +163,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``.