diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-16 11:12:24 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-16 11:12:24 -0400 |
| commit | 14f69c57c4d83355e769db46692cfb36e87a4f70 (patch) | |
| tree | 2e7e9de785050c7b5276029d1fbed12d0b15a097 /docs | |
| parent | 8c7b0f14b2c55e653bb0d4a18e3de299b7abe208 (diff) | |
| parent | 2c25342383eed7b10e349b2396eed08d332cfb80 (diff) | |
| download | pyramid-14f69c57c4d83355e769db46692cfb36e87a4f70.tar.gz pyramid-14f69c57c4d83355e769db46692cfb36e87a4f70.tar.bz2 pyramid-14f69c57c4d83355e769db46692cfb36e87a4f70.zip | |
Merge branch 'feature.instance-properties' of git://github.com/mmerickel/pyramid into mmerickel-feature.instance-properties
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/config.rst | 4 | ||||
| -rw-r--r-- | docs/narr/advconfig.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 1b887988a..8dbe6de91 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -38,9 +38,9 @@ .. automethod:: set_default_permission .. automethod:: add_permission - :methodcategory:`Setting Request Properties` + :methodcategory:`Extending the Request Object` - .. automethod:: set_request_property + .. automethod:: set_request_method :methodcategory:`Using I18N` diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 2949dc808..0ad2fdc95 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -296,7 +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_property`, +:meth:`~pyramid.config.Configurator.set_request_method`, :meth:`~pyramid.config.Configurator.set_root_factory`, :meth:`~pyramid.config.Configurator.set_view_mapper`, :meth:`~pyramid.config.Configurator.set_authentication_policy`, |