summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:05:48 -0500
commit1a19bf74afc768db45c77604c2cd33cc26af34c1 (patch)
treece6cfba28f4ad75a89e34f51c3ba363e34e873a4 /docs/api
parent96ab9f26990423f67045e5639a29579a1a76a71e (diff)
parente0062294430dd1d30d31b9f8c0a2e6e9060bcb76 (diff)
downloadpyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.gz
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.tar.bz2
pyramid-1a19bf74afc768db45c77604c2cd33cc26af34c1.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/registry.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index 1d5d52248..4c1af2678 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -14,12 +14,12 @@
accessed as ``request.registry.settings`` or
``config.registry.settings`` in a typical Pyramid application.
- .. attribute:: introspector
+ .. attribute:: introspector
When a registry is set up (or created) by a :term:`Configurator`, the
registry will be decorated with an instance named ``introspector``
implementing the :class:`pyramid.interfaces.IIntrospector` interface.
- See also :attr:`pyramid.config.Configurator.introspector``.
+ See also :attr:`pyramid.config.Configurator.introspector`.
When a registry is created "by hand", however, this attribute will not
exist until set up by a configurator.