summaryrefslogtreecommitdiff
path: root/docs/narr/views.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
committerChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
commitb2e8884a94d9e869bf29ea55298ad308f16ed420 (patch)
treee46bf79d1a8811ad273a40ce194d05836fcc7409 /docs/narr/views.rst
parent7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff)
parent40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff)
downloadpyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/views.rst')
-rw-r--r--docs/narr/views.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index ab139ea19..e8a07202e 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -52,7 +52,7 @@ of exceptions from within the body of a view callable.
Defining a View Callable as a Function
--------------------------------------
-One of the easiest way to define a view callable is to create a function that
+One of the easiest ways to define a view callable is to create a function that
accepts a single argument named ``request``, and which returns a
:term:`Response` object. For example, this is a "hello world" view callable
implemented as a function:
@@ -246,7 +246,7 @@ within view code, the result of the :term:`Not Found View` will be returned to
the user agent which performed the request.
If :exc:`~pyramid.httpexceptions.HTTPForbidden` is raised by Pyramid itself
-within view code, the result of the :term:`Forbidden View` will be returned to
+or within view code, the result of the :term:`Forbidden View` will be returned to
the user agent which performed the request.
.. index::
@@ -523,8 +523,7 @@ Alternate View Callable Argument/Calling Conventions
----------------------------------------------------
Usually view callables are defined to accept only a single argument:
-``request``. However, view callables may alternately be defined as classes,
-functions, or any callable that accept *two* positional arguments: a
+``request``. However, a view callable may alternately be defined as any class, function, or callable that accepts *two* positional arguments: a
:term:`context` resource as the first argument and a :term:`request` as the
second argument.