Merge branch 'master' of github.com:Pylons/pyramid

7 files changed, 50 insertions, 15 deletions

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 62f138b76..a785b64ad 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -37,6 +37,7 @@
      .. automethod:: set_authentication_policy
      .. automethod:: set_authorization_policy
      .. automethod:: set_default_csrf_options
+     .. automethod:: set_csrf_storage_policy
      .. automethod:: set_default_permission
      .. automethod:: add_permission
 
@@ -70,6 +71,7 @@
      .. automethod:: add_subscriber_predicate
      .. automethod:: add_view_predicate
      .. automethod:: add_view_deriver
+     .. automethod:: set_execution_policy
      .. automethod:: set_request_factory
      .. automethod:: set_root_factory
      .. automethod:: set_session_factory
diff --git a/docs/api/csrf.rst b/docs/api/csrf.rst
new file mode 100644
index 000000000..38501546e
--- /dev/null
+++ b/docs/api/csrf.rst
@@ -0,0 +1,23 @@
+.. _csrf_module:
+
+:mod:`pyramid.csrf`
+-------------------
+
+.. automodule:: pyramid.csrf
+
+  .. autoclass:: LegacySessionCSRFStoragePolicy
+     :members:
+
+  .. autoclass:: SessionCSRFStoragePolicy
+     :members:
+
+  .. autoclass:: CookieCSRFStoragePolicy
+     :members:
+
+  .. autofunction:: get_csrf_token
+
+  .. autofunction:: new_csrf_token
+
+  .. autofunction:: check_csrf_origin
+
+  .. autofunction:: check_csrf_token
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index 521d65d2b..e542a6be0 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -44,6 +44,9 @@ Other Interfaces
   .. autointerface:: IRoutePregenerator
      :members:
 
+  .. autointerface:: ICSRFStoragePolicy
+     :members:
+
   .. autointerface:: ISession
      :members:
 
@@ -65,6 +68,9 @@ Other Interfaces
   .. autointerface:: IResponseFactory
      :members:
 
+  .. autointerface:: IRouter
+     :members:
+
   .. autointerface:: IViewMapperFactory
      :members:
 
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 27bc81a1f..f0784d0f8 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -7,8 +7,8 @@
 
     .. autofunction:: bootstrap
 
-    .. autofunction:: get_app(config_uri, name=None, options=None)
+    .. autofunction:: get_app
 
-    .. autofunction:: get_appsettings(config_uri, name=None, options=None)
+    .. autofunction:: get_appsettings
 
-    .. autofunction:: setup_logging(config_uri, global_conf=None)
+    .. autofunction:: setup_logging
diff --git a/docs/api/security.rst b/docs/api/security.rst
index 88086dbbf..116459226 100644
--- a/docs/api/security.rst
+++ b/docs/api/security.rst
@@ -80,15 +80,23 @@ Return Values
     'george', 'read')`` that means deny access.  A sequence of ACEs
     makes up an ACL.  It is a string, and its actual value is "Deny".
 
+.. autoclass:: Denied
+   :members: msg
+
+   .. automethod:: __new__
+
+.. autoclass:: Allowed
+   :members: msg
+
+   .. automethod:: __new__
+
 .. autoclass:: ACLDenied
-   :members:
+   :members: msg
 
-.. autoclass:: ACLAllowed
-   :members:
+   .. automethod:: __new__
 
-.. autoclass:: Denied
-   :members:
+.. autoclass:: ACLAllowed
+   :members: msg
 
-.. autoclass:: Allowed
-   :members:
+   .. automethod:: __new__
 
diff --git a/docs/api/session.rst b/docs/api/session.rst
index 56c4f52d7..53bae7c52 100644
--- a/docs/api/session.rst
+++ b/docs/api/session.rst
@@ -9,10 +9,6 @@
 
   .. autofunction:: signed_deserialize
 
-  .. autofunction:: check_csrf_origin
-
-  .. autofunction:: check_csrf_token
-
   .. autofunction:: SignedCookieSessionFactory
 
   .. autofunction:: UnencryptedCookieSessionFactoryConfig
diff --git a/docs/api/url.rst b/docs/api/url.rst
index 131d85806..8aaabc352 100644
--- a/docs/api/url.rst
+++ b/docs/api/url.rst
@@ -5,7 +5,7 @@
 
 .. automodule:: pyramid.url
 
-  .. autofunction:: pyramid.url.resource_url(context, request, *elements, query=None, anchor=None)
+  .. autofunction:: resource_url
 
   .. autofunction:: route_url