summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-03-22 20:30:03 -0400
committerTim Graham <timograham@gmail.com>2018-03-22 20:30:03 -0400
commitde0e54ea00a57a1255a1b8b8f39f6d6aade04de7 (patch)
tree733203f45d1d32e437b6d3fa5c55d78dccd270b9 /docs
parenta4f0e9aec76ee40c938d3bf450ff63211b7ba1f1 (diff)
Bumped minimum Sphinx version to 1.6.0.
Diffstat (limited to 'docs')
-rw-r--r--docs/_ext/djangodocs.py6
-rw-r--r--docs/conf.py2
2 files changed, 2 insertions, 6 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index b8fe36c1d3..95f5218d70 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -14,11 +14,7 @@ from sphinx.directives import CodeBlock
from sphinx.domains.std import Cmdoption
from sphinx.util.console import bold
from sphinx.util.nodes import set_source_info
-
-try:
- from sphinx.writers.html import SmartyPantsHTMLTranslator as HTMLTranslator
-except ImportError: # Sphinx 1.6+
- from sphinx.writers.html import HTMLTranslator
+from sphinx.writers.html import HTMLTranslator
# RE for option descriptions without a '--' prefix
simple_option_desc_re = re.compile(
diff --git a/docs/conf.py b/docs/conf.py
index 8094cdd2e1..f4aa6a614c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -32,7 +32,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.5.5'
+needs_sphinx = '1.6.0'
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.