Docs: Make "userid" link to the glossary term.

4 files changed, 33 insertions, 29 deletions

diff --git a/docs/api/request.rst b/docs/api/request.rst
index 3a32fd938..4f93fa34f 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -167,27 +167,28 @@
 
       .. versionadded:: 1.5
 
-      A property which returns the userid of the currently authenticated user
-      or ``None`` if there is no :term:`authentication policy` in effect or
-      there is no currently authenticated user.  This differs from
-      :attr:`~pyramid.request.Request.unauthenticated_userid`, because the
-      effective authentication policy will have ensured that a record
-      associated with the userid exists in persistent storage; if it has
-      not, this value will be ``None``.
+      A property which returns the :term:`userid` of the currently
+      authenticated user or ``None`` if there is no :term:`authentication
+      policy` in effect or there is no currently authenticated user.  This
+      differs from :attr:`~pyramid.request.Request.unauthenticated_userid`,
+      because the effective authentication policy will have ensured that a
+      record associated with the :term:`userid` exists in persistent storage; if it
+      has not, this value will be ``None``.
 
    .. attribute:: unauthenticated_userid
 
       .. versionadded:: 1.5
 
       A property which returns a value which represents the *claimed* (not
-      verified) user id of the credentials present in the request. ``None`` if
-      there is no :term:`authentication policy` in effect or there is no user
-      data associated with the current request.  This differs from
-      :attr:`~pyramid.request.Request.authenticated_userid`, because the
-      effective authentication policy will not ensure that a record associated
-      with the userid exists in persistent storage.  Even if the userid
-      does not exist in persistent storage, this value will be the value
-      of the userid *claimed* by the request data.
+      verified) :term:`userid` of the credentials present in the
+      request. ``None`` if there is no :term:`authentication policy` in effect
+      or there is no user data associated with the current request.  This
+      differs from :attr:`~pyramid.request.Request.authenticated_userid`,
+      because the effective authentication policy will not ensure that a
+      record associated with the :term:`userid` exists in persistent storage.
+      Even if the :term:`userid` does not exist in persistent storage, this
+      value will be the value of the :term:`userid` *claimed* by the request
+      data.
 
    .. attribute:: effective_principals
 
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 16718cfa4..f3879d0ba 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -595,19 +595,21 @@ that implements the following interface:
        """ An object representing a Pyramid authentication policy. """
 
        def authenticated_userid(self, request):
-           """ Return the authenticated userid or ``None`` if no
-           authenticated userid can be found. This method of the policy 
-           should ensure that a record exists in whatever persistent store is 
-           used related to the user (the user should not have been deleted); 
-           if a record associated with the current id does not exist in a 
-           persistent store, it should return ``None``."""
+           """ Return the authenticated :term:`userid` or ``None`` if
+           no authenticated userid can be found. This method of the
+           policy should ensure that a record exists in whatever
+           persistent store is used related to the user (the user
+           should not have been deleted); if a record associated with
+           the current id does not exist in a persistent store, it
+           should return ``None``."""
 
        def unauthenticated_userid(self, request):
-           """ Return the *unauthenticated* userid.  This method performs the
-           same duty as ``authenticated_userid`` but is permitted to return the
-           userid based only on data present in the request; it needn't (and
-           shouldn't) check any persistent store to ensure that the user record
-           related to the request userid exists."""
+           """ Return the *unauthenticated* userid.  This method
+           performs the same duty as ``authenticated_userid`` but is
+           permitted to return the userid based only on data present
+           in the request; it needn't (and shouldn't) check any
+           persistent store to ensure that the user record related to
+           the request userid exists."""
 
        def effective_principals(self, request):
            """ Return a sequence representing the effective principals
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index eb785dd1c..28380bd66 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -53,10 +53,10 @@ Security
 We'll eventually be adding security to our application.  The components we'll
 use to do this are below.
 
-- USERS, a dictionary mapping usernames to their
+- USERS, a dictionary mapping :term:`userids <userid>` to their
   corresponding passwords.
 
-- GROUPS, a dictionary mapping usernames to a
+- GROUPS, a dictionary mapping :term:`userids <userid>` to a
   list of groups to which they belong to.
 
 - ``groupfinder``, an *authorization callback* that looks up
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index df2c83398..ff7413668 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -53,7 +53,8 @@ Security
 We'll eventually be adding security to our application.  The components we'll
 use to do this are below.
 
-- USERS, a dictionary mapping users names to their corresponding passwords.
+- USERS, a dictionary mapping users names (the user's :term:`userids
+  <userid>`) to their corresponding passwords.
 
 - GROUPS, a dictionary mapping user names to a list of groups they belong to.