summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-11-27 01:19:08 -0800
committerSteve Piercy <web@stevepiercy.com>2018-11-27 01:19:08 -0800
commit159928d63582d713de223d65b8f05a9abb4ac873 (patch)
treeb90624c5860ba21289d6db14e30f8badcd8dcf80
parent92a275ff4708383d43748441a55abf3a6eec5c43 (diff)
downloadpyramid-159928d63582d713de223d65b8f05a9abb4ac873.tar.gz
pyramid-159928d63582d713de223d65b8f05a9abb4ac873.tar.bz2
pyramid-159928d63582d713de223d65b8f05a9abb4ac873.zip
Restore pyramid_zcml intersphinx link, using explicit name
-rw-r--r--docs/conf.py2
-rw-r--r--docs/narr/advconfig.rst2
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index c524bc5d5..48658ee9b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,6 +74,8 @@ intersphinx_mapping = {
'toolbar': ('https://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest/', None),
'tutorials': ('https://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
'venusian': ('https://docs.pylonsproject.org/projects/venusian/en/latest/', None),
+ 'zcml': (
+ 'https://docs.pylonsproject.org/projects/pyramid-zcml/en/latest/', None),
}
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 33edb0eae..3ef350888 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -364,7 +364,7 @@ the special name ``includeme``, which should perform configuration (like the
:meth:`~pyramid.config.Configurator.include` can also accept a :term:`dotted
Python name` to a function or a module.
-.. note:: See :ref:`the_include_tag` for a declarative alternative to the
+.. note:: See :ref:`zcml:the_include_tag` for a declarative alternative to the
:meth:`~pyramid.config.Configurator.include` method.
.. _twophase_config: