summaryrefslogtreecommitdiff
path: root/docs/api/config.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-19 09:20:29 -0400
committerChris McDonough <chrism@plope.com>2011-08-19 09:20:29 -0400
commitadfc236ef6b448de6970d5c9db53bf40eab6e056 (patch)
tree3e7a29acdca34813bc541aff3074de3b01b876c6 /docs/api/config.rst
parentcfbbd6d1b6a0b3651b109f819e4b8d2bfe4f1575 (diff)
downloadpyramid-adfc236ef6b448de6970d5c9db53bf40eab6e056.tar.gz
pyramid-adfc236ef6b448de6970d5c9db53bf40eab6e056.tar.bz2
pyramid-adfc236ef6b448de6970d5c9db53bf40eab6e056.zip
review and fix configurator docs in random places
Diffstat (limited to 'docs/api/config.rst')
-rw-r--r--docs/api/config.rst19
1 files changed, 10 insertions, 9 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index d744418b3..a8c193b60 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -5,7 +5,7 @@
.. automodule:: pyramid.config
- .. autoclass:: Configurator(registry=None, package=None, settings=None, root_factory=None, authentication_policy=None, authorization_policy=None, renderers=DEFAULT_RENDERERS, debug_logger=None, locale_negotiator=None, request_factory=None, renderer_globals_factory=None, default_permission=None, session_factory=None, autocommit=False)
+ .. autoclass:: Configurator
.. attribute:: registry
@@ -36,9 +36,9 @@
.. automethod:: absolute_asset_spec
- .. automethod:: setup_registry(settings=None, root_factory=None, authentication_policy=None, renderers=DEFAULT_RENDERERS, debug_logger=None, locale_negotiator=None, request_factory=None, renderer_globals_factory=None)
+ .. automethod:: setup_registry
- .. automethod:: add_renderer(name, factory)
+ .. automethod:: add_renderer
.. automethod:: add_response_adapter
@@ -64,10 +64,6 @@
.. automethod:: scan
- .. automethod:: set_forbidden_view
-
- .. automethod:: set_notfound_view
-
.. automethod:: set_locale_negotiator
.. automethod:: set_default_permission
@@ -78,8 +74,6 @@
.. automethod:: set_root_factory
- .. automethod:: set_renderer_globals_factory(factory)
-
.. automethod:: set_view_mapper
.. automethod:: set_authentication_policy
@@ -94,6 +88,13 @@
.. automethod:: testing_add_renderer
+ .. automethod:: set_forbidden_view
+
+ .. automethod:: set_notfound_view
+
+ .. automethod:: set_renderer_globals_factory(factory)
+
+
.. attribute:: global_registries
The set of registries that have been created for :app:`Pyramid`