summaryrefslogtreecommitdiff
path: root/docs/narr/assets.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/assets.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/assets.rst')
-rw-r--r--docs/narr/assets.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index 74fa7723e..bbb673ecc 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -28,7 +28,7 @@ asset:
The use of assets is quite common in most web development projects. For
example, when you create a :app:`Pyramid` application using one of the
-available "paster" templates, as described in :ref:`creating_a_project`, the
+available scaffolds, as described in :ref:`creating_a_project`, the
directory representing the application contains a Python :term:`package`.
Within that Python package, there are directories full of files which are
static assets. For example, there's a ``static`` directory which contains