Merge pull request #3436 from stevepiercy/docs-remove-obsolete-intersphinx-refs

Remove obsolete intersphinx references

2 files changed, 3 insertions, 10 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 3b7eb261a..48658ee9b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,23 +66,16 @@ intersphinx_mapping = {
     'cookiecutter': ('https://cookiecutter.readthedocs.io/en/latest/', None),
     'deform': ('https://docs.pylonsproject.org/projects/deform/en/latest/', None),
     'jinja2': ('https://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
-    'plaster': ('https://docs.pylonsproject.org/projects/plaster/en/latest/', None),
     'pylonswebframework': ('https://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
     'python': ('https://docs.python.org/3/', None),
     'pytest': ('https://docs.pytest.org/en/latest/', None),
-    'sphinx': ('http://www.sphinx-doc.org/en/latest/', None),
     'sqla': ('https://docs.sqlalchemy.org/en/latest/', None),
     'tm': ('https://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
     'toolbar': ('https://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest/', None),
-    'tstring': ('https://docs.pylonsproject.org/projects/translationstring/en/latest/', None),
     'tutorials': ('https://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
     'venusian': ('https://docs.pylonsproject.org/projects/venusian/en/latest/', None),
-    'webob': ('https://docs.pylonsproject.org/projects/webob/en/latest/', None),
-    'webtest': ('https://docs.pylonsproject.org/projects/webtest/en/latest/', None),
-    'who': ('https://repozewho.readthedocs.io/en/latest/', None),
-    'zcml': ('https://docs.pylonsproject.org/projects/pyramid-zcml/en/latest/', None),
-    'zcomponent': ('https://zopecomponent.readthedocs.io/en/latest/', None),
-    'zinterface': ('https://zopeinterface.readthedocs.io/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: