diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-01-28 16:09:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-28 16:09:59 -0800 |
| commit | 24455634162ef66420880f7750fbe1ca069aca82 (patch) | |
| tree | 4a1ef6d4a893cd846d0f029dfce315f97d15167e /docs | |
| parent | 6aa7322e2e4eb9615b88a18c1f8ff817332eb259 (diff) | |
| parent | 3ef8d92dbbd8b97ec66d5652b9a66a3652904722 (diff) | |
| download | pyramid-24455634162ef66420880f7750fbe1ca069aca82.tar.gz pyramid-24455634162ef66420880f7750fbe1ca069aca82.tar.bz2 pyramid-24455634162ef66420880f7750fbe1ca069aca82.zip | |
Merge pull request #2936 from stevepiercy/master
minor grammar fixes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/views.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst index d4826be4d..e8a07202e 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -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. |