Merge branch 'master' of github.com:Pylons/pyramid

1 files changed, 11 insertions, 32 deletions

diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 7001cd980..d3221db3c 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -38,11 +38,11 @@ A view configuration statement is made about information present in the
 
 View configuration is performed in one of two ways:
 
-- by running a :term:`scan` against application source code which has a
+- By running a :term:`scan` against application source code which has a
   :class:`pyramid.view.view_config` decorator attached to a Python object as
   per :ref:`mapping_views_using_a_decorator_section`.
 
-- by using the :meth:`pyramid.config.Configurator.add_view` method as per
+- By using the :meth:`pyramid.config.Configurator.add_view` method as per
   :ref:`mapping_views_using_imperative_config_section`.
 
 .. index::
@@ -68,7 +68,7 @@ the registered view callable will be invoked.  The fewer number of predicates
 which are supplied to a particular view configuration, the more likely it is
 that the associated view callable will be invoked.  A view with five
 predicates will always be found and evaluated before a view with two, for
-example.  All predicates must match for the associated view to be called.
+example.
 
 This does not mean however, that :app:`Pyramid` "stops looking" when it
 finds a view registration with predicates that don't match.  If one set
@@ -81,7 +81,7 @@ invoked.
 If no view can be found with predicates which allow it to be matched up with
 the request, :app:`Pyramid` will return an error to the user's browser,
 representing a "not found" (404) page.  See :ref:`changing_the_notfound_view`
-for more information about changing the default notfound view.
+for more information about changing the default :term:`Not Found View`.
 
 Other view configuration arguments are non-predicate arguments.  These tend
 to modify the response of the view callable or prevent the view callable from
@@ -293,7 +293,7 @@ configured view.
   This value can be any string or a sequence of strings.  A view declaration 
   with this argument ensures that the view will only be called when the 
   :term:`request` has a key in the ``request.params`` dictionary (an HTTP 
-  ``GET`` or ``POST`` variable) that has a name which matches the a 
+  ``GET`` or ``POST`` variable) that has a name which matches the
   supplied value.
 
   If any value supplied has a ``=`` sign in it,
@@ -475,7 +475,7 @@ Adding View Configuration Using the ``@view_config`` Decorator
 
 .. warning::
 
-   Using this feature tends to slows down application startup slightly, as
+   Using this feature tends to slow down application startup slightly, as
    more work is performed at application startup to scan for view
    configuration declarations.  For maximum startup performance, use the view
    configuration method described in
@@ -583,8 +583,7 @@ If your view callable is a function, it may be used as a function decorator:
        return Response('edited!')
 
 If your view callable is a class, the decorator can also be used as a class
-decorator in Python 2.6 and better (Python 2.5 and below do not support class
-decorators).  All the arguments to the decorator are the same when applied
+decorator. All the arguments to the decorator are the same when applied
 against a class as when they are applied against a function.  For example:
 
 .. code-block:: python
@@ -601,25 +600,6 @@ against a class as when they are applied against a function.  For example:
        def __call__(self):
            return Response('hello')
 
-You can use the :class:`~pyramid.view.view_config` decorator as a simple
-callable to manually decorate classes in Python 2.5 and below without the
-decorator syntactic sugar, if you wish:
-
-.. code-block:: python
-   :linenos:
-
-   from pyramid.response import Response
-   from pyramid.view import view_config
-
-   class MyView(object):
-       def __init__(self, request):
-           self.request = request
-
-       def __call__(self):
-           return Response('hello')
-
-   my_view = view_config(route_name='hello')(MyView)
-
 More than one :class:`~pyramid.view.view_config` decorator can be stacked on
 top of any number of others.  Each decorator creates a separate view
 registration.  For example:
@@ -706,11 +686,10 @@ this method are very similar to the arguments that you provide to the
    # pyramid.config.Configurator class
    config.add_view(hello_world, route_name='hello')
 
-The first argument, ``view``, is required.  It must either be a Python object
-which is the view itself or a :term:`dotted Python name` to such an object.
-In the above example, ``view`` is the ``hello_world`` function.  All other
-arguments are optional.  See :meth:`pyramid.config.Configurator.add_view` for
-more information.
+The first argument, a :term:`view callable`, is the only required argument.
+It must either be a Python object which is the view itself or a
+:term:`dotted Python name` to such an object.
+In the above example, the ``view callable`` is the ``hello_world`` function.
 
 When you use only :meth:`~pyramid.config.Configurator.add_view` to add view
 configurations, you don't need to issue a :term:`scan` in order for the view