summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-10-28 18:25:13 -0700
committerBen Bangert <ben@groovie.org>2010-10-28 18:25:13 -0700
commit6a9d6246c9e9fda507fa04b462c00509b73f676f (patch)
tree0b8cfaddb2585a2456031aafa3fc287b40e59fb3 /docs/glossary.rst
parent6b49316f217a8fd72f8dac2abd7b7fcd8084e8bc (diff)
parenta62cc2264c2dda6a0588fddbc5712afea9d89837 (diff)
downloadpyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.tar.gz
pyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.tar.bz2
pyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index dfc40c407..2e2b11aaa 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -204,6 +204,15 @@ Glossary
to do this". Examples of permissions: ``read``, or
``view_blog_entries``.
+ default permission
+ A :term:`permission` which is registered as the default for an
+ entire application. When a default permission is in effect,
+ every :term:`view configuration` registered with the system will
+ be effectively amended with a ``permission`` argument that will
+ require that the executing user possess the default permission in
+ order to successfully execute the associated :term:`view
+ callable` See also :ref:`setting_a_default_permission`.
+
ACE
An *access control entry*. An access control entry is one element
in an :term:`ACL`. An access control entry is a three-tuple that