diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-04 20:02:23 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-04 20:02:23 -0500 |
| commit | f2ef9a3026723cabbfaeffd128d7b7a874f74002 (patch) | |
| tree | ef6d5ee7cbe8e011f9a96dd848cbac2260524596 /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 95df3ac0fc92e882997997dac97b7ba86e19e963 (diff) | |
| parent | 4ded431cba6729e5f2ac1879df735905006555ac (diff) | |
| download | pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.tar.gz pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.tar.bz2 pyramid-f2ef9a3026723cabbfaeffd128d7b7a874f74002.zip | |
Merge branch '1.3-branch' into pathinfogeddon
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 77658970d..e4200ae0f 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -145,7 +145,7 @@ package. As the result of this view configuration, when the pattern associated with the view named ``home`` is matched during a request, the function named -``my_view`` will be executed. The the function named ``my_view`` returns a +``my_view`` will be executed. The function named ``my_view`` returns a dictionary; the renderer will use the ``templates/mytemplate.pt`` template to create a response based on the values in the dictionary. |