diff options
| author | Georg Brandl <georg@python.org> | 2014-10-18 09:02:49 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-18 09:02:49 +0200 |
| commit | fb585bcd136be2a90e6ece5fa0e4c7b8dcab8c8d (patch) | |
| tree | ac90ad2611d16a22f1daa29b2bf0e2e8ec7f1fbb | |
| parent | 3e20a1de3e393055d5d19637538ad99593c2b1cc (diff) | |
| download | sphinx-westurner/doc-glossary-markup-ref.tar.gz | |
close branchwesturner/doc-glossary-markup-ref
| -rw-r--r-- | sphinx/apidoc.py | 1 | ||||
| -rw-r--r-- | sphinx/quickstart.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index 7b1a96d2..3857e756 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -367,6 +367,7 @@ Note: By default this script will not overwrite already created files.""") batchfile = True, mastertocmaxdepth = opts.maxdepth, mastertoctree = text, + language = 'en', ) if not opts.dryrun: qs.generate(d, silent=True, overwrite=opts.force) diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 184c25cb..5d1edfbf 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -43,7 +43,7 @@ from sphinx.util import texescape # function to get input from terminal -- overridden by the test suite term_input = input -DEFAULT_VALUE = { +DEFAULT_VALUES = { 'path': '.', 'sep': False, 'dot': '_', @@ -55,7 +55,7 @@ DEFAULT_VALUE = { 'ext_doctest': False, 'makefile': True, 'batchfile': True, - } +} EXTENSIONS = ('autodoc', 'doctest', 'intersphinx', 'todo', 'coverage', 'pngmath', 'mathjax', 'ifconfig', 'viewcode') @@ -1475,7 +1475,7 @@ def main(argv=sys.argv): 'version' in d]): # quiet mode with all required params satisfied, use default d.setdefault('release', d['version']) - d2 = DEFAULT_VALUE.copy() + d2 = DEFAULT_VALUES.copy() d2.update(dict(("ext_"+ext, False) for ext in EXTENSIONS)) d2.update(d) d = d2 |