diff options
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/introduction.rst | 2 | ||||
| -rw-r--r-- | docs/narr/zca.rst | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 3410e6868..b4d10e7e5 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -165,7 +165,7 @@ common framework configuration tasks such as adding a view or a route. In Zope, :term:`ZCML` is typically required for similar purposes. In :term:`Grok`, a Zope-based web framework, :term:`decorator` objects and class-level declarations are used for this purpose. -:mod:`repoze.bfg` *supports* :term:`ZCML` and supports decorator-based +:mod:`repoze.bfg` supports :term:`ZCML` and decorator-based configuration, but does not require either. See :ref:`configuration_narr` for more information. diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst index 0a2fc5808..418312caa 100644 --- a/docs/narr/zca.rst +++ b/docs/narr/zca.rst @@ -127,14 +127,14 @@ interface of a registry instead, you need only know how to obtain the There are two ways of doing so: -- use the :func:`repoze.bfg.threadlocal.get_current_registry`` +- use the :func:`repoze.bfg.threadlocal.get_current_registry` function within :mod:`repoze.bfg` view or model code. This will always return the "current" :mod:`repoze.bfg` application registry. - use the attribute of the :term:`request` object named ``registry`` in your :mod:`repoze.bfg` view code, eg. ``request.registry``. This - is the application registry related to the running :mod:`repoze.bfg` - application. + is the ZCA component registry related to the running + :mod:`repoze.bfg` application. See :ref:`threadlocals_chapter` for more information about :func:`repoze.bfg.threadlocal.get_current_registry`. |