diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-22 10:21:30 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-22 10:21:30 -0400 |
| commit | c150d77248653172b487326a1059b8c0bc5056e4 (patch) | |
| tree | 48b508a5e7047bc8d9ff77defaf82af87bdb2ec8 /docs/narr/advconfig.rst | |
| parent | feef5257261f3c37f11571a475dbd68f603b144e (diff) | |
| parent | 1612fe799b5d36d3c7c39468be55b15777730f62 (diff) | |
| download | pyramid-c150d77248653172b487326a1059b8c0bc5056e4.tar.gz pyramid-c150d77248653172b487326a1059b8c0bc5056e4.tar.bz2 pyramid-c150d77248653172b487326a1059b8c0bc5056e4.zip | |
Merge branch 'disambiguate_add_route' of https://github.com/mmerickel/pyramid into mmerickel-disambiguate_add_route
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 099bce35f..7ae80155b 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -300,7 +300,7 @@ 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``). + ``add_view``). This behavior has been deprecated in :app:`Pyramid` 1.1. - :meth:`~pyramid.config.Configurator.static_view`, a frontend for ``add_route`` and ``add_view``. |