diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
| commit | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (patch) | |
| tree | f3a290b6e0a21549703050a33433dffef2acc87d /docs/narr/zca.rst | |
| parent | dacbe656d8851580234214fb655b60d24f5800fb (diff) | |
| parent | f8afd1638456fc89bc3d17858f309686b40a40a4 (diff) | |
| download | pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.gz pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.bz2 pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/zca.rst')
| -rw-r--r-- | docs/narr/zca.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst index 5499cf4a5..2ef8a7373 100644 --- a/docs/narr/zca.rst +++ b/docs/narr/zca.rst @@ -44,7 +44,7 @@ framework implementation detail. However, developers who are already used to writing :term:`Zope` applications often still wish to use the ZCA while building a -:app:`Pyramid` application; :mod:`pyramid` makes this possible. +:app:`Pyramid` application; :app:`Pyramid` makes this possible. .. index:: single: get_current_registry @@ -151,7 +151,6 @@ Consider the following bit of idiomatic :app:`Pyramid` startup code: .. code-block:: python :linenos: - from zope.component import getGlobalSiteManager from pyramid.config import Configurator def app(global_settings, **settings): @@ -188,7 +187,6 @@ For example: .. code-block:: python :linenos: - from zope.component import getGlobalSiteManager from pyramid.config import Configurator def app(global_settings, **settings): |