summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-11 20:59:34 -0500
committerTim Graham <timograham@gmail.com>2016-01-14 18:21:33 -0500
commite519aab43a419589e92fe284e4ce2f2e034aec6a (patch)
treee1af3c01ca87ff9b639ac45ec97ac9869d273c43 /docs/conf.py
parentfd1c5bb041abb617dc58c336a8461fb3a7af4508 (diff)
Fixed #23868 -- Added support for non-unique django-admin-options in docs.
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.
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 35b82b68b4..cbbeb892ab 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -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.