summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--sphinx/quickstart.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 357dd7e6..e8ebf927 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Release 1.2 (in development)
* Fix text builder did not respect wide/fullwidth characters:
title underline width, table layout width and text wrap width.
+* Add stub for the :confval:`keep_warnings` configuration value in the
+ ``conf.py`` generated by sphinx-quickstart.
+
* Speed up building the search index by caching the results of the word
stemming routines. Saves about 20 seconds when building the Python
documentation.
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index 0c7677c5..118d260f 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -126,6 +126,9 @@ pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
# -- Options for HTML output ---------------------------------------------------