summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-04-14 09:32:09 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-06-02 10:57:46 +0200
commitc7bab8d2b7160a635a6f55e4d89e0a2e66d1679c (patch)
tree73df5f717f35a2689ee7d9608c5b5777e966cb6e
parent79baf338aef2ac21d3d29ee56e85f69678eef1a1 (diff)
downloaddjango-c7bab8d2b7160a635a6f55e4d89e0a2e66d1679c.tar.gz
[2.2.x] Fixed term warning on Sphinx 3.0.1+.
"term" role became case sensitive in Sphinx 3.0.1. Backport of cc70a0343ef51ffcc0b1211dd6e7abedc4b43ea6 from master
-rw-r--r--docs/internals/contributing/localizing.txt11
-rw-r--r--docs/internals/contributing/writing-code/submitting-patches.txt4
-rw-r--r--docs/intro/whatsnext.txt4
-rw-r--r--docs/ref/models/fields.txt2
-rw-r--r--docs/releases/1.11.txt7
-rw-r--r--docs/releases/1.8.txt6
-rw-r--r--docs/releases/2.2.txt7
7 files changed, 22 insertions, 19 deletions
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt
index f0d89f9001..1c9e1ec2f3 100644
--- a/docs/internals/contributing/localizing.txt
+++ b/docs/internals/contributing/localizing.txt
@@ -46,11 +46,12 @@ translating or add a language that isn't yet translated, here's what to do:
`Transifex User Guide`_.
Translations from Transifex are only integrated into the Django repository at
-the time of a new :term:`feature release`. We try to update them a second time
-during one of the following :term:`patch release`\s, but that depends on the
-translation manager's availability. So don't miss the string freeze period
-(between the release candidate and the feature release) to take the opportunity
-to complete and fix the translations for your language!
+the time of a new :term:`feature release <Feature release>`. We try to update
+them a second time during one of the following :term:`patch release
+<Patch release>`\s, but that depends on the translation manager's availability.
+So don't miss the string freeze period (between the release candidate and the
+feature release) to take the opportunity to complete and fix the translations
+for your language!
Formats
=======
diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index af0000c5d8..455374b347 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -224,8 +224,8 @@ Finally, there are a couple of updates to Django's documentation to make:
under the appropriate version describing what code will be removed.
Once you have completed these steps, you are finished with the deprecation.
-In each :term:`feature release`, all ``RemovedInDjangoXXWarning``\s matching
-the new version are removed.
+In each :term:`feature release <Feature release>`, all
+``RemovedInDjangoXXWarning``\s matching the new version are removed.
JavaScript patches
==================
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 718be49669..7d3346a12a 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -195,8 +195,8 @@ Differences between versions
The text documentation in the master branch of the Git repository contains the
"latest and greatest" changes and additions. These changes include
documentation of new features targeted for Django's next :term:`feature
-release`. For that reason, it's worth pointing out our policy to highlight
-recent changes and additions to Django.
+release <Feature release>`. For that reason, it's worth pointing out our policy
+to highlight recent changes and additions to Django.
We follow this policy:
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index a4ec2db358..75a0b2dd2f 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -1061,7 +1061,7 @@ databases supported by Django.
.. class:: SlugField(max_length=50, **options)
-:term:`Slug` is a newspaper term. A slug is a short label for something,
+:term:`Slug <slug>` is a newspaper term. A slug is a short label for something,
containing only letters, numbers, underscores or hyphens. They're generally used
in URLs.
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index bb7c06fe9f..f87839cf04 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -15,9 +15,10 @@ want to be aware of when upgrading from Django 1.10 or older versions. We've
See the :doc:`/howto/upgrade-version` guide if you're updating an existing
project.
-Django 1.11 is designated as a :term:`long-term support release`. It will
-receive security updates for at least three years after its release. Support
-for the previous LTS, Django 1.8, will end in April 2018.
+Django 1.11 is designated as a :term:`long-term support release
+<Long-term support release>`. It will receive security updates for at least
+three years after its release. Support for the previous LTS, Django 1.8, will
+end in April 2018.
Python compatibility
====================
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 01f250e3b0..1281c2c1a7 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -17,9 +17,9 @@ See the :doc:`/howto/upgrade-version` guide if you're updating an existing
project.
Django 1.8 has been designated as Django's second :term:`long-term support
-release`. It will receive security updates for at least three years after its
-release. Support for the previous LTS, Django 1.4, will end 6 months from the
-release date of Django 1.8.
+release <Long-term support release>`. It will receive security updates for at
+least three years after its release. Support for the previous LTS, Django 1.4,
+will end 6 months from the release date of Django 1.8.
Python compatibility
====================
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 86e1f70dc8..e83c162b0b 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -15,9 +15,10 @@ want to be aware of when upgrading from Django 2.1 or earlier. We've
See the :doc:`/howto/upgrade-version` guide if you're updating an existing
project.
-Django 2.2 is designated as a :term:`long-term support release`. It will
-receive security updates for at least three years after its release. Support
-for the previous LTS, Django 1.11, will end in April 2020.
+Django 2.2 is designated as a :term:`long-term support release
+<Long-term support release>`. It will receive security updates for at least
+three years after its release. Support for the previous LTS, Django 1.11, will
+end in April 2020.
Python compatibility
====================