diff options
| author | Ben Bangert <ben@groovie.org> | 2010-10-29 16:03:20 -0700 |
|---|---|---|
| committer | Ben Bangert <ben@groovie.org> | 2010-10-29 16:03:20 -0700 |
| commit | 8b0d7ce11cb836b9073010d524cb7f636f1649ec (patch) | |
| tree | e8f0309546ebb8c40ee83a5416f60e4f12ccfb65 /docs/glossary.rst | |
| parent | 17e70c8db9140c0b4062f46ef5eb4527d678b793 (diff) | |
| parent | 71ff1038f9ae7578e303ca9f657d34e4ee09305a (diff) | |
| download | pyramid-8b0d7ce11cb836b9073010d524cb7f636f1649ec.tar.gz pyramid-8b0d7ce11cb836b9073010d524cb7f636f1649ec.tar.bz2 pyramid-8b0d7ce11cb836b9073010d524cb7f636f1649ec.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 9259fed0a..7320f5b4c 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -572,7 +572,6 @@ Glossary of code in a package. configuration decoration - Metadata implying one or more :term:`configuration declaration` invocations. Often set by configuration Python :term:`decorator` attributes, such as :class:`pyramid.view.view_config`, aka |