summaryrefslogtreecommitdiff
path: root/docs/narr/viewconfig.rst
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-21 14:56:33 -0400
committerTres Seaver <tseaver@palladion.com>2013-03-21 14:56:33 -0400
commitf38126c3214c936f022e68a1cac88c3cd8644879 (patch)
tree41b3b32e58b8071adef23f3220ddd1be939239ff /docs/narr/viewconfig.rst
parent1b280e0df1269f539145f941b81ee3b98115ddc2 (diff)
parent02e6877a79fe7874af5103d9e6c886d67a09eb7f (diff)
downloadpyramid-f38126c3214c936f022e68a1cac88c3cd8644879.tar.gz
pyramid-f38126c3214c936f022e68a1cac88c3cd8644879.tar.bz2
pyramid-f38126c3214c936f022e68a1cac88c3cd8644879.zip
Resolve conflict.
Diffstat (limited to 'docs/narr/viewconfig.rst')
-rw-r--r--docs/narr/viewconfig.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index d3221db3c..e0338c442 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