summaryrefslogtreecommitdiff
path: root/docs/api/configuration.rst
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-10-28 19:58:38 -0700
committerBen Bangert <ben@groovie.org>2010-10-28 19:58:38 -0700
commitd39e99e1f6f06a02a275a8a30f154e0f292d7dff (patch)
tree24a85615dce8ba575c73aae1189ea5846303ae70 /docs/api/configuration.rst
parent6a9d6246c9e9fda507fa04b462c00509b73f676f (diff)
parent04ebd572a92f6681209c70c42192775c63cd16cd (diff)
downloadpyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.tar.gz
pyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.tar.bz2
pyramid-d39e99e1f6f06a02a275a8a30f154e0f292d7dff.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api/configuration.rst')
-rw-r--r--docs/api/configuration.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/api/configuration.rst b/docs/api/configuration.rst
index 5215bfb3c..6d5c9f16b 100644
--- a/docs/api/configuration.rst
+++ b/docs/api/configuration.rst
@@ -5,7 +5,7 @@
.. 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)
+ .. 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
@@ -64,6 +64,8 @@
.. automethod:: set_default_permission
+ .. automethod:: set_session_factory
+
.. automethod:: set_request_factory
.. automethod:: set_renderer_globals_factory