summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-19 16:22:31 -0500
committerChris McDonough <chrism@plope.com>2010-12-19 16:22:31 -0500
commit9d12165acae60c3e8e538f94bd28a2e82b5d9523 (patch)
tree6410afa974d7e467b3a888ff36e90655fe4de276 /docs
parentbfd8d565cfbc994aa3b0e5dadd386227c02f5d18 (diff)
parent75f8665937a7fdd91a87ac9d9038e80712ab70ce (diff)
downloadpyramid-9d12165acae60c3e8e538f94bd28a2e82b5d9523.tar.gz
pyramid-9d12165acae60c3e8e538f94bd28a2e82b5d9523.tar.bz2
pyramid-9d12165acae60c3e8e538f94bd28a2e82b5d9523.zip
Merge branch 'jahmad-typos'
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/urldispatch.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 9a9769d23..5823abb04 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -25,7 +25,7 @@ If route configuration is present in an application, the :app:`Pyramid`
matching patterns present in a *route map*.
If any route pattern matches the information in the :term:`request` provided
-to :app:`Pyramid`, app:`Pyramid` will shortcut :term:`traversal`, and will
+to :app:`Pyramid`, :app:`Pyramid` will shortcut :term:`traversal`, and will
invoke :term:`view lookup` using a :term:`context` resource generated by the
route match.
@@ -108,7 +108,6 @@ rather than an actual callable:
# "config" below is presumed to be an instance of the
# pyramid.config.Configurator class; "myview" is assumed
# to be a "view callable" function
- from myproject.views import myview
config.add_route('myroute', '/prefix/{one}/{two}',
view='myproject.views.myview')