summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-12-31 13:48:13 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-12-31 13:48:13 -0700
commit22642d73056f06a1834dce8970922951fa18c5a1 (patch)
treee56037a9d48e7900b5ec3396b1ae28a2723ca623 /docs/narr/introduction.rst
parentf4c5f1a60612749ef36aae01d9a3a559b6acdfff (diff)
parentadfcf6d579496495fb71f8c1af293a953b3a13cb (diff)
downloadpyramid-22642d73056f06a1834dce8970922951fa18c5a1.tar.gz
pyramid-22642d73056f06a1834dce8970922951fa18c5a1.tar.bz2
pyramid-22642d73056f06a1834dce8970922951fa18c5a1.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 3ade3726c..c61ef21d4 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -63,7 +63,7 @@ A Sense of Fun
Minimalism
:app:`Pyramid` provides only the very basics: *URL to code
- mapping*, *templating*, *security*, and *resources*. There is not
+ mapping*, *templating*, *security*, and *assets*. There is not
much more to the framework than these pieces: you are expected to
provide the rest.