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

8 files changed, 38 insertions, 2 deletions

diff --git a/docs/api/config.rst b/docs/api/config.rst
index ae913d32c..e083dbc68 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -66,6 +66,7 @@
      .. automethod:: add_tween
      .. automethod:: add_route_predicate
      .. automethod:: add_view_predicate
+     .. automethod:: add_view_deriver
      .. automethod:: set_request_factory
      .. automethod:: set_root_factory
      .. automethod:: set_session_factory
diff --git a/docs/api/events.rst b/docs/api/events.rst
index 31a0e22c1..0a8463740 100644
--- a/docs/api/events.rst
+++ b/docs/api/events.rst
@@ -21,6 +21,8 @@ Event Types
 
 .. autoclass:: ContextFound
 
+.. autoclass:: BeforeTraversal
+
 .. autoclass:: NewResponse
 
 .. autoclass:: BeforeRender
diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst
index faca0fbb6..cb411458d 100644
--- a/docs/api/exceptions.rst
+++ b/docs/api/exceptions.rst
@@ -5,6 +5,8 @@
 
 .. automodule:: pyramid.exceptions
 
+  .. autoexception:: BadCSRFOrigin
+
   .. autoexception:: BadCSRFToken
 
   .. autoexception:: PredicateMismatch
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index de2a664a4..272820a91 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -17,6 +17,9 @@ Event-Related Interfaces
   .. autointerface:: IContextFound
      :members:
 
+  .. autointerface:: IBeforeTraversal
+     :members:
+
   .. autointerface:: INewResponse
      :members:
 
@@ -91,3 +94,9 @@ Other Interfaces
 
   .. autointerface:: ICacheBuster
      :members:
+
+  .. autointerface:: IViewDeriver
+     :members:
+
+  .. autointerface:: IViewDeriverInfo
+     :members:
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index edc3738fc..27bc81a1f 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -11,4 +11,4 @@
 
     .. autofunction:: get_appsettings(config_uri, name=None, options=None)
 
-    .. autofunction:: setup_logging(config_uri)
+    .. autofunction:: setup_logging(config_uri, global_conf=None)
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 105ffb5a7..52bf50078 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -13,7 +13,8 @@
                      current_route_path, static_url, static_path,
                      model_url, resource_url, resource_path, set_property, 
                      effective_principals, authenticated_userid,
-                     unauthenticated_userid, has_permission
+                     unauthenticated_userid, has_permission,
+                     invoke_exception_view
 
    .. attribute:: context
 
@@ -259,6 +260,8 @@
 
           See also :ref:`subrequest_chapter`.
 
+   .. automethod:: invoke_exception_view
+
    .. automethod:: has_permission
 
    .. automethod:: add_response_callback
diff --git a/docs/api/session.rst b/docs/api/session.rst
index 474e2bb32..56c4f52d7 100644
--- a/docs/api/session.rst
+++ b/docs/api/session.rst
@@ -9,6 +9,8 @@
 
   .. autofunction:: signed_deserialize
 
+  .. autofunction:: check_csrf_origin
+
   .. autofunction:: check_csrf_token
 
   .. autofunction:: SignedCookieSessionFactory
diff --git a/docs/api/viewderivers.rst b/docs/api/viewderivers.rst
new file mode 100644
index 000000000..2a141501e
--- /dev/null
+++ b/docs/api/viewderivers.rst
@@ -0,0 +1,17 @@
+.. _viewderivers_module:
+
+:mod:`pyramid.viewderivers`
+---------------------------
+
+.. automodule:: pyramid.viewderivers
+
+   .. attribute:: INGRESS
+
+      Constant representing the request ingress, for use in ``under``
+      arguments to :meth:`pyramid.config.Configurator.add_view_deriver`.
+
+   .. attribute:: VIEW
+
+      Constant representing the :term:`view callable` at the end of the view
+      pipeline, for use in ``over`` arguments to
+      :meth:`pyramid.config.Configurator.add_view_deriver`.