summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-01-31 10:12:51 -0500
committerTim Graham <timograham@gmail.com>2018-01-31 10:18:15 -0500
commit4e891a39b76c142412d9ca4847af089b141b8ec4 (patch)
treea54006ed8cd3ca9b4aff6b7094d4047b68a1fd88
parent834843ca4fdc474eba4457dee3d99fb9c882ca65 (diff)
[2.0.x] Renamed the "Supported versions" label.
Backport of 4775dcb521f87694607c5a1fca052ffffc0bfcae from master
-rw-r--r--docs/howto/upgrade-version.txt2
-rw-r--r--docs/internals/contributing/committing-code.txt3
-rw-r--r--docs/internals/release-process.txt2
-rw-r--r--docs/intro/whatsnext.txt4
4 files changed, 5 insertions, 6 deletions
diff --git a/docs/howto/upgrade-version.txt b/docs/howto/upgrade-version.txt
index c495bd79e5..89e243eae1 100644
--- a/docs/howto/upgrade-version.txt
+++ b/docs/howto/upgrade-version.txt
@@ -8,7 +8,7 @@ version has several benefits:
* New features and improvements are added.
* Bugs are fixed.
* Older version of Django will eventually no longer receive security updates.
- (see :ref:`backwards-compatibility-policy`).
+ (see :ref:`supported-versions-policy`).
* Upgrading as each new Django release is available makes future upgrades less
painful by keeping your code base up to date.
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index 4ce8576702..3639ca4f1a 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -155,8 +155,7 @@ Django's Git repository:
commit. This goes a *long way* in helping everyone follow your changes.
* Separate bug fixes from feature changes. Bugfixes may need to be backported
- to the stable branch, according to the :ref:`backwards-compatibility policy
- <backwards-compatibility-policy>`.
+ to the stable branch, according to :ref:`supported-versions-policy`.
* If your commit closes a ticket in the Django `ticket tracker`_, begin
your commit message with the text "Fixed #xxxxx", where "xxxxx" is the
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index 107e2ab060..ce600395eb 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -116,7 +116,7 @@ A more generic example:
LTS to LTS upgrades).
* Z.0: Drop deprecation shims added in Y.0 and Y.1.
-.. _backwards-compatibility-policy:
+.. _supported-versions-policy:
Supported versions
==================
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index f3bd5bce2b..2094e8bc73 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -217,8 +217,8 @@ We follow this policy:
* Documentation fixes and improvements may be backported to the last release
branch, at the discretion of the committer, however, once a version of
- Django is :ref:`no longer supported<backwards-compatibility-policy>`, that
- version of the docs won't get any further updates.
+ Django is :ref:`no longer supported<supported-versions-policy>`, that version
+ of the docs won't get any further updates.
* The `main documentation Web page`_ includes links to documentation for
all previous versions. Be sure you are using the version of the docs