Merge branch '2.5' into 2.6

weaverryan · weaverryan · commit 640b29ea23e5 · 2014-12-30T22:37:20.000-05:00
* 2.5:
  Fixing build error
  Fixing build error
diff --git a/book/security.rst b/book/security.rst
@@ -924,8 +924,6 @@ special attributes like this:
   this - this is useful when *whitelisting* URLs to guarantee access - some
   details are in :doc:`/cookbook/security/access_control`.
 
-.. _security-secure-objects:
-
 .. _book-security-template-expression:
 
 .. versionadded:: 2.4
@@ -953,6 +951,8 @@ You can also use expressions inside your templates:
 
 For more details on expressions and security, see :ref:`book-security-expressions`.
 
+.. _security-secure-objects:
+
 Access Control Lists (ACLs): Securing individual Database Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/cookbook/expression/expressions.rst b/cookbook/expression/expressions.rst
@@ -64,7 +64,7 @@ Inside the expression, you have access to a number of variables:
     The user object (or the string ``anon`` if you're not authenticated).
 ``roles``
     The array of roles the user has, including from the
-    :ref:`role hierarchy <book-security-role-hierarchy>` but not including the
+    :ref:`role hierarchy <security-role-hierarchy>` but not including the
     ``IS_AUTHENTICATED_*`` attributes (see the functions below).
 ``object``
      The object (if any) that's passed as the second argument to ``isGranted``.
