summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2014-08-23 12:07:59 +0900
committershimizukawa <shimizukawa@gmail.com>2014-08-23 12:07:59 +0900
commit9f99eab62dc5d40e8302d395a8ca0794445ddc43 (patch)
tree719e2015d7d1384a61a528128e189c421a3e0963
parent1e78f3eb218268d38a0d62e43d65fcd515147dee (diff)
downloadsphinx-9f99eab62dc5d40e8302d395a8ca0794445ddc43.tar.gz
Update CHANGES for pull request #275, #1537; sphinx.ext.intersphinx supports multiple target for the inventory.
-rw-r--r--CHANGES4
-rw-r--r--doc/ext/intersphinx.rst2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3123cf67..b69c2bb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -58,7 +58,9 @@ Features added
* Automatically compile ``*.mo`` files from ``*.po`` files when
:confval:`gettext_auto_build` is True (default) and ``*.po`` is newer than
``*.mo`` file.
-* #623: :mod:`~sphinx.ext.viewcode` support imported function/class aliases.
+* #623: :mod:`~sphinx.ext.viewcode` supports imported function/class aliases.
+* PR#275: :mod:`~sphinx.ext.intersphinx` supports multiple target for the
+ inventory. Thanks to Brigitta Sipocz.
Bugs fixed
----------
diff --git a/doc/ext/intersphinx.rst b/doc/ext/intersphinx.rst
index d267c599..94047f8e 100644
--- a/doc/ext/intersphinx.rst
+++ b/doc/ext/intersphinx.rst
@@ -102,6 +102,8 @@ linking:
``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.
+ **Multiple target for the inventory**
+
.. versionadded:: 1.3
Alternative files can be specified for each inventory. One can give a