remove references to add_route view-related configuration

Pylons · Jul 12, 2011 · 321e346 · 321e346
1 parent 7278cf9
commit 321e346
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
@@ -394,13 +394,14 @@ the associated route to be considered a match during the route matching
 process.  Examples of route predicate arguments are ``pattern``, ``xhr``, and
 ``request_method``.
 
-Other arguments are view configuration related arguments.  These only have an
-effect when the route configuration names a ``view``. These arguments have
-been deprecated as of :app:`Pyramid` 1.1 (see :ref:`add_route_view_config`).
-
 Other arguments are ``name`` and ``factory``.  These arguments represent
 neither predicates nor view configuration information.
 
+.. warning:: Some arguments are view-configuration related arguments, such as
+   ``view_renderer``.  These only have an effect when the route configuration
+   names a ``view`` and these arguments have been deprecated as of
+   :app:`Pyramid` 1.1.
+
 .. _custom_route_predicates:
 
 Custom Route Predicates

diff --git a/pyramid/config.py b/pyramid/config.py
@@ -1801,22 +1801,20 @@ def add_route(self,
            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.  See :ref:`add_route_view_config` for more info.
+           with a route using the ``route_name`` argument.
 
         view
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1; see
-             :ref:`add_route_view_config`.
+          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
 
           A Python object or :term:`dotted Python name` to the same
           object that will be used as a view callable when this route
           matches. e.g. ``mypackage.views.my_view``.
 
         view_context
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1; see
-             :ref:`add_route_view_config`.
-
+          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
+          
           A class or an :term:`interface` or :term:`dotted Python
           name` to the same object which the :term:`context` of the
           view should match for the view named by the route to be
@@ -1831,8 +1829,7 @@ def add_route(self,
 
         view_permission
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1; see
-             :ref:`add_route_view_config`.
+          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
 
           The permission name required to invoke the view associated
           with this route.  e.g. ``edit``. (see
@@ -1846,8 +1843,7 @@ def add_route(self,
 
         view_renderer
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1; see
-             :ref:`add_route_view_config`.
+          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
 
           This is either a single string term (e.g. ``json``) or a
           string implying a path or :term:`asset specification`
@@ -1871,8 +1867,7 @@ def add_route(self,
 
         view_attr
 
-          .. warning:: Deprecated as of :app:`Pyramid` 1.1; see
-             :ref:`add_route_view_config`.
+          .. warning:: Deprecated as of :app:`Pyramid` 1.1.
 
           The view machinery defaults to using the ``__call__`` method
           of the view callable (or the function itself, if the view