diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-09 02:50:15 -0500 |
| commit | f360d9e6d9689dfe92a950e97e7e19c414655997 (patch) | |
| tree | f0456af418ecfaf7d5a342556d2c5786b2aee979 /docs/api | |
| parent | c18b16d293ee60117747f0de042e2d75361d1fd8 (diff) | |
| parent | 13173e9e1d1c5f3873e8bfed91e6f3ed561dafaf (diff) | |
| download | pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.gz pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.tar.bz2 pyramid-f360d9e6d9689dfe92a950e97e7e19c414655997.zip | |
Merge branch 'twophase'
Conflicts:
pyramid/configuration.py
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 |