summaryrefslogtreecommitdiff
path: root/doc/conf.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-02 21:03:56 +0100
committerGeorg Brandl <georg@python.org>2010-01-02 21:03:56 +0100
commitfaeec5cbbbcaec4a0c2ce12f0d41ecf3f225f5b4 (patch)
tree50fe275b8db2751541d4d20be7656aca3bc0eed4 /doc/conf.py
parented78dc7ff0102a2d10d934259f5c046fc5e280f6 (diff)
parentf3a2854ba97b33548c92490e0731e91014fa7c20 (diff)
downloadsphinx-git-faeec5cbbbcaec4a0c2ce12f0d41ecf3f225f5b4.tar.gz
merge with trunk
Diffstat (limited to 'doc/conf.py')
-rw-r--r--doc/conf.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py
index ce87c54eb..279072d69 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -143,5 +143,6 @@ def setup(app):
parse_directive)
app.add_description_unit('role', 'role', 'pair: %s; role', parse_role)
app.add_description_unit('confval', 'confval',
- 'pair: %s; configuration value')
+ objname='configuration value',
+ indextemplate='pair: %s; configuration value')
app.add_description_unit('event', 'event', 'pair: %s; event', parse_event)