summaryrefslogtreecommitdiff
path: root/doc/conf.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-05 13:39:23 +0200
committerGeorg Brandl <georg@python.org>2010-08-05 13:39:23 +0200
commit6df4ce4445517da55db5dfba4f139d8d2cd591ae (patch)
tree1172a7da36e6a8e4862e881d5bff10535676ee50 /doc/conf.py
parent50e8b6ac9e4bda6a1131fe34648259f0be807c0d (diff)
downloadsphinx-6df4ce4445517da55db5dfba4f139d8d2cd591ae.tar.gz
#481, #482: fix ``.name`` reference matching.
#482: When doing a non-exact search, match only the given type of object. #481: Apply non-exact search for Python reference targets with ``.name`` for modules too.
Diffstat (limited to 'doc/conf.py')
-rw-r--r--doc/conf.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 21e8d2f5..b3a1cda7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -8,8 +8,6 @@ import sphinx
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo',
'sphinx.ext.autosummary', 'sphinx.ext.extlinks']
-#intersphinx_mapping = {'python': ('http://docs.python.org/dev', None)}
-
master_doc = 'contents'
templates_path = ['_templates']
exclude_patterns = ['_build']
@@ -66,6 +64,10 @@ man_pages = [
'template generator', '', 1),
]
+# We're not using intersphinx right now, but if we did, this would be part of
+# the mapping:
+intersphinx_mapping = {'python': ('http://docs.python.org/dev', None)}
+
# -- Extension interface -------------------------------------------------------