namespace upgrading_auth since it's in the whatsnew doc

7 files changed, 14 insertions, 14 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
diff --git a/docs/whatsnew-2.0.rst b/docs/whatsnew-2.0.rst
index 8685d9629..dd87d5cee 100644
--- a/docs/whatsnew-2.0.rst
+++ b/docs/whatsnew-2.0.rst
@@ -14,11 +14,11 @@ Feature Additions
 The feature additions in Pyramid 2.0 are as follows:
 
 - The authentication and authorization policies of Pyramid 1.x have been merged into a single :term:`security policy` in Pyramid 2.0.
-  For details on how to migrate to the new security policy, see :ref:`upgrading_auth`.
+  For details on how to migrate to the new security policy, see :ref:`upgrading_auth_20`.
   Authentication and authorization policies can still be used and will continue to function normally for the time being.
 
   New security APIs have been added to support an overhaul of the authentication and authorization system.
-  Read :ref:`upgrading_auth` for information about using this new system.
+  Read :ref:`upgrading_auth_20` for information about using this new system.
 
   - :meth:`pyramid.config.Configurator.set_security_policy`
   - :class:`pyramid.interfaces.ISecurityPolicy`
@@ -95,7 +95,7 @@ Deprecations
 - Authentication and authorization policies have been deprecated in favor of
   the new :term:`security policy`.
 
-.. _upgrading_auth:
+.. _upgrading_auth_20:
 
 Upgrading Authentication/Authorization
 --------------------------------------
diff --git a/src/pyramid/authorization.py b/src/pyramid/authorization.py
index eadd46f85..2bef53ad9 100644
--- a/src/pyramid/authorization.py
+++ b/src/pyramid/authorization.py
@@ -60,7 +60,7 @@ class ACLAuthorizationPolicy:
     .. deprecated:: 2.0
 
         Authorization policies have been deprecated by the new security system.
-        See :ref:`upgrading_auth` for more information.
+        See :ref:`upgrading_auth_20` for more information.
 
     """
 
diff --git a/src/pyramid/config/security.py b/src/pyramid/config/security.py
index c63914fd0..59e8d0799 100644
--- a/src/pyramid/config/security.py
+++ b/src/pyramid/config/security.py
@@ -122,7 +122,7 @@ class SecurityConfiguratorMixin:
         .. deprecated:: 2.0
 
             Authentication policies have been replaced by security policies.
-            See :ref:`upgrading_auth` for more information.
+            See :ref:`upgrading_auth_20` for more information.
 
         Override the :app:`Pyramid` :term:`authorization policy` in the
         current configuration.  The ``policy`` argument must be an instance
diff --git a/src/pyramid/interfaces.py b/src/pyramid/interfaces.py
index 0b7a07040..29c5eb0da 100644
--- a/src/pyramid/interfaces.py
+++ b/src/pyramid/interfaces.py
@@ -535,7 +535,7 @@ class IAuthenticationPolicy(Interface):
     .. deprecated:: 2.0
 
         Authentication policies have been removed in favor of security
-        policies.  See :ref:`upgrading_auth` for more information.
+        policies.  See :ref:`upgrading_auth_20` for more information.
 
     """
 
@@ -595,7 +595,7 @@ class IAuthorizationPolicy(Interface):
     .. deprecated:: 2.0
 
         Authentication policies have been removed in favor of security
-        policies.  See :ref:`upgrading_auth` for more information.
+        policies.  See :ref:`upgrading_auth_20` for more information.
 
     """
 
diff --git a/src/pyramid/security.py b/src/pyramid/security.py
index 9cdafaf6f..a0ab39701 100644
--- a/src/pyramid/security.py
+++ b/src/pyramid/security.py
@@ -85,7 +85,7 @@ def principals_allowed_by_permission(context, permission):
     .. 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.
 
     Provided a ``context`` (a resource object), and a ``permission``
     string, if an :term:`authorization policy` is
@@ -286,8 +286,8 @@ class AuthenticationAPIMixin:
         .. deprecated:: 2.0
 
             ``unauthenticated_userid`` does not have an equivalent in the new
-            security system.  Use :attr:`.authenticated_userid` or
-            :attr:`.identity` instead.  See :ref:`upgrading_auth` for more
+            security system. Use :attr:`.authenticated_userid` or
+            :attr:`.identity` instead. See :ref:`upgrading_auth_20` for more
             information.
 
         Return an object which represents the *claimed* (not verified) user
@@ -322,7 +322,7 @@ class AuthenticationAPIMixin:
         .. 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.
 
         Return the list of 'effective' :term:`principal` identifiers
         for the ``request``. If no :term:`authentication policy` is in effect,