diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-10-05 02:33:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 02:33:18 -0700 |
| commit | 086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch) | |
| tree | 1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/narr/advconfig.rst | |
| parent | 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff) | |
| parent | f6becd23966248fb7fc4db218258be4364902f8f (diff) | |
| download | pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2 pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip | |
Merge branch 'master' into one_cc
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 1 |
1 files changed, 0 insertions, 1 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`, |