diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
| commit | cf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch) | |
| tree | c792a3bf12b2b2615fbb306e354c85b10983d63b /docs/tutorials/wiki2 | |
| parent | 1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff) | |
| parent | c5d01d4667d678782898b7d6859d60c617e30a9e (diff) | |
| download | pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2 pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki2')
| -rw-r--r-- | docs/tutorials/wiki2/definingviews.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst index 6b8689b5b..8714927c3 100644 --- a/docs/tutorials/wiki2/definingviews.rst +++ b/docs/tutorials/wiki2/definingviews.rst @@ -144,7 +144,7 @@ The ``check()`` function is used as the first argument to each WikiWord match found in the content. If the wiki already contains a page with the matched WikiWord name, ``check()`` 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 matched WikiWord name, ``check()`` +not already contain a page with the matched WikiWord name, ``check()`` generates an "add" link as the substitution value and returns it. As a result, the ``content`` variable is now a fully formed bit of HTML @@ -358,7 +358,7 @@ each of the following URLs, check that the result is as expected: of the FrontPage page object. - ``http://localhost:6543/FrontPage`` in a browser invokes - the ``view_page`` view of the front page page object. + the ``view_page`` view of the front page object. - ``http://localhost:6543/FrontPage/edit_page`` in a browser invokes the edit view for the front page object. |