summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--sphinx/quickstart.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 9758dfc43..0a81cc7a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -57,7 +57,8 @@ Bugs fixed
* #1994: More supporting non-standard parser (like recommonmark parser) for Translation and
WebSupport feature. Now node.rawsource is fall backed to node.astext() during docutils
transforming.
-
+* On Py2 environment, conf.py that is generated by sphinx-quickstart should have u prefixed
+ config value for 'version' and 'release'.
Release 1.3.1 (released Mar 17, 2015)
=====================================
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 5e759da1a..d70725ae6 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -128,9 +128,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.