summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-03-06 00:09:54 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-03-06 00:09:54 +0200
commit02e6877a79fe7874af5103d9e6c886d67a09eb7f (patch)
tree3ecda622b803ae0441d59307e672a11d64536ab1 /docs/narr/project.rst
parent2605e0cc2ad089d4f25c00a5f2c4d99ffbfa4567 (diff)
downloadpyramid-02e6877a79fe7874af5103d9e6c886d67a09eb7f.tar.gz
pyramid-02e6877a79fe7874af5103d9e6c886d67a09eb7f.tar.bz2
pyramid-02e6877a79fe7874af5103d9e6c886d67a09eb7f.zip
address issues raised by Tres Seaver at #884
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 184d36512..5a8ea0ecf 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -829,7 +829,7 @@ also informs Python that the directory which contains it is a *package*.
#. Line 1 imports the :term:`Configurator` class from :mod:`pyramid.config`
that we use later.
-#. Lines 4-11 defines a function named ``main`` that returns a :app:`Pyramid`
+#. Lines 4-11 define a function named ``main`` that returns a :app:`Pyramid`
WSGI application. This function is meant to be called by the
:term:`PasteDeploy` framework as a result of running ``pserve``.
@@ -865,7 +865,7 @@ and which returns a :term:`response`.
:language: python
:linenos:
-Lines 4-6 defines and registers a :term:`view callable` named ``my_view``. The
+Lines 4-6 define and register a :term:`view callable` named ``my_view``. The
function named ``my_view`` is decorated with a ``view_config`` decorator
(which is processed by the ``config.scan()`` line in our ``__init__.py``).
The view_config decorator asserts that this view be found when a