From e9234569f69e0afcc97b3b1ff5293bad1678a076 Mon Sep 17 00:00:00 2001 From: Shai Berger Date: Sat, 27 Feb 2016 17:55:10 +0200 Subject: [PATCH] [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 --- docs/internals/release-process.txt | 5 +++-- 1 file 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``.