diff options
| author | Chris McDonough <chrism@plope.com> | 2015-06-05 14:06:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-06-05 14:06:02 -0400 |
| commit | f3c67a4217504bc7f2862ec1616342240738efae (patch) | |
| tree | 9e7452b3ffdc8d4f30739cfc9d898169d6719206 /docs/quick_tutorial/authentication.rst | |
| parent | 7b4ed3088af03de473ad164c314062c283afce39 (diff) | |
| parent | c1dbb5092d486df5d7fbad8e52cd1dbcc2c834d9 (diff) | |
| download | pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.gz pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.bz2 pyramid-f3c67a4217504bc7f2862ec1616342240738efae.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tutorial/authentication.rst')
| -rw-r--r-- | docs/quick_tutorial/authentication.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst index 4b4eb1ba3..a4ab83c45 100644 --- a/docs/quick_tutorial/authentication.rst +++ b/docs/quick_tutorial/authentication.rst @@ -93,7 +93,7 @@ Steps Analysis ======== -Unlike many web frameworks, Pyramid includes a built-in (but optional) +Unlike many web frameworks, Pyramid includes a built-in but optional security model for authentication and authorization. This security system is intended to be flexible and support many needs. In this security model, authentication (who are you) and authorization (what |