p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved extlinks in docs config to allow using 'version' variable. 

After a stable branch is created, 'master' will change to
'stable/' + version + '.x'.
This commit is contained in:
Tim Graham 2019-03-28 20:47:51 -04:00
parent a68c029e22
commit 879cc3da62
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/conf.py
View File

@ -43,14 +43,6 @@ extensions = [
"sphinx.ext.viewcode", "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. # 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. # Add it only if spelling check is requested so docs can be generated without it.
if 'spelling' in sys.argv: if 'spelling' in sys.argv:
@ -102,6 +94,14 @@ else:
# The "development version" of Django # The "development version" of Django
django_next_version = '3.0' 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
# language = None # language = None

6
docs/ref/settings.txt
View File

@ -1839,11 +1839,7 @@ Here's a sample settings file::
Default: A list of all language codes from the :setting:`LANGUAGES` setting 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 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 by looking in :source:`django/conf/global_settings.py`.
source`_).
.. _online source: https://github.com/django/django/blob/master/django/conf/global_settings.py
The list contains :term:`language codes<language code>` for languages that are The list contains :term:`language codes<language code>` for languages that are
written right-to-left. written right-to-left.