diff options
| author | Rob Miller <rob@mochimedia.com> | 2010-12-29 14:12:30 -0800 |
|---|---|---|
| committer | Rob Miller <rob@mochimedia.com> | 2010-12-29 14:12:30 -0800 |
| commit | 9c1d34a3de11286c98dce52592ef05a3c05046a5 (patch) | |
| tree | 3b9d60fabfa876bdaba9debd477f85cd9cf926bf /docs/narr/introduction.rst | |
| parent | 88231cc1b16f1f5a0983dba1dab9b401bbde0c00 (diff) | |
| parent | 8739f576ed84bb48cec9c2d4b60e92878a273b1f (diff) | |
| download | pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.gz pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.bz2 pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.zip | |
Merge remote branch 'refs/remotes/upstream/viewderiver' into ra_view_decoration
Conflicts:
CHANGES.txt
pyramid/config.py
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. |