summaryrefslogtreecommitdiff
path: root/sphinx/quickstart.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-01 09:23:09 +0100
committerGeorg Brandl <georg@python.org>2014-03-01 09:23:09 +0100
commiteaa9c02f58f1a9490aa53d007c20034fd8e26b59 (patch)
tree88094cd4ea2ea82af112dab7cc9b2caeb7b1b60d /sphinx/quickstart.py
parenta804e445d247f21b19a4076d2b6320bfa25b35ac (diff)
downloadsphinx-eaa9c02f58f1a9490aa53d007c20034fd8e26b59.tar.gz
Closes #1391: Actually prevent using "pngmath" and "mathjax" extensions at the same time in sphinx-quickstart.
Diffstat (limited to 'sphinx/quickstart.py')
-rw-r--r--sphinx/quickstart.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 8ea5b3a3..5cf067e9 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -1141,6 +1141,7 @@ Please indicate if you want to use one of the following Sphinx extensions:'''
if d['ext_pngmath'] and d['ext_mathjax']:
print '''Note: pngmath and mathjax cannot be enabled at the same time.
pngmath has been deselected.'''
+ d['ext_pngmath'] = False
if 'ext_ifconfig' not in d:
do_prompt(d, 'ext_ifconfig', 'ifconfig: conditional inclusion of '
'content based on config values (y/n)', 'n', boolean)