Merge branch 'master' into docs/easy-install-to-pip.2104

4 files changed, 25 insertions, 1 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/interfaces.rst b/docs/api/interfaces.rst
index de2a664a4..635d3c5b6 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -91,3 +91,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/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`.