summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
committerChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
commit91ab804c9786d680a1eff9041de1bea76e75c225 (patch)
tree3261680948dbd55cf573aef4a35f1d3e69c85d00 /docs/tutorials/wiki2
parent3e4f429cce60465f2d58d0a60eb6a3adb5f9a377 (diff)
parent6b471ecd40cc04a595349e7074f02d836fd2ea6a (diff)
downloadpyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.gz
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.bz2
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.zip
Merge branch 'master' of https://github.com/osmaker/pyramid into osmaker-master
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 565bd0e96..17dcfc48f 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -60,7 +60,7 @@ function:
#. *Lines 13-14*. Register a :term:`route configuration` via the
:meth:`pyramid.config.Configurator.add_route` method that will be
- used when the URL is ``/``. Since this route has an ``pattern`` equalling
+ used when the URL is ``/``. Since this route has a ``pattern`` equalling
``/`` it is the "default" route. The argument named ``view`` with the
value ``tutorial.views.my_view`` is the dotted name to a *function* we
write (generated by the ``pyramid_routesalchemy`` template) that is given