summaryrefslogtreecommitdiff
path: root/docs/narr/urldispatch.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
committerChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
commit661790b6ca014021dd908cd6b93d789fe6c5dda1 (patch)
treea8944b860c10506521a07e6f67f7e5704f2fbd8c /docs/narr/urldispatch.rst
parentb596e1812627c359908759d7a8d83c339f08e385 (diff)
parent8027adf1e2ffe4498c7eda9a698ed61bec8a8c04 (diff)
downloadpyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.gz
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.bz2
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.zip
Merge branch 'jayd3e-master'
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 ca8fe84f3..219753882 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -946,7 +946,7 @@ initialization.
.. note:: This is only an example. In particular, it is not necessary to
cause ``DBSession.remove`` to be called in an application generated from
- any :app:`Pyramid` paster template, because these all use the
+ any :app:`Pyramid` scaffold, because these all use the
``repoze.tm2`` middleware. The cleanup done by ``DBSession.remove`` is
unnecessary when ``repoze.tm2`` middleware is in the WSGI pipeline.