summaryrefslogtreecommitdiff
path: root/docs/api/config.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-15 10:13:07 -0400
committerChris McDonough <chrism@plope.com>2011-07-15 10:13:07 -0400
commitc515d77de5b2f62727251ebc32d1292e67811771 (patch)
treed47c6230bbab46bf83022730412296574c2893fb /docs/api/config.rst
parent153c2b9bce3170d58cafa48d819aef4497159091 (diff)
downloadpyramid-c515d77de5b2f62727251ebc32d1292e67811771.tar.gz
pyramid-c515d77de5b2f62727251ebc32d1292e67811771.tar.bz2
pyramid-c515d77de5b2f62727251ebc32d1292e67811771.zip
- get_root2 -> prepare
- change prepare return value to a dict, and return the registry, request, etc - various docs and changelog entries.
Diffstat (limited to 'docs/api/config.rst')
-rw-r--r--docs/api/config.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index d021412b8..2c394ac41 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -88,9 +88,11 @@
.. attribute:: global_registries
- A set of registries that have been created for :app:`Pyramid`
- applications. The object itself supports iteration and has a
- ``last`` property containing the last registry loaded.
+ The set of registries that have been created for :app:`Pyramid`
+ applications, one per each call to
+ :meth:`pyramid.config.Configurator.make_app` in the current process. The
+ object itself supports iteration and has a ``last`` property containing
+ the last registry loaded.
The registries contained in this object are stored as weakrefs,
thus they will only exist for the lifetime of the actual