summaryrefslogtreecommitdiff
path: root/docs/narr/zca.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-23 12:10:16 -0400
committerChris McDonough <chrism@plope.com>2013-04-23 12:10:16 -0400
commit47b8cf7e9b578464b533383083f7135271db0f9e (patch)
tree724c40d50f21773b6585ab7d9731b8bf7a93a71c /docs/narr/zca.rst
parent2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff)
parentdcaabcb87ca584c289efe70a604db0502838df3d (diff)
downloadpyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.gz
pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.bz2
pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/zca.rst')
-rw-r--r--docs/narr/zca.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 2ef8a7373..b0e9b1709 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -83,7 +83,7 @@ While this services a reasonable goal, it causes some issues when
trying to use patterns which you might use to build a typical
:term:`Zope` application to build a :app:`Pyramid` application.
Without special help, ZCA "global" APIs such as
-``zope.component.getUtility`` and ``zope.component.getSiteManager``
+:func:`zope.component.getUtility` and :func:`zope.component.getSiteManager`
will use the ZCA "global" registry. Therefore, these APIs
will appear to fail when used in a :app:`Pyramid` application,
because they'll be consulting the ZCA global registry rather than the
@@ -104,8 +104,8 @@ Disusing the Global ZCA API
+++++++++++++++++++++++++++
ZCA "global" API functions such as ``zope.component.getSiteManager``,
-``zope.component.getUtility``, ``zope.component.getAdapter``, and
-``zope.component.getMultiAdapter`` aren't strictly necessary. Every
+``zope.component.getUtility``, :func:`zope.component.getAdapter`, and
+:func:`zope.component.getMultiAdapter` aren't strictly necessary. Every
component registry has a method API that offers the same
functionality; it can be used instead. For example, presuming the
``registry`` value below is a Zope Component Architecture component
@@ -113,7 +113,6 @@ registry, the following bit of code is equivalent to
``zope.component.getUtility(IFoo)``:
.. code-block:: python
- :linenos:
registry.getUtility(IFoo)