diff options
| author | Michael Merickel <michael@merickel.org> | 2019-12-26 12:52:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 12:52:03 -0600 |
| commit | 9e61a82458187abdd1747bbd8c38c6089b80b3ab (patch) | |
| tree | 186792f43eef99b67eaa561ffa1993180ec45271 /docs/narr/advconfig.rst | |
| parent | 323cfbb45e6ee4b7462bbea9dcaa4e8258dd74f6 (diff) | |
| parent | 1631386fe2d8ea0f7419812b9cab381c668d2ebb (diff) | |
| download | pyramid-9e61a82458187abdd1747bbd8c38c6089b80b3ab.tar.gz pyramid-9e61a82458187abdd1747bbd8c38c6089b80b3ab.tar.bz2 pyramid-9e61a82458187abdd1747bbd8c38c6089b80b3ab.zip | |
Merge pull request #3550 from mmerickel/moar-security-policy
security policy docs and legacy policy improvements
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 3ef350888..3ce224d91 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -297,21 +297,22 @@ Methods Which Provide Conflict Detection 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_root_factory`, -:meth:`~pyramid.config.Configurator.set_view_mapper`, -:meth:`~pyramid.config.Configurator.set_authentication_policy`, -:meth:`~pyramid.config.Configurator.set_authorization_policy`, -:meth:`~pyramid.config.Configurator.set_locale_negotiator`, -:meth:`~pyramid.config.Configurator.set_default_permission`, -:meth:`~pyramid.config.Configurator.add_traverser`, -:meth:`~pyramid.config.Configurator.add_resource_url_adapter`, -and :meth:`~pyramid.config.Configurator.add_response_adapter`. +- :meth:`~pyramid.config.Configurator.add_renderer` +- :meth:`~pyramid.config.Configurator.add_request_method` +- :meth:`~pyramid.config.Configurator.add_resource_url_adapter` +- :meth:`~pyramid.config.Configurator.add_response_adapter` +- :meth:`~pyramid.config.Configurator.add_route` +- :meth:`~pyramid.config.Configurator.add_traverser` +- :meth:`~pyramid.config.Configurator.add_view` +- :meth:`~pyramid.config.Configurator.set_authentication_policy` +- :meth:`~pyramid.config.Configurator.set_authorization_policy` +- :meth:`~pyramid.config.Configurator.set_default_permission` +- :meth:`~pyramid.config.Configurator.set_locale_negotiator` +- :meth:`~pyramid.config.Configurator.set_request_factory` +- :meth:`~pyramid.config.Configurator.set_root_factory` +- :meth:`~pyramid.config.Configurator.set_security_policy` +- :meth:`~pyramid.config.Configurator.set_session_factory` +- :meth:`~pyramid.config.Configurator.set_view_mapper` :meth:`~pyramid.config.Configurator.add_static_view` also indirectly provides conflict detection, because it's implemented in terms of the conflict-aware |