diff options
| author | Georg Brandl <georg@python.org> | 2014-03-02 08:37:54 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-02 08:37:54 +0100 |
| commit | db0f7ccc705b37617faf7c6139e96dc826dfdb22 (patch) | |
| tree | 7f6b06b863e28bd69ddebc27db5f1260500dc1d3 /sphinx/quickstart.py | |
| parent | a2c975307c30318b16c245944d694622c7c925f0 (diff) | |
| parent | c68104b1be74b8b102a2f3bf394e03072c760cfa (diff) | |
| download | sphinx-git-db0f7ccc705b37617faf7c6139e96dc826dfdb22.tar.gz | |
merge with stable
Diffstat (limited to 'sphinx/quickstart.py')
| -rw-r--r-- | sphinx/quickstart.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 1241e0987..87ec3ce38 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -1183,6 +1183,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) |