summaryrefslogtreecommitdiff
path: root/docs/narr/urldispatch.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
commit1a19bf74afc768db45c77604c2cd33cc26af34c1 (patch)
treece6cfba28f4ad75a89e34f51c3ba363e34e873a4 /docs/narr/urldispatch.rst
parent96ab9f26990423f67045e5639a29579a1a76a71e (diff)
parente0062294430dd1d30d31b9f8c0a2e6e9060bcb76 (diff)
downloadpyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.gz
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.bz2
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/urldispatch.rst')
-rw-r--r--docs/narr/urldispatch.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ecf3d026a..480b0e0cc 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -86,7 +86,7 @@ setup code. However, the above :term:`scan` execution
``config.scan('mypackage')`` will pick up all :term:`configuration
decoration`, including any objects decorated with the
:class:`pyramid.view.view_config` decorator in the ``mypackage`` Python
-pakage. For example, if you have a ``views.py`` in your package, a scan will
+package. For example, if you have a ``views.py`` in your package, a scan will
pick up any of its configuration decorators, so we can add one there that
that references ``myroute`` as a ``route_name`` parameter: