diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-22 13:45:13 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-22 13:45:13 -0400 |
| commit | 1440e9828fcd527ff79de0655ee65d3076f13911 (patch) | |
| tree | 53637b76d148774c5a7c3b9e103373e33e6c2f9e /docs/narr/advconfig.rst | |
| parent | feef5257261f3c37f11571a475dbd68f603b144e (diff) | |
| parent | ed7ffe0e2065100f551793b3774656d8bdde0fb0 (diff) | |
| download | pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.gz pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.bz2 pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.zip | |
Merge branch 'mmerickel-disambiguate_add_route'
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 099bce35f..5ee554284 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -295,15 +295,9 @@ These are the methods of the configurator which provide conflict detection: :meth:`~pyramid.config.Configurator.set_locale_negotiator` and :meth:`~pyramid.config.Configurator.set_default_permission`. -Some other methods of the configurator also indirectly provide conflict -detection, because they're implemented in terms of conflict-aware methods: - -- :meth:`~pyramid.config.Configurator.add_route` does a second type of - conflict detection when a ``view`` parameter is passed (it calls - ``add_view``). - -- :meth:`~pyramid.config.Configurator.static_view`, a frontend for - ``add_route`` and ``add_view``. +:meth:`~pyramid.config.Configurator.add_static_view` also indirectly +provides conflict detection, because it's implemented in terms of the +conflict-aware ``add_route`` and ``add_view`` methods. .. _including_configuration: |