mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-10 02:22:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #23868 -- Added support for non-unique django-admin-options in docs.

Browse source 
Also documented missing short command line options to fix #24134. This bumps
the minimum sphinx version required to build the docs to 1.3.4.

Thanks Simon Charette for review.
This commit is contained in:
Tim Graham 2016-01-11 20:59:34 -05:00
parent fd1c5bb041
commit e519aab43a
31 changed files with 543 additions and 616 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/conf.py
View file

@ -27,7 +27,7 @@ sys.path.append(abspath(join(dirname(__file__), "_ext")))
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
needs_sphinx = '1.0.8'
needs_sphinx = '1.3' # Actually 1.3.4, but micro versions aren't supported here.
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.