summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2019-03-28 20:47:51 -0400
committerTim Graham <timograham@gmail.com>2019-03-28 20:47:51 -0400
commit879cc3da6249e920b8d54518a0ae06de835d7373 (patch)
tree6e92992b42db253dea0da238b89e1897c702f217
parenta68c029e224cebe540da7447dbbd27993b4aa793 (diff)
downloaddjango-879cc3da6249e920b8d54518a0ae06de835d7373.tar.gz
Moved extlinks in docs config to allow using 'version' variable.
After a stable branch is created, 'master' will change to 'stable/' + version + '.x'.
-rw-r--r--docs/conf.py16
-rw-r--r--docs/ref/settings.txt6
2 files changed, 9 insertions, 13 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 625c383965..b51c8c03e2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -43,14 +43,6 @@ extensions = [
"sphinx.ext.viewcode",
]
-extlinks = {
- 'commit': ('https://github.com/django/django/commit/%s', ''),
- 'cve': ('https://nvd.nist.gov/view/vuln/detail?vulnId=%s', 'CVE-'),
- # A file or directory. GitHub redirects from blob to tree if needed.
- 'source': ('https://github.com/django/django/blob/master/%s', ''),
- 'ticket': ('https://code.djangoproject.com/ticket/%s', '#'),
-}
-
# Spelling check needs an additional module that is not installed by default.
# Add it only if spelling check is requested so docs can be generated without it.
if 'spelling' in sys.argv:
@@ -102,6 +94,14 @@ else:
# The "development version" of Django
django_next_version = '3.0'
+extlinks = {
+ 'commit': ('https://github.com/django/django/commit/%s', ''),
+ 'cve': ('https://nvd.nist.gov/view/vuln/detail?vulnId=%s', 'CVE-'),
+ # A file or directory. GitHub redirects from blob to tree if needed.
+ 'source': ('https://github.com/django/django/blob/master/%s', ''),
+ 'ticket': ('https://code.djangoproject.com/ticket/%s', '#'),
+}
+
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
# language = None
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 0eb5bed1fc..9a7de08941 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1839,11 +1839,7 @@ Here's a sample settings file::
Default: A list of all language codes from the :setting:`LANGUAGES` setting
that are written right-to-left. You can see the current list of these languages
-by looking in ``django/conf/global_settings.py`` (or view the `online
-source`_).
-
-.. _online source: https://github.com/django/django/blob/master/django/conf/global_settings.py
-
+by looking in :source:`django/conf/global_settings.py`.
The list contains :term:`language codes<language code>` for languages that are
written right-to-left.