summaryrefslogtreecommitdiff
path: root/sphinx/application.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-22 14:51:47 +0200
committerGeorg Brandl <georg@python.org>2014-09-22 14:51:47 +0200
commit31452fc64d550f526d3a6c4dfbb1121873896503 (patch)
tree1b259d36d3f105e8b0971acb1f838f89110595e1 /sphinx/application.py
parent905cbf853d5fe8fa911ec8fc81dc31134f4e5ba2 (diff)
downloadsphinx-git-31452fc64d550f526d3a6c4dfbb1121873896503.tar.gz
[WIP] parallel read
Diffstat (limited to 'sphinx/application.py')
-rw-r--r--sphinx/application.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index 052ad1ce2..f7ff95175 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -53,6 +53,7 @@ events = {
'env-before-read-docs': 'env, docnames',
'source-read': 'docname, source text',
'doctree-read': 'the doctree before being pickled',
+ 'env-merge-info': 'env, read docnames, other env instance',
'missing-reference': 'env, node, contnode',
'doctree-resolved': 'doctree, docname',
'env-updated': 'env',