summaryrefslogtreecommitdiff
path: root/docs/narr/viewconfig.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-09-29 00:25:41 -0700
committerGitHub <noreply@github.com>2016-09-29 00:25:41 -0700
commit2058b2e25cf261505efeb75db6ca49bc2749d3cf (patch)
tree4be43c097dfd2fa08f036e524b04863bee197741 /docs/narr/viewconfig.rst
parent9060dffe29e60e7528aab8d6d2006eee3cd72522 (diff)
parent0fdafb4336b83f567861260ee1b1cac51a23bb1f (diff)
downloadpyramid-2058b2e25cf261505efeb75db6ca49bc2749d3cf.tar.gz
pyramid-2058b2e25cf261505efeb75db6ca49bc2749d3cf.tar.bz2
pyramid-2058b2e25cf261505efeb75db6ca49bc2749d3cf.zip
Merge pull request #2776 from stevepiercy/master
Clean up docstrings/narr docs from PR #2660
Diffstat (limited to 'docs/narr/viewconfig.rst')
-rw-r--r--docs/narr/viewconfig.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 76eaf3cc5..7cb8e0306 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -307,8 +307,8 @@ configured view.
interface; it is otherwise false.
It is possible to pass an exception class as the context if your context may
- subclass an exception. In this case **two** views will be registered. One
- will match normal incoming requests and the other will match as an
+ subclass an exception. In this case *two* views will be registered. One
+ will match normal incoming requests, and the other will match as an
:term:`exception view` which only occurs when an exception is raised during
the normal request processing pipeline.
@@ -317,11 +317,11 @@ configured view.
``exception_only``
- When this value is ``True`` the ``context`` argument must be a subclass of
+ When this value is ``True``, the ``context`` argument must be a subclass of
``Exception``. This flag indicates that only an :term:`exception view` should
- be created and that this view should not match if the traversal
+ be created, and that this view should not match if the traversal
:term:`context` matches the ``context`` argument. If the ``context`` is a
- subclass of ``Exception`` and this value is ``False`` (the default) then a
+ subclass of ``Exception`` and this value is ``False`` (the default), then a
view will be registered to match the traversal :term:`context` as well.
.. versionadded:: 1.8