diff options
| author | Tim Graham <timograham@gmail.com> | 2016-01-12 09:19:07 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-13 07:06:34 -0500 |
| commit | d45cfefbad4a6551cc40bf4c8c6d443da9a9d888 (patch) | |
| tree | 515c58fda98a036b07ca1157e604fbc94b074716 /docs | |
| parent | a7752780d9e78e12d0bd7bd2dcf920d304e039bc (diff) | |
Refs #25769 -- Updated docs to reflect get_version() uses PEP 0440.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 8 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/conf.py b/docs/conf.py index 403b66bdfd..35b82b68b4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -79,10 +79,10 @@ except ImportError: release = version else: def django_release(): - pep386ver = get_version() - if VERSION[3:5] == ('alpha', 0) and 'dev' not in pep386ver: - return pep386ver + '.dev' - return pep386ver + pep440ver = get_version() + if VERSION[3:5] == ('alpha', 0) and 'dev' not in pep440ver: + return pep440ver + '.dev' + return pep440ver release = django_release() diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 1ec964b6ae..80e40485db 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -79,7 +79,7 @@ Determining the version Run ``django-admin version`` to display the current Django version. -The output follows the schema described in :pep:`386`:: +The output follows the schema described in :pep:`440`:: 1.4.dev17026 1.4a1 |