make :any: role work with intersphinx!

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/conf.py b/doc/conf.py
index 3ae94821..4a6f8f58 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -83,7 +83,7 @@ texinfo_documents = [
 
 # 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)}
+intersphinx_mapping = {'python': ('http://docs.python.org/2/', None)}
 
 # Sphinx document translation with sphinx gettext feature uses these settings:
 locale_dirs = ['locale/']
diff --git a/doc/markup/inline.rst b/doc/markup/inline.rst
index 7d83e317..b5bb8d0c 100644
--- a/doc/markup/inline.rst
+++ b/doc/markup/inline.rst
@@ -86,6 +86,10 @@ Cross-referencing anything
    Python module (usually ``:py:mod:`signal``` or ``:mod:`signal```) and a
    section (usually ``:ref:`about-signals```).
 
+   The :rst:role:`any` role also works together with the
+   :mod:`~sphinx.ext.intersphinx` extension: when no local cross-reference is
+   found, all object types of intersphinx inventories are also searched.
+
 
 Cross-referencing objects
 -------------------------