summaryrefslogtreecommitdiff
path: root/sphinx/environment.py
diff options
context:
space:
mode:
authorJonathan Waltman <jonathan.waltman@gmail.com>2013-01-07 22:12:03 -0600
committerJonathan Waltman <jonathan.waltman@gmail.com>2013-01-07 22:12:03 -0600
commitc22800e27d05ae25a07869e64cc95ed2373ceab4 (patch)
treeee22a239517ce59fb284429e82c41f4c2cdde27d /sphinx/environment.py
parent9614376a755a21419007f1e33f62a5f734ef4a26 (diff)
parent5c58d248d1798c24f5ca71b923416129909326be (diff)
downloadsphinx-c22800e27d05ae25a07869e64cc95ed2373ceab4.tar.gz
Merged in rolmei/sphinx-epub (pull request #106: Add includehidden option to the toctree directive)
Diffstat (limited to 'sphinx/environment.py')
-rw-r--r--sphinx/environment.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 4efea83d..a08d671a 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -1514,6 +1514,8 @@ class BuildEnvironment:
maxdepth = maxdepth or toctree.get('maxdepth', -1)
if not titles_only and toctree.get('titlesonly', False):
titles_only = True
+ if not includehidden and toctree.get('includehidden', False):
+ includehidden = True
# NOTE: previously, this was separate=True, but that leads to artificial
# separation when two or more toctree entries form a logical unit, so