diff options
| author | Michael Merickel <github@m.merickel.org> | 2018-10-04 11:31:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 11:31:07 -0500 |
| commit | c314e31223307d7fd739e0bc41519ae6d1d323d3 (patch) | |
| tree | f0d8dc769a786b59b9e44681bc0c9d694d2a0c4f /docs/api | |
| parent | 684a2cb4dc39b701e357bd0cb5c683a726cfb5f8 (diff) | |
| parent | 052cb72b63b9f5a36f45a4135d1e1c05c10004dd (diff) | |
| download | pyramid-c314e31223307d7fd739e0bc41519ae6d1d323d3.tar.gz pyramid-c314e31223307d7fd739e0bc41519ae6d1d323d3.tar.bz2 pyramid-c314e31223307d7fd739e0bc41519ae6d1d323d3.zip | |
Merge branch 'master' into fix-deprecated-accept-predicate
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 1 | ||||
| -rw-r--r-- | docs/api/request.rst | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index a785b64ad..b2cd53a68 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -44,7 +44,6 @@ :methodcategory:`Extending the Request Object` .. automethod:: add_request_method - .. automethod:: set_request_property :methodcategory:`Using I18N` diff --git a/docs/api/request.rst b/docs/api/request.rst index b5700f4ab..0c169adaf 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -228,8 +228,7 @@ handed. - sets request extensions (such as those added via - :meth:`~pyramid.config.Configurator.add_request_method` or - :meth:`~pyramid.config.Configurator.set_request_property`) on the + :meth:`~pyramid.config.Configurator.add_request_method`) on the request it's passed. - causes a :class:`~pyramid.events.NewRequest` event to be sent at the |