summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorTshepang Lekhonkhobe <tshepang@gmail.com>2013-02-16 22:57:05 +0200
committerTshepang Lekhonkhobe <tshepang@gmail.com>2013-03-05 01:44:49 +0200
commit2605e0cc2ad089d4f25c00a5f2c4d99ffbfa4567 (patch)
tree1dfdabeda59bf9392c1081eb2f83049c9017a371 /docs/narr
parent21264e3ed45fda41fb608ea4f69948aa9f9430c1 (diff)
downloadpyramid-2605e0cc2ad089d4f25c00a5f2c4d99ffbfa4567.tar.gz
pyramid-2605e0cc2ad089d4f25c00a5f2c4d99ffbfa4567.tar.bz2
pyramid-2605e0cc2ad089d4f25c00a5f2c4d99ffbfa4567.zip
grammar fixes
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/project.rst4
-rw-r--r--docs/narr/router.rst2
-rw-r--r--docs/narr/urldispatch.rst8
-rw-r--r--docs/narr/viewconfig.rst4
4 files changed, 9 insertions, 9 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 5a8ea0ecf..184d36512 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 define a function named ``main`` that returns a :app:`Pyramid`
+#. Lines 4-11 defines 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 define and register a :term:`view callable` named ``my_view``. The
+Lines 4-6 defines and registers 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
diff --git a/docs/narr/router.rst b/docs/narr/router.rst
index b78362066..ac3deefdc 100644
--- a/docs/narr/router.rst
+++ b/docs/narr/router.rst
@@ -46,7 +46,7 @@ request enters a :app:`Pyramid` application through to the point that
:class:`~pyramid.interfaces.IRoute` object representing the route which
matched. The root object associated with the route found is also
generated: if the :term:`route configuration` which matched has an
- associated a ``factory`` argument, this factory is used to generate the
+ associated ``factory`` argument, this factory is used to generate the
root object, otherwise a default :term:`root factory` is used.
#. If a route match was *not* found, and a ``root_factory`` argument was
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 749a2d49a..34543c4bb 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -16,12 +16,12 @@ receives the :term:`request` and returns a :term:`response` object.
High-Level Operational Overview
-------------------------------
-If route configuration is present in an application, the :app:`Pyramid`
+If a route configuration is present in an application, the :app:`Pyramid`
:term:`Router` checks every incoming request against an ordered set of URL
matching patterns present in a *route map*.
If any route pattern matches the information in the :term:`request`,
-:app:`Pyramid` will invoke :term:`view lookup` to find a matching view.
+:app:`Pyramid` will invoke a :term:`view lookup` to find a matching view.
If no route pattern in the route map matches the information in the
:term:`request` provided in your application, :app:`Pyramid` will fail over
@@ -71,7 +71,7 @@ invoked when the associated route pattern matches during a request.
More commonly, you will not use any ``add_view`` statements in your project's
"setup" code, instead only using ``add_route`` statements using a
-:term:`scan` for to associate view callables with routes. For example, if
+:term:`scan` to associate view callables with routes. For example, if
this is a portion of your project's ``__init__.py``:
.. code-block:: python
@@ -83,7 +83,7 @@ this is a portion of your project's ``__init__.py``:
Note that we don't call :meth:`~pyramid.config.Configurator.add_view` in this
setup code. However, the above :term:`scan` execution
-``config.scan('mypackage')`` will pick up all :term:`configuration
+``config.scan('mypackage')`` will pick up each :term:`configuration
decoration`, including any objects decorated with the
:class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
package. For example, if you have a ``views.py`` in your package, a scan will
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index e7c79b09b..63f9d1db5 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -62,9 +62,9 @@ particular view callable.
:term:`View predicate` attributes are an important part of view configuration
that enables the :term:`view lookup` subsystem to find and invoke the
-appropriate view. The greater number of predicate attributes possessed by a
+appropriate view. The greater the number of predicate attributes possessed by a
view's configuration, the more specific the circumstances need to be before
-the registered view callable will be invoked. The fewer number of predicates
+the registered view callable will be invoked. The fewer the number of predicates
which are supplied to a particular view configuration, the more likely it is
that the associated view callable will be invoked. A view with five
predicates will always be found and evaluated before a view with two, for