summaryrefslogtreecommitdiff
path: root/sphinx/quickstart.py
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2015-11-15 18:07:23 +0900
committershimizukawa <shimizukawa@gmail.com>2015-11-15 18:07:23 +0900
commit8ae43b9fd4b68473d25e872766a8786a5be85852 (patch)
tree313d0146f5c8009f0be3e03ce71f1994624872a9 /sphinx/quickstart.py
parentc4850cc9abcb94eea0fea01127e2b9cb966db56b (diff)
parentdf3643722f0116176388604f676d89104ea39800 (diff)
downloadsphinx-git-8ae43b9fd4b68473d25e872766a8786a5be85852.tar.gz
Merge branch 'stable'
Diffstat (limited to 'sphinx/quickstart.py')
-rw-r--r--sphinx/quickstart.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index c8c46fabf..1cfe715c5 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -127,9 +127,9 @@ author = u'%(author_str)s'
# built documents.
#
# The short X.Y version.
-version = '%(version_str)s'
+version = u'%(version_str)s'
# The full version, including alpha/beta/rc tags.
-release = '%(release_str)s'
+release = u'%(release_str)s'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -715,7 +715,7 @@ if "%%1" == "clean" (
REM Check if sphinx-build is available and fallback to Python version if any
-%%SPHINXBUILD%% 2> nul
+%%SPHINXBUILD%% 1>NUL 2>NUL
if errorlevel 9009 goto sphinx_python
goto sphinx_ok
@@ -978,7 +978,7 @@ set SPHINXPROJ=%(project_fn)s
if "%%1" == "" goto help
-%%SPHINXBUILD%% 2> nul
+%%SPHINXBUILD%% >NUL 2>NUL
if errorlevel 9009 (
\techo.
\techo.The 'sphinx-build' command was not found. Make sure you have Sphinx