From a1a9fb7128c935848b17c0ce6586991098a17f07 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 27 May 2009 04:52:51 +0000
Subject: Merge authchanges branch to trunk.

---
 docs/api/security.rst | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'docs/api/security.rst')

diff --git a/docs/api/security.rst b/docs/api/security.rst
index 5990f1809..77b60f5d0 100644
--- a/docs/api/security.rst
+++ b/docs/api/security.rst
@@ -8,14 +8,21 @@
 API Functions
 ~~~~~~~~~~~~~
 
-.. autofunction:: authenticated_userid
+.. autofunction:: authenticated_userid(context, request)
 
-.. autofunction:: effective_principals
+.. autofunction:: effective_principals(context, request)
 
 .. autofunction:: has_permission
 
 .. autofunction:: principals_allowed_by_permission
 
+.. autofunction:: forget
+
+.. autofunction:: remember
+
+.. autofunction:: view_execution_permitted
+
+
 Constants
 ~~~~~~~~~
 
@@ -29,8 +36,8 @@ Constants
 
     The special principal id named 'Authenticated'.  This principal id
     is granted to all requests which contain any other non-Everyone
-    principal id (according to the security policy).  Its actual value
-    is the string 'system.Authenticated'.
+    principal id (according to the :term:`authentication policy`).
+    Its actual value is the string 'system.Authenticated'.
 
 .. attribute:: ALL_PERMISSIONS
 
@@ -73,15 +80,3 @@ Return Values
 .. autoclass:: Allowed
    :members:
 
-.. _security_policies_api_section:
-
-Security Policies
-~~~~~~~~~~~~~~~~~
-
-.. autofunction:: WhoACLSecurityPolicy
-
-.. autofunction:: WhoInheritingACLSecurityPolicy
-
-.. autofunction:: RemoteUserACLSecurityPolicy
-
-.. autofunction:: RemoteUserInheritingACLSecurityPolicy
-- 
cgit v1.2.3