summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJames Turley <jamesturley1905@googlemail.com>2014-01-23 17:17:53 +0000
committerTim Graham <timograham@gmail.com>2014-01-24 08:14:46 -0500
commitc539a4490f8c49bcd264d3d08c8686624cca6698 (patch)
tree0d8aea4169de5e25c8cc8ed4ddbcf108d0440940 /docs
parent169bee85eacd5fbbf4c8f5270dbfb906934a788e (diff)
[1.5.x] Fixed #21824 -- Added reference to LTS in docs/internals/security.txt
Backport of 4d8209431d from master
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/release-process.txt2
-rw-r--r--docs/internals/security.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index 3a3941a217..a8512dc436 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -151,7 +151,7 @@ the pace of releases afterwards.
The follow releases have been designated for long-term support:
- * Django 1.4, supported until at least March 2015.
+* Django 1.4, supported until at least March 2015.
.. _release-process:
diff --git a/docs/internals/security.txt b/docs/internals/security.txt
index f8d6ffbb1b..f5b5fde061 100644
--- a/docs/internals/security.txt
+++ b/docs/internals/security.txt
@@ -58,6 +58,9 @@ for several versions of Django:
Django 1.3. Upon the release of Django 1.5, Django 1.3's security
support will end.
+* :ref:`Long-term support (LTS) releases <lts-releases>` will receive
+ security updates for a specified period.
+
When new releases are issued for security reasons, the accompanying
notice will include a list of affected versions. This list is
comprised solely of *supported* versions of Django: older versions may