summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
commit4937d9e5280fff849b346dcf6c1833ef6fe95119 (patch)
tree69fe13b7853a3da419b03a7987e92e43753b65b5 /docs/tutorials/wiki
parentbfb71c175bb5de7a0c22599979d269d92f12ed27 (diff)
parent9a784a4c94946872c493627e4295a26a3e608439 (diff)
downloadpyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.gz
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.bz2
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki')
-rw-r--r--docs/tutorials/wiki/definingviews.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 9d783f8cb..ed3a84118 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -7,7 +7,9 @@ application is typically a simple Python function that accepts two
parameters: :term:`context` and :term:`request`. A view callable is
assumed to return a :term:`response` object.
-.. note:: A :app:`Pyramid` view can also be defined as callable
+.. note::
+
+ A :app:`Pyramid` view can also be defined as callable
which accepts *only* a :term:`request` argument. You'll see
this one-argument pattern used in other :app:`Pyramid` tutorials
and applications. Either calling convention will work in any
@@ -253,7 +255,9 @@ the below:
.. literalinclude:: src/views/tutorial/templates/view.pt
:language: xml
-.. note:: The names available for our use in a template are always those that
+.. note::
+
+ The names available for our use in a template are always those that
are present in the dictionary returned by the view callable. But our
templates make use of a ``request`` object that none of our tutorial views
return in their dictionary. This value appears as if "by magic".