diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
| commit | faf334d94e8c7450962b6b0d18fe57cefd43f04a (patch) | |
| tree | bac12a41585561e84b914ede37bcd83a62764fb9 /docs/narr/advconfig.rst | |
| parent | 53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff) | |
| parent | 4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff) | |
| download | pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2 pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip | |
Merge branch 'master' into 1.5-branch
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 1b8e33de3..d3431e39e 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -302,7 +302,6 @@ These are the methods of the configurator which provide conflict detection: :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_renderer_globals_factory`, :meth:`~pyramid.config.Configurator.set_locale_negotiator`, :meth:`~pyramid.config.Configurator.set_default_permission`, :meth:`~pyramid.config.Configurator.add_traverser`, |