Merge branch 'master' into feature.py3-coverage

3 files changed, 27 insertions, 0 deletions

diff --git a/docs/api/index.rst b/docs/api/index.rst
new file mode 100644
index 000000000..cb38aa0b2
--- /dev/null
+++ b/docs/api/index.rst
@@ -0,0 +1,12 @@
+.. _html_api_documentation:
+
+API Documentation
+=================
+
+Comprehensive reference material for every public API exposed by :app:`Pyramid`:
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   *
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index a62976d8a..de2a664a4 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -56,6 +56,9 @@ Other Interfaces
   .. autointerface:: IRenderer
      :members:
 
+  .. autointerface:: IResponseFactory
+     :members:
+
   .. autointerface:: IViewMapperFactory
      :members:
 
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index bab3e26ba..57a80b3f5 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -14,6 +14,18 @@
      accessed as ``request.registry.settings`` or
      ``config.registry.settings`` in a typical Pyramid application.
 
+   .. attribute:: package_name
+
+     .. versionadded:: 1.6
+
+     When a registry is set up (or created) by a :term:`Configurator`, this
+     attribute will be the shortcut for
+     :attr:`pyramid.config.Configurator.package_name`.
+
+     This attribute is often accessed as ``request.registry.package_name`` or
+     ``config.registry.package_name`` or ``config.package_name``
+     in a typical Pyramid application.
+
    .. attribute:: introspector
 
      .. versionadded:: 1.3