diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-29 13:57:54 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-29 13:57:54 -0500 |
| commit | 7f14c3750dcf2b79e9146b0a3750af307fd1a86b (patch) | |
| tree | 198d67733a6303f3ce0c8f17e3938d0619f37ed2 /docs/narr/introduction.rst | |
| parent | fcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (diff) | |
| parent | 581a401c26047a6cddb6521393de4030ce0a962a (diff) | |
| download | pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.gz pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.tar.bz2 pyramid-7f14c3750dcf2b79e9146b0a3750af307fd1a86b.zip | |
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/narr/introduction.rst')
| -rw-r--r-- | docs/narr/introduction.rst | 2 |
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. |