diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-13 18:12:33 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-13 18:12:33 -0400 |
| commit | a9f5e705bb331098946eef774857511a02e4f498 (patch) | |
| tree | 35eee0505157215b5286203d7424a2d8cce39af7 /docs/narr/advconfig.rst | |
| parent | 3aeb794d49655e7cd81b7d553f0da275b0cde3a9 (diff) | |
| parent | 9ff3b26dcb8ab9e846356d64a18f1ec10440e02e (diff) | |
| download | pyramid-a9f5e705bb331098946eef774857511a02e4f498.tar.gz pyramid-a9f5e705bb331098946eef774857511a02e4f498.tar.bz2 pyramid-a9f5e705bb331098946eef774857511a02e4f498.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index b1ea652d6..165cf7474 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -294,9 +294,9 @@ These are the methods of the configurator which provide conflict detection: :meth:`~pyramid.config.Configurator.add_view`, :meth:`~pyramid.config.Configurator.add_route`, :meth:`~pyramid.config.Configurator.add_renderer`, +:meth:`~pyramid.config.Configurator.add_request_method`, :meth:`~pyramid.config.Configurator.set_request_factory`, :meth:`~pyramid.config.Configurator.set_session_factory`, -:meth:`~pyramid.config.Configurator.set_request_method`, :meth:`~pyramid.config.Configurator.set_request_property`, :meth:`~pyramid.config.Configurator.set_root_factory`, :meth:`~pyramid.config.Configurator.set_view_mapper`, |