diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-16 20:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-16 20:14:35 -0400 |
| commit | ed2eab3d823003d0c5f1c3d92bf256b80497e1f1 (patch) | |
| tree | 41b16cd29290db03aa097dd7febfdb66bfa62812 /docs | |
| parent | 7401b8eeded5d2d0167edabbc9f720f8ae235359 (diff) | |
| parent | 33bd53758ef69de22eb8d7282461da6ba3e35083 (diff) | |
| download | pyramid-ed2eab3d823003d0c5f1c3d92bf256b80497e1f1.tar.gz pyramid-ed2eab3d823003d0c5f1c3d92bf256b80497e1f1.tar.bz2 pyramid-ed2eab3d823003d0c5f1c3d92bf256b80497e1f1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/config.rst | 3 | ||||
| -rw-r--r-- | docs/narr/advconfig.rst | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 1b887988a..028a55d4b 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -38,8 +38,9 @@ .. automethod:: set_default_permission .. automethod:: add_permission - :methodcategory:`Setting Request Properties` + :methodcategory:`Extending the Request Object` + .. automethod:: set_request_method .. automethod:: set_request_property :methodcategory:`Using I18N` diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 2949dc808..b1ea652d6 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -296,6 +296,7 @@ These are the methods of the configurator which provide conflict detection: :meth:`~pyramid.config.Configurator.add_renderer`, :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`, |