diff options
| author | Michael Merickel <michael@merickel.org> | 2012-01-05 03:47:58 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-01-05 03:47:58 -0600 |
| commit | a1751e1a522e331301955c7b540b26d988b51e64 (patch) | |
| tree | 300a7e63c438308eeea92deecf71423e8978877e /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 64497edc64a153815c54b254bf64a46ac21a6ac7 (diff) | |
| parent | 4ded431cba6729e5f2ac1879df735905006555ac (diff) | |
| download | pyramid-a1751e1a522e331301955c7b540b26d988b51e64.tar.gz pyramid-a1751e1a522e331301955c7b540b26d988b51e64.tar.bz2 pyramid-a1751e1a522e331301955c7b540b26d988b51e64.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
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. |