summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2011-07-14 16:21:36 -0700
committerMichael Merickel <michael@merickel.org>2011-07-14 16:21:36 -0700
commitfeb94163ea985addcc427173ffb13f4dad697525 (patch)
treed8cdf004e6d357433f110d285ea472e7362a91f3
parent0428eddb22b02611f1f5e250d916cf705f781aee (diff)
parentcab6fc74a00f1e205c717ba08012a3ef0f20e0b4 (diff)
downloadpyramid-feb94163ea985addcc427173ffb13f4dad697525.tar.gz
pyramid-feb94163ea985addcc427173ffb13f4dad697525.tar.bz2
pyramid-feb94163ea985addcc427173ffb13f4dad697525.zip
Merge pull request #236 from AnneGilles/patch-1
Edited docs/narr/viewconfig.rst via GitHub
-rw-r--r--docs/narr/viewconfig.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index a45ebae32..54d3fc4ff 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -11,7 +11,7 @@ View Configuration
single: view lookup
:term:`View lookup` is the :app:`Pyramid` subsystem responsible for finding
-an invoking a :term:`view callable`. :term:`View configuration` controls how
+and invoking a :term:`view callable`. :term:`View configuration` controls how
:term:`view lookup` operates in your application. During any given request,
view configuration information is compared against request data by the view
lookup subsystem in order to find the "best" view callable for that request.