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/narr | |
| 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/narr')
| -rw-r--r-- | docs/narr/advconfig.rst | 1 | ||||
| -rw-r--r-- | docs/narr/subrequest.rst | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 880e538f1..322741648 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -299,7 +299,6 @@ These are the methods of the configurator which provide conflict detection: :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_property`, :meth:`~pyramid.config.Configurator.set_root_factory`, :meth:`~pyramid.config.Configurator.set_view_mapper`, :meth:`~pyramid.config.Configurator.set_authentication_policy`, diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst index 9094c7d83..03f372446 100644 --- a/docs/narr/subrequest.rst +++ b/docs/narr/subrequest.rst @@ -232,8 +232,7 @@ unconditionally does the following: callable) to the request object to which it is handed. - It 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 subrequest + :meth:`~pyramid.config.Configurator.add_request_method`) on the subrequest object passed as ``request``. - It causes a :class:`~pyramid.events.NewRequest` event to be sent at the |