summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-11-29 13:21:34 -0600
committerMichael Merickel <michael@merickel.org>2020-11-29 13:21:34 -0600
commitfc6434b63e70bddbb909036fbec2aad8feb4ab47 (patch)
treeca1d4b5e0ff7f695f159c937b15e27621eddc75c /docs
parent068193e303b45fdfdf2e4f62a7e89b6e1119bba5 (diff)
downloadpyramid-fc6434b63e70bddbb909036fbec2aad8feb4ab47.tar.gz
pyramid-fc6434b63e70bddbb909036fbec2aad8feb4ab47.tar.bz2
pyramid-fc6434b63e70bddbb909036fbec2aad8feb4ab47.zip
add a note and fix suggestions
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/whatsnew-2.0.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 17e3e4822..85d12b571 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -88,7 +88,7 @@ Glossary
The project files contain metadata that allow the package(s) to be installed, distributed, and tested.
distribution
- Setuptools / python packaging terminology. A file representing an
+ Setuptools / Python packaging terminology. A file representing an
installable library or application. Distributions are usually
archives that have the suffix of ``.whl``, ``.tar.gz``, or ``.zip``.
Distributions are the target of packaging-related commands such as ``pip install``.
diff --git a/docs/whatsnew-2.0.rst b/docs/whatsnew-2.0.rst
index d1f66707d..e97198b23 100644
--- a/docs/whatsnew-2.0.rst
+++ b/docs/whatsnew-2.0.rst
@@ -144,6 +144,13 @@ Deprecations
Upgrading Authentication/Authorization
--------------------------------------
+.. note::
+ It's important to note that the principal and ACL features within :app:`Pyramid` are not going away, nor deprecated, nor removed.
+ Most ACL features are deprecated in their current locations and moved into the :mod:`pyramid.authorization` module.
+ The main change is that they are now more optional than before and modifications were made to make the top-level APIs less opinionated as well as simpler.
+
+:app:`Pyramid` provides a simple set of APIs for plugging in allowed/denied semantics in your application.
+
The authentication and authorization policies of Pyramid 1.x have been merged into a single :term:`security policy` in Pyramid 2.0.
Authentication and authorization policies can still be used and will continue to function normally, however they have been deprecated and support may be removed in upcoming versions.