summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-07 00:06:51 -0400
committerChris McDonough <chrism@plope.com>2010-11-07 00:06:51 -0400
commit9504d9ae6beac35d1c2a2114d4236a056105c3d9 (patch)
tree05c8f901c13ab01e52e04d482e5057faaca5187e /docs
parentfe93099d0cc0da2c1f462d226633fba39950b5b7 (diff)
parentb3a38e46b7a169d1dc41bbdd4c1eab126477bf87 (diff)
downloadpyramid-9504d9ae6beac35d1c2a2114d4236a056105c3d9.tar.gz
pyramid-9504d9ae6beac35d1c2a2114d4236a056105c3d9.tar.bz2
pyramid-9504d9ae6beac35d1c2a2114d4236a056105c3d9.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index a20213459..c35382896 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -240,11 +240,11 @@ Glossary
authorization
The act of determining whether a user can perform a specific
- action. In bfg terms, this means determining whether, for a given
- context, any :term:`principal` (or principals) associated with the
- request have the requisite :term:`permission` to allow the request
- to continue. Authorization in :mod:`pyramid` is performed via
- its :term:`authorization policy`.
+ action. In pyramid terms, this means determining whether, for a
+ given context, any :term:`principal` (or principals) associated
+ with the request have the requisite :term:`permission` to allow
+ the request to continue. Authorization in :mod:`pyramid` is
+ performed via its :term:`authorization policy`.
principal
A *principal* is a string or unicode object representing a userid