summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/config.rst10
-rw-r--r--docs/api/paster.rst15
-rw-r--r--docs/api/scripting.rst4
3 files changed, 22 insertions, 7 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 71ef4a746..d021412b8 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -86,3 +86,13 @@
.. automethod:: testing_add_renderer
+ .. 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 registries contained in this object are stored as weakrefs,
+ thus they will only exist for the lifetime of the actual
+ applications for which they are being used.
+
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 6668f3c77..2a32e07e9 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -3,14 +3,15 @@
:mod:`pyramid.paster`
---------------------------
-.. module:: pyramid.paster
+.. automodule:: pyramid.paster
-.. function:: get_app(config_file, name=None)
+ .. function:: get_app(config_uri, name=None)
- Return the WSGI application named ``name`` in the PasteDeploy
- config file ``config_file``.
+ Return the WSGI application named ``name`` in the PasteDeploy
+ config file specified by ``config_uri``.
- If the ``name`` is None, this will attempt to parse the name from
- the ``config_file`` string expecting the format ``ini_file#name``.
- If no name is found, the name will default to "main".
+ If the ``name`` is None, this will attempt to parse the name from
+ the ``config_uri`` string expecting the format ``inifile#name``.
+ If no name is found, the name will default to "main".
+ .. autofunction:: bootstrap
diff --git a/docs/api/scripting.rst b/docs/api/scripting.rst
index 9d5bc2e58..3e9a814fc 100644
--- a/docs/api/scripting.rst
+++ b/docs/api/scripting.rst
@@ -7,3 +7,7 @@
.. autofunction:: get_root
+ .. autofunction:: get_root2
+
+ .. autofunction:: make_request
+