IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
This commit is contained in:
Georg Brandl 2010-05-23 11:17:03 +02:00
commit 981f134e15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ext/intersphinx.rst
View File

@ -44,7 +44,7 @@ linking:
An example, to add links to modules and objects in the Python standard
library documentation::
intersphinx_mapping = {'http://docs.python.org/dev': None}
intersphinx_mapping = {'http://docs.python.org/': 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
@ -53,11 +53,11 @@ linking:
A second example, showing the meaning of a non-``None`` value::
intersphinx_mapping = {'http://docs.python.org/dev': 'python-inv.txt'}
intersphinx_mapping = {'http://docs.python.org/': 'python-inv.txt'}
This will read the inventory from :file:`python.inv` in the source
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/dev``. It is up to you to update the inventory file
``http://docs.python.org/``. It is up to you to update the inventory file
as new objects are added to the Python documentation.
When fetching remote inventory files, proxy settings will be read from