mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2026-10-12 08:25:01 -05:00
Closes #1391: Actually prevent using "pngmath" and "mathjax" extensions at the same time in sphinx-quickstart.
This commit is contained in:
1 parent
e736be637a
commit
aa2f064e2f
2 files changed
+3
No files matched your search
@@ -15,6 +15,8 @@ Bugs fixed
|
||||
* #1374: Fix for autosummary generating overly-long summaries if first line
|
||||
doesn't end with a period.
|
||||
* #1383: Fix Python 2.5 compatibility of sphinx-apidoc.
|
||||
* #1391: Actually prevent using "pngmath" and "mathjax" extensions at the same
|
||||
time in sphinx-quickstart.
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user