summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2015-03-16 00:20:33 +0900
committershimizukawa <shimizukawa@gmail.com>2015-03-16 00:20:33 +0900
commit36d47a2193dbfea8693d2f852414530136f01507 (patch)
treed49f2a1d1398d34737ca7c04ef45c0e9f8700290
parente8e5bae15f0f3db658fd7c0cc34a5b04dd3ea48e (diff)
downloadsphinx-git-36d47a2193dbfea8693d2f852414530136f01507.tar.gz
Close #1776: ``source_suffix = ['.rst']`` cause unfriendly error on prior version.
-rw-r--r--CHANGES1
-rw-r--r--sphinx/quickstart.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 126728b75..b23b1cc97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ Bugs fixed
* #1770, #1774: ``literalinclude`` with empty file occurs exception. Thanks to
Takayuki Hirai.
* #1777: Sphinx 1.3 can't load extra theme. Thanks to tell-k.
+* #1776: ``source_suffix = ['.rst']`` cause unfriendly error on prior version.
Release 1.3 (released Mar 10, 2015)
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 0548f69c5..f13a5c7cd 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -108,7 +108,9 @@ extensions = [%(extensions)s]
templates_path = ['%(dot)stemplates']
# The suffix(es) of source filenames.
-source_suffix = ['%(suffix)s']
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '%(suffix)s'
# The encoding of source files.
#source_encoding = 'utf-8-sig'