summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2018-11-21 15:14:51 -0600
committerKarl O. Pinc <kop@meme.com>2018-11-21 15:14:51 -0600
commitd9e13bef1c8252f65febfdda5eae341eba987c9a (patch)
tree0d0b2f7a8de609f112bb2bce7b9b1dfbe11993f0 /docs/narr
parent7414c862e8be7f4267e0e5ba7fc30e123f65a816 (diff)
downloadpyramid-d9e13bef1c8252f65febfdda5eae341eba987c9a.tar.gz
pyramid-d9e13bef1c8252f65febfdda5eae341eba987c9a.tar.bz2
pyramid-d9e13bef1c8252f65febfdda5eae341eba987c9a.zip
Revert "Link to "settings" golssary term at first occurance in narrative docs"
This reverts commit ebe4a2418ca55533fc7d20ac57f2cf727318b23d.
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/firstapp.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 6769c0d38..917482976 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -190,8 +190,9 @@ 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 sets up views and various other configuration :term:`settings`, have been performed).
-The ``make_wsgi_app``
+A call to ``make_wsgi_app`` implies that all configuration is 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 applications. We don't discuss