summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/definingviews.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-06-11 05:43:16 -0400
committerChris McDonough <chrism@plope.com>2011-06-11 05:43:16 -0400
commita4d5525cdbb6b7e614939b20a340b989258779ca (patch)
tree666586b1a0293a04fe3ed4bc27eeddbd680e4311 /docs/tutorials/wiki/definingviews.rst
parentaee35e30083acd3d3c84e7f50db1f17bf6dc2d12 (diff)
parentb1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08 (diff)
downloadpyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.tar.gz
pyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.tar.bz2
pyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/definingviews.rst')
-rw-r--r--docs/tutorials/wiki/definingviews.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index b6c083bbf..ae4fa6ffb 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -23,7 +23,7 @@ assumed to return a :term:`response` object.
the request as a single argument, you can obtain it via
``request.context``.
-We're going to define several :term:`view callable` functions then wire them
+We're going to define several :term:`view callable` functions, then wire them
into :app:`Pyramid` using some :term:`view configuration`.
The source code for this tutorial stage can be browsed via
@@ -202,8 +202,8 @@ the form post view callable for the form it renders. The ``context`` of the
If the view execution is *not* a result of a form submission (if the
expression ``'form.submitted' in request.params`` is ``False``), the view
-simply renders the edit form, passing the request, the page resource, and a
-save_url which will be used as the action of the generated form.
+simply renders the edit form, passing the page resource, and a ``save_url``
+which will be used as the action of the generated form.
If the view execution *is* a result of a form submission (if the expression
``'form.submitted' in request.params`` is ``True``), the view grabs the