summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-05 11:58:43 +0200
committerGeorg Brandl <georg@python.org>2010-08-05 11:58:43 +0200
commit24f8b6a705b2f93e03094a2d03e5386ae7ede85b (patch)
tree5ee9b33d9f49b9904a8aaed638e1ad953d38483d /doc
parentdd6744afd12f50ce58bd39313456a6827757b7a2 (diff)
downloadsphinx-24f8b6a705b2f93e03094a2d03e5386ae7ede85b.tar.gz
#480: Fix handling of target naming in intersphinx.
Diffstat (limited to 'doc')
-rw-r--r--doc/conf.py2
-rw-r--r--doc/ext/intersphinx.rst6
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/conf.py b/doc/conf.py
index 299f321a..21e8d2f5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -8,6 +8,8 @@ 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']
diff --git a/doc/ext/intersphinx.rst b/doc/ext/intersphinx.rst
index bb2a5a8c..7997472a 100644
--- a/doc/ext/intersphinx.rst
+++ b/doc/ext/intersphinx.rst
@@ -84,7 +84,7 @@ linking:
To add links to modules and objects in the Python standard library
documentation, use::
- intersphinx_mapping = {'python': ('http://docs.python.org/', None)}
+ intersphinx_mapping = {'python': ('http://docs.python.org/3.2', None)}
This will download the corresponding :file:`objects.inv` file from the
Internet and generate links to the pages under the given URI. The downloaded
@@ -94,12 +94,12 @@ linking:
A second example, showing the meaning of a non-``None`` value of the second
tuple item::
- intersphinx_mapping = {'python': ('http://docs.python.org/',
+ intersphinx_mapping = {'python': ('http://docs.python.org/3.2',
'python-inv.txt')}
This will read the inventory from :file:`python-inv.txt` in the source
directory, but still generate links to the pages under
- ``http://docs.python.org/``. It is up to you to update the inventory file as
+ ``http://docs.python.org/3.2``. It is up to you to update the inventory file as
new objects are added to the Python documentation.
.. confval:: intersphinx_cache_limit