diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
| commit | 226c469217cbddc3443da2a60dc414b82021bcbe (patch) | |
| tree | c049b1c25b4b70a43f2b99f8515fd3d628cbffd2 /docs/api | |
| parent | 87a6ffdb91ae9f983169c3e9da15ea0266745a74 (diff) | |
| parent | fee38663daccc0130d0c34dbc5a14e67bef2e183 (diff) | |
| download | pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.gz pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.bz2 pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.zip | |
fix merge conflicts
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst (renamed from docs/api/configuration.rst) | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/api/configuration.rst b/docs/api/config.rst index 6d5c9f16b..64dc4d0dd 100644 --- a/docs/api/configuration.rst +++ b/docs/api/config.rst @@ -1,11 +1,11 @@ .. _configuration_module: -:mod:`pyramid.configuration` -------------------------------- +:mod:`pyramid.config` +--------------------- -.. automodule:: pyramid.configuration +.. 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) + .. 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 @@ -22,6 +22,12 @@ .. automethod:: get_settings + .. automethod:: commit + + .. automethod:: action + + .. automethod:: include + .. automethod:: with_package .. automethod:: maybe_dotted |