diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
| commit | faf334d94e8c7450962b6b0d18fe57cefd43f04a (patch) | |
| tree | bac12a41585561e84b914ede37bcd83a62764fb9 /docs/tutorials/wiki2/definingviews.rst | |
| parent | 53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff) | |
| parent | 4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff) | |
| download | pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2 pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/tutorials/wiki2/definingviews.rst')
| -rw-r--r-- | docs/tutorials/wiki2/definingviews.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst index a1e2313f3..49dbed50f 100644 --- a/docs/tutorials/wiki2/definingviews.rst +++ b/docs/tutorials/wiki2/definingviews.rst @@ -30,7 +30,7 @@ Open ``tutorial/setup.py`` and edit it to look like the following: .. literalinclude:: src/views/setup.py :linenos: :language: python - :emphasize-lines: 19 + :emphasize-lines: 20 (Only the highlighted line needs to be added.) @@ -272,9 +272,9 @@ by the view (row 45). The view will use the ``body`` and none of our tutorial views return in their dictionary. ``request`` is one of several names that are available "by default" in a template when a template - renderer is used. See :ref:`chameleon_template_renderers` for + renderer is used. See :ref:`renderer_system_values` for information about other names that are available by default - when a Chameleon template is used as a renderer. + when a template is used as a renderer. Static Assets ------------- @@ -335,7 +335,7 @@ something like: .. literalinclude:: src/views/tutorial/__init__.py :linenos: :language: python - :emphasize-lines: 18-21 + :emphasize-lines: 19-22 (The highlighted lines are the ones that need to be added or edited.) |