summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorTheron Luhn <theron@luhn.com>2020-12-11 09:21:41 -0800
committerTheron Luhn <theron@luhn.com>2020-12-11 09:21:41 -0800
commit43bd1a16de441d971bb6e1f3f6dbae055394e324 (patch)
treea87e5f7e18b224b9a2f8a2751f972d550751e48b /docs/api
parent86cb46d4d977d3a948308326bee628421cab93ea (diff)
parent6cf061e170039ff48e7f892f1176d1ab359e2001 (diff)
downloadpyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.gz
pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.bz2
pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.zip
Merge remote-tracking branch 'upstream/master' into wiki2-request-identity
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/authentication.rst2
-rw-r--r--docs/api/request.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/api/authentication.rst b/docs/api/authentication.rst
index f3a25ee64..a1a8dfea1 100644
--- a/docs/api/authentication.rst
+++ b/docs/api/authentication.rst
@@ -26,7 +26,7 @@ Authentication Policies
~~~~~~~~~~~~~~~~~~~~~~~
Authentication policies have been deprecated by the new security system. See
-:ref:`upgrading_auth` for more information.
+:ref:`upgrading_auth_20` for more information.
.. autoclass:: AuthTktAuthenticationPolicy
:members:
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 8704a2fe7..f6a3b62a6 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -176,7 +176,7 @@
``unauthenticated_userid`` has been deprecated in version 2.0. Use
:attr:`authenticated_userid` or :attr:`identity` instead. See
- :ref:`upgrading_auth` for more information.
+ :ref:`upgrading_auth_20` for more information.
A property which returns a value which represents the *claimed* (not
verified) :term:`userid` of the credentials present in the
@@ -194,7 +194,7 @@
.. deprecated:: 2.0
The new security policy has removed the concept of principals. See
- :ref:`upgrading_auth` for more information.
+ :ref:`upgrading_auth_20` for more information.
A property which returns the list of 'effective' :term:`principal`
identifiers for this request. This list typically includes the