- Most references to ZCML in narrative chapters have been removed or

  redirected to ``pyramid_zcml`` locations.

1 files changed, 3 insertions, 42 deletions

diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index f330fd551..394d02625 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -158,9 +158,7 @@ Consider the following bit of idiomatic :app:`Pyramid` startup code:
 
    def app(global_settings, **settings):
        config = Configurator(settings=settings)
-       config.begin()
-       config.load_zcml('configure.zcml')
-       config.end()
+       config.include('some.other.package')
        return config.make_wsgi_app()
 
 When the ``app`` function above is run, a :term:`Configurator` is
@@ -198,9 +196,7 @@ setup code.  For example:
    def app(global_settings, **settings):
        config = Configurator(settings=settings)
        config.hook_zca()
-       config.begin()
-       config.load_zcml('configure.zcml')
-       config.end()
+       config.include('some.other.application')
        return config.make_wsgi_app()
 
 We've added a line to our original startup code, line number 6, which
@@ -250,9 +246,7 @@ registry at startup time instead of constructing a new one:
        config = Configurator(registry=globalreg)
        config.setup_registry(settings=settings)
        config.hook_zca()
-       config.begin()
-       config.load_zcml('configure.zcml')
-       config.end()
+       config.include('some.other.application')
        return config.make_wsgi_app()
 
 Lines 5, 6, and 7 above are the interesting ones.  Line 5 retrieves
@@ -268,36 +262,3 @@ rather than creating a new application-specific registry; since by
 default the ZCA global API will use this registry, things will work as
 you might expect a Zope app to when you use the global ZCA API.
 
-.. index::
-   single: Zope ZCML directives
-   single: getGlobalSiteManager
-   single: getSiteManager
-
-Using Broken ZCML Directives
-----------------------------
-
-Some :term:`Zope` and third-party :term:`ZCML` directives use the
-``zope.component.getGlobalSiteManager`` API to get "the registry" when
-they should actually be calling ``zope.component.getSiteManager``.
-
-``zope.component.getSiteManager`` can be overridden by
-:app:`Pyramid` via
-:meth:`pyramid.config.Configurator.hook_zca`, while
-``zope.component.getGlobalSiteManager`` cannot.  Directives that use
-``zope.component.getGlobalSiteManager`` are effectively broken; no
-ZCML directive should be using this function to find a registry to
-populate.
-
-You cannot use ZCML directives which use
-``zope.component.getGlobalSiteManager`` within a :app:`Pyramid`
-application without passing the ZCA global registry to the
-:term:`Configurator` constructor at application startup, as per
-:ref:`using_the_zca_global_registry`.
-
-One alternative exists: fix the ZCML directive to use
-``getSiteManager`` rather than ``getGlobalSiteManager``.  If a
-directive disuses ``getGlobalSiteManager``, the ``hook_zca`` method of
-using a component registry as documented in :ref:`hook_zca` will begin
-to work, allowing you to make use of the ZCML directive without
-also using the ZCA global registry.
-