diff options
| author | James Turley <jamesturley1905@googlemail.com> | 2014-01-23 17:17:53 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-01-24 08:14:41 -0500 |
| commit | 6ea5f9e0de8851f4fdb840d41da73c284c53bfba (patch) | |
| tree | acb4ed574cf93619f0354488c9519bd7cf4f4e5a /docs | |
| parent | e47b90e48f3532d312afcfaec55b2711b2129c02 (diff) | |
[1.6.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.txt | 2 | ||||
| -rw-r--r-- | docs/internals/security.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index f5ad598b95..d06dbac954 100644 --- a/docs/internals/release-process.txt +++ b/docs/internals/release-process.txt @@ -144,7 +144,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 332bdd6bda..429749524e 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 |