diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-24 23:32:04 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-24 23:32:04 -0400 |
| commit | 23d08e88f1fbb1ffe9a5e1efc3135f53cce2970b (patch) | |
| tree | 3c77ae5c3426b21b606294ba022f7f33222f6315 | |
| parent | 93d3059176b41d75d0fe3b256a1556aa93c7cd10 (diff) | |
| download | pyramid-23d08e88f1fbb1ffe9a5e1efc3135f53cce2970b.tar.gz pyramid-23d08e88f1fbb1ffe9a5e1efc3135f53cce2970b.tar.bz2 pyramid-23d08e88f1fbb1ffe9a5e1efc3135f53cce2970b.zip | |
fix rendering issue
| -rw-r--r-- | docs/narr/urldispatch.rst | 4 | ||||
| -rw-r--r-- | pyramid/config.py | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index 4923fd19f..1024dd188 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -166,8 +166,8 @@ When a route configuration names a ``view`` attribute, the :term:`view callable` named as that ``view`` attribute will always be found and invoked when the associated route pattern matches during a request. -See :ref:`add_route_view_related_api` for a description of view-related -arguments to ``add_route``. +See :meth:`pyramid.config.Configurator.add_route` for a description of +view-related arguments. .. index:: single: route path pattern syntax diff --git a/pyramid/config.py b/pyramid/config.py index 0041a6726..3986acba7 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -1646,8 +1646,6 @@ class Configurator(object): :ref:`custom_route_predicates` for more information about ``info``. - .. _add_route_view_related_api: - View-Related Arguments .. warning:: The arguments described below have been deprecated as of @@ -1655,12 +1653,12 @@ class Configurator(object): should only be used to support older code bases which depend upon them.* Use a separate call to :meth:`pyramid.config.Configurator.add_view` to associate a view - with a route. + with a route. See :ref:`add_route_view_config` for more info. view .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_related_api`. + :ref:`add_route_view_config`. A Python object or :term:`dotted Python name` to the same object that will be used as a view callable when this route @@ -1669,7 +1667,7 @@ class Configurator(object): view_context .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_related_api`. + :ref:`add_route_view_config`. A class or an :term:`interface` or :term:`dotted Python name` to the same object which the :term:`context` of the @@ -1686,7 +1684,7 @@ class Configurator(object): view_permission .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_related_api`. + :ref:`add_route_view_config`. The permission name required to invoke the view associated with this route. e.g. ``edit``. (see @@ -1701,7 +1699,7 @@ class Configurator(object): view_renderer .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_related_api`. + :ref:`add_route_view_config`. This is either a single string term (e.g. ``json``) or a string implying a path or :term:`asset specification` @@ -1726,7 +1724,7 @@ class Configurator(object): view_attr .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_related_api`. + :ref:`add_route_view_config`. The view machinery defaults to using the ``__call__`` method of the view callable (or the function itself, if the view |