summaryrefslogtreecommitdiff
path: root/docs/narr/zca.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-19 01:37:18 -0500
committerChris McDonough <chrism@plope.com>2011-01-19 01:37:18 -0500
commite3bb4cd9e413e58ec6c7ea7d4682bac329b712dd (patch)
treeb0c3b4f5dd8a0ec1c01912bfeff769d1329a9c97 /docs/narr/zca.rst
parent48bccbe4ff7351d823a471005effea1afc06bb4f (diff)
parentb0240d3d5a39a504d5a5155a23a6d6a431b457ef (diff)
downloadpyramid-e3bb4cd9e413e58ec6c7ea7d4682bac329b712dd.tar.gz
pyramid-e3bb4cd9e413e58ec6c7ea7d4682bac329b712dd.tar.bz2
pyramid-e3bb4cd9e413e58ec6c7ea7d4682bac329b712dd.zip
Merge branch 'caseman-master'
Diffstat (limited to 'docs/narr/zca.rst')
-rw-r--r--docs/narr/zca.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 394d02625..78a7b0b75 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -57,7 +57,7 @@ Using the ZCA Global API in a :app:`Pyramid` Application
-----------------------------------------------------------
:term:`Zope` uses a single ZCA registry -- the "global" ZCA registry
--- for all Zope applications run in the same Python process,
+-- for all Zope applications that run in the same Python process,
effectively making it impossible to run more than one Zope application
in a single process.