summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2019-12-23 14:14:48 -0600
committerGitHub <noreply@github.com>2019-12-23 14:14:48 -0600
commit323cfbb45e6ee4b7462bbea9dcaa4e8258dd74f6 (patch)
treec1b2565b27da44efefdab57294f78025ebad53e1 /docs/glossary.rst
parent912dc539ca793959d7465995f906279dad21ccc9 (diff)
parente46d009954e89be393d748b9e97b1202ece3eafe (diff)
downloadpyramid-323cfbb45e6ee4b7462bbea9dcaa4e8258dd74f6.tar.gz
pyramid-323cfbb45e6ee4b7462bbea9dcaa4e8258dd74f6.tar.bz2
pyramid-323cfbb45e6ee4b7462bbea9dcaa4e8258dd74f6.zip
Merge pull request #3545 from luhn/authenticated-userid
Security policy changes
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 81358e688..5a33ff39d 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -303,9 +303,8 @@ Glossary
request. Oftentimes this is the ID of the user object in a database.
identity
- An identity is an object identifying the user associated with the
- current request. The identity can be any object, but should implement a
- ``__str__`` method that outputs a corresponding :term:`userid`.
+ An identity is an object identifying the user associated with the current request.
+ The object can be of any shape, such as a simple ID string or an ORM object.
security policy
A security policy in :app:`Pyramid` terms is an object implementing the