summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-11-28 20:27:14 -0500
committerChris McDonough <chrism@plope.com>2011-11-28 20:27:14 -0500
commitce5c42f1b832b21405ffd40f61c74a5cfa040e8d (patch)
tree1c52c51d2fa88edcbd12b27d0e9f4f682f5bedc1
parente496386fd5e9e98c0479f39d67c092d61720c29c (diff)
downloadpyramid-ce5c42f1b832b21405ffd40f61c74a5cfa040e8d.tar.gz
pyramid-ce5c42f1b832b21405ffd40f61c74a5cfa040e8d.tar.bz2
pyramid-ce5c42f1b832b21405ffd40f61c74a5cfa040e8d.zip
docs
-rw-r--r--docs/api/config.rst10
-rw-r--r--pyramid/config/__init__.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index a8c193b60..9f130b7dc 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -94,6 +94,16 @@
.. automethod:: set_renderer_globals_factory(factory)
+ .. attribute:: introspector
+
+ The :term:`introspector` associated with this configuration.
+
+ .. attribute:: introspectable
+
+ A shortcut attribute which points to the
+ :class:`pyramid.registry.Introspectable` class (used during
+ directives to provide introspection to actions).
+
.. attribute:: global_registries
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 3039abedd..c2f004896 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -238,7 +238,7 @@ class Configurator(
If ``introspector`` is passed, it must be an instance implementing the
:class:`pyramid.interfaces.IIntrospector` interface. If no
``introspector`` is passed, the default IIntrospector implementation will
- be used.
+ be used. This parameter is new in Pyramid 1.3.
"""
manager = manager # for testing injection
venusian = venusian # for testing injection