summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/definingviews.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:39:48 -0500
commitcf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch)
treec792a3bf12b2b2615fbb306e354c85b10983d63b /docs/tutorials/wiki/definingviews.rst
parent1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff)
parentc5d01d4667d678782898b7d6859d60c617e30a9e (diff)
downloadpyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2
pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/definingviews.rst')
-rw-r--r--docs/tutorials/wiki/definingviews.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 529603546..27f55da13 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -115,7 +115,7 @@ The curried function named ``check`` is used as the first argument to
each WikiWord match found in the content. If the wiki (our page's
``__parent__``) already contains a page with the matched WikiWord name, the
``check`` function generates a view link to be used as the substitution value
-and returns it. If the wiki does not already contain a page with with the
+and returns it. If the wiki does not already contain a page with the
matched WikiWord name, the function generates an "add" link as the
substitution value and returns it.