summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/registry.rst6
-rw-r--r--docs/api/testing.rst20
2 files changed, 4 insertions, 22 deletions
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index 5f61b1122..4d327370a 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -9,6 +9,8 @@
.. attribute:: settings
- The :term:`deployment settings` object. See :ref:`deployment_settings`
- for information.
+ The dictionary-like :term:`deployment settings` object. See
+ :ref:`deployment_settings` for information. This object is often
+ accessed as ``request.registry.settings`` or
+ ``config.registry.settings`` in a typical Pyramid application.
diff --git a/docs/api/testing.rst b/docs/api/testing.rst
index fdcdadee8..f388dc263 100644
--- a/docs/api/testing.rst
+++ b/docs/api/testing.rst
@@ -5,26 +5,6 @@
.. automodule:: pyramid.testing
- .. autofunction:: registerDummySecurityPolicy
-
- .. autofunction:: registerResources
-
- .. autofunction:: registerEventListener
-
- .. autofunction:: registerTemplateRenderer
-
- .. autofunction:: registerView
-
- .. autofunction:: registerUtility
-
- .. autofunction:: registerAdapter
-
- .. autofunction:: registerSubscriber
-
- .. autofunction:: registerRoute
-
- .. autofunction:: registerSettings
-
.. autofunction:: setUp
.. autofunction:: tearDown