summaryrefslogtreecommitdiff
path: root/sphinx/config.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-17 18:29:16 +0100
committerGeorg Brandl <georg@python.org>2010-01-17 18:29:16 +0100
commitbaf0087f3a339fb12fa64123879f45b72f4da8dd (patch)
tree59a06b108522d2452fe084a2c80b106bdce86fe3 /sphinx/config.py
parent38bb37024957227b0759e47abd3d03a5ce8b3a43 (diff)
parent5a9a454631ff9e68cf1827ba1a9582a993dca8db (diff)
downloadsphinx-git-baf0087f3a339fb12fa64123879f45b72f4da8dd.tar.gz
merge with trunk
Diffstat (limited to 'sphinx/config.py')
-rw-r--r--sphinx/config.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/config.py b/sphinx/config.py
index f1aba0eb4..fca33136c 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -61,6 +61,7 @@ class Config(object):
rst_epilog = (None, 'env'),
trim_doctest_flags = (True, 'env'),
default_domain = ('py', 'env'),
+ needs_sphinx = (None, None),
# HTML options
html_theme = ('default', 'html'),