summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-05-03 00:11:50 -0500
committerMichael Merickel <michael@merickel.org>2012-05-03 00:11:50 -0500
commitc1c2b6ad8e22f9cba291de8903edfa4c7c741dca (patch)
treec3bfa436eafa3903af04a4f4f3750a7ddb216830 /docs/glossary.rst
parentc3df7a76fa9f92201fbf57693b580b8904fac038 (diff)
parent004882434aa166a58c3b2148322e08ce61ec4cb7 (diff)
downloadpyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.gz
pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.bz2
pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.zip
Merge branch 'master' into feature.json-api
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 88598354a..45a79326f 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -922,9 +922,9 @@ Glossary
http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
scaffold
- A project template that helps users get started writing a Pyramid
- application quickly. Scaffolds are usually used via the ``pcreate``
- command.
+ A project template that generates some of the major parts of a Pyramid
+ application and helps users to quickly get started writing larger
+ applications. Scaffolds are usually used via the ``pcreate`` command.
pyramid_exclog
A package which logs Pyramid application exception (error) information