summaryrefslogtreecommitdiff
path: root/docs/narr/firstapp.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-18 14:11:10 -0800
committerChris McDonough <chrism@plope.com>2013-01-18 14:11:10 -0800
commitba35f87aba776ae660532ec5d48a6c6b9d17c53f (patch)
tree93df98a5f82a151a7bad2227a487a2ad02d55c9f /docs/narr/firstapp.rst
parent9778b043a6298bcdd4191bd500229ce4650263b2 (diff)
parent362d8b0548410e7ab3e28d0d420342121496a1d2 (diff)
downloadpyramid-ba35f87aba776ae660532ec5d48a6c6b9d17c53f.tar.gz
pyramid-ba35f87aba776ae660532ec5d48a6c6b9d17c53f.tar.bz2
pyramid-ba35f87aba776ae660532ec5d48a6c6b9d17c53f.zip
Merge pull request #800 from tshepang/flow2
improve flow
Diffstat (limited to 'docs/narr/firstapp.rst')
-rw-r--r--docs/narr/firstapp.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 0b85d68d3..45cb917f7 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -194,8 +194,8 @@ WSGI Application Creation
After configuring views and ending configuration, the script creates a WSGI
*application* via the :meth:`pyramid.config.Configurator.make_wsgi_app`
method. A call to ``make_wsgi_app`` implies that all configuration is
-finished (meaning all method calls to the configurator which set up views,
-and various other configuration settings have been performed). The
+finished (meaning all method calls to the configurator, which sets up views
+and various other configuration settings, have been performed). The
``make_wsgi_app`` method returns a :term:`WSGI` application object that can
be used by any WSGI server to present an application to a requestor.
:term:`WSGI` is a protocol that allows servers to talk to Python