From d7f2590a4c2c2164bdb01ba977119ccbb6b2b09c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 9 Dec 2010 02:30:23 -0500
Subject: fix docs: pyramid.configuration -> pyramid.config

---
 docs/api/config.rst        | 86 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/api/configuration.rst | 80 ------------------------------------------
 2 files changed, 86 insertions(+), 80 deletions(-)
 create mode 100644 docs/api/config.rst
 delete mode 100644 docs/api/configuration.rst

(limited to 'docs/api')

diff --git a/docs/api/config.rst b/docs/api/config.rst
new file mode 100644
index 000000000..64dc4d0dd
--- /dev/null
+++ b/docs/api/config.rst
@@ -0,0 +1,86 @@
+.. _configuration_module:
+
+:mod:`pyramid.config`
+---------------------
+
+.. 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)
+
+     .. attribute:: registry
+
+        The :term:`application registry` which holds the configuration
+        associated with this configurator.
+
+     .. automethod:: begin
+
+     .. automethod:: end
+
+     .. automethod:: hook_zca()
+
+     .. automethod:: unhook_zca()
+
+     .. automethod:: get_settings
+
+     .. automethod:: commit
+
+     .. automethod:: action
+
+     .. automethod:: include
+
+     .. automethod:: with_package
+
+     .. automethod:: maybe_dotted
+
+     .. automethod:: absolute_resource_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:: add_renderer(name, factory)
+
+     .. automethod:: add_route
+
+     .. automethod:: add_static_view(name, path, cache_max_age=3600, permission='__no_permission_required__')
+
+     .. automethod:: add_settings
+
+     .. automethod:: add_subscriber
+
+     .. automethod:: add_translation_dirs
+
+     .. automethod:: add_handler
+
+     .. automethod:: add_view
+
+     .. automethod:: derive_view
+
+     .. automethod:: load_zcml(spec)
+
+     .. automethod:: make_wsgi_app()
+
+     .. automethod:: override_resource(to_override, override_with)
+
+     .. automethod:: scan(package=None, categories=None)
+
+     .. automethod:: set_forbidden_view(view=None, attr=None, renderer=None, wrapper=None)
+
+     .. automethod:: set_notfound_view(view=None, attr=None, renderer=None, wrapper=None)
+
+     .. automethod:: set_locale_negotiator
+
+     .. automethod:: set_default_permission
+
+     .. automethod:: set_session_factory
+
+     .. automethod:: set_request_factory
+
+     .. automethod:: set_renderer_globals_factory
+
+     .. automethod:: testing_securitypolicy
+
+     .. automethod:: testing_models
+
+     .. automethod:: testing_add_subscriber
+
+     .. automethod:: testing_add_renderer
+
diff --git a/docs/api/configuration.rst b/docs/api/configuration.rst
deleted file mode 100644
index 6d5c9f16b..000000000
--- a/docs/api/configuration.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-.. _configuration_module:
-
-:mod:`pyramid.configuration`
--------------------------------
-
-.. automodule:: pyramid.configuration
-
-  .. 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)
-
-     .. attribute:: registry
-
-        The :term:`application registry` which holds the configuration
-        associated with this configurator.
-
-     .. automethod:: begin
-
-     .. automethod:: end
-
-     .. automethod:: hook_zca()
-
-     .. automethod:: unhook_zca()
-
-     .. automethod:: get_settings
-
-     .. automethod:: with_package
-
-     .. automethod:: maybe_dotted
-
-     .. automethod:: absolute_resource_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:: add_renderer(name, factory)
-
-     .. automethod:: add_route
-
-     .. automethod:: add_static_view(name, path, cache_max_age=3600, permission='__no_permission_required__')
-
-     .. automethod:: add_settings
-
-     .. automethod:: add_subscriber
-
-     .. automethod:: add_translation_dirs
-
-     .. automethod:: add_handler
-
-     .. automethod:: add_view
-
-     .. automethod:: derive_view
-
-     .. automethod:: load_zcml(spec)
-
-     .. automethod:: make_wsgi_app()
-
-     .. automethod:: override_resource(to_override, override_with)
-
-     .. automethod:: scan(package=None, categories=None)
-
-     .. automethod:: set_forbidden_view(view=None, attr=None, renderer=None, wrapper=None)
-
-     .. automethod:: set_notfound_view(view=None, attr=None, renderer=None, wrapper=None)
-
-     .. automethod:: set_locale_negotiator
-
-     .. automethod:: set_default_permission
-
-     .. automethod:: set_session_factory
-
-     .. automethod:: set_request_factory
-
-     .. automethod:: set_renderer_globals_factory
-
-     .. automethod:: testing_securitypolicy
-
-     .. automethod:: testing_models
-
-     .. automethod:: testing_add_subscriber
-
-     .. automethod:: testing_add_renderer
-
-- 
cgit v1.2.3