summaryrefslogtreecommitdiff
path: root/docs/narr/zca.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
committerChris McDonough <chrism@plope.com>2011-10-06 05:40:58 -0400
commit87dbfa4cd26171414d971d4f56f2aceaceb9a6eb (patch)
tree38876d7fe78e1b32763fa185f0dc9546e113671a /docs/narr/zca.rst
parent206a7f6eb776ff91043ce9cf4627dad20f68b937 (diff)
parent75f05a60f8754c9c5c234b9731dbc08646ba89a9 (diff)
downloadpyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.gz
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.tar.bz2
pyramid-87dbfa4cd26171414d971d4f56f2aceaceb9a6eb.zip
Merge branch 'feature.glue'
Diffstat (limited to 'docs/narr/zca.rst')
-rw-r--r--docs/narr/zca.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 96aac6a80..f7707ea29 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -61,14 +61,13 @@ Using the ZCA Global API in a :app:`Pyramid` Application
effectively making it impossible to run more than one Zope application
in a single process.
-However, for ease of deployment, it's often useful to be able to run
-more than a single application per process. For example, use of a
-:term:`Paste` "composite" allows you to run separate individual WSGI
+However, for ease of deployment, it's often useful to be able to run more
+than a single application per process. For example, use of a
+:term:`PasteDeploy` "composite" allows you to run separate individual WSGI
applications in the same process, each answering requests for some URL
-prefix. This makes it possible to run, for example, a TurboGears
-application at ``/turbogears`` and a :app:`Pyramid` application at
-``/pyramid``, both served up using the same :term:`WSGI` server
-within a single Python process.
+prefix. This makes it possible to run, for example, a TurboGears application
+at ``/turbogears`` and a :app:`Pyramid` application at ``/pyramid``, both
+served up using the same :term:`WSGI` server within a single Python process.
Most production Zope applications are relatively large, making it
impractical due to memory constraints to run more than one Zope