consistency

6 files changed, 12 insertions, 11 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index adf448945..088c8aaa5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -511,7 +511,7 @@ Features
 
 - The static view machinery now raises (rather than returns) ``HTTPNotFound``
   and ``HTTPMovedPermanently`` exceptions, so these can be caught by the
-  NotFound view (and other exception views).
+  Not Found View (and other exception views).
 
 - The Mako renderer now supports a def name in an asset spec.  When the def
   name is present in the asset spec, the system will render the template def
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index d7af5ab98..d103ca1cd 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -79,7 +79,7 @@ The ``notfound_get`` view will be called when a view could not be found and
 the request method was ``GET``.  The ``notfound_post`` view will be called
 when a view could not be found and the request method was ``POST``.
 
-Like any other view, the notfound view must accept at least a ``request``
+Like any other view, the Not Found View must accept at least a ``request``
 parameter, or both ``context`` and ``request``.  The ``request`` is the
 current :term:`request` representing the denied action.  The ``context`` (if
 used in the call signature) will be the instance of the
@@ -91,7 +91,8 @@ Both :meth:`pyramid.config.Configurator.add_notfound_view` and
 redirect requests to slash-appended routes. See
 :ref:`redirecting_to_slash_appended_routes` for examples.
 
-Here's some sample code that implements a minimal NotFound view callable:
+Here's some sample code that implements a minimal :term:`Not Found View`
+callable:
 
 .. code-block:: python
    :linenos:
@@ -103,7 +104,7 @@ Here's some sample code that implements a minimal NotFound view callable:
 
 .. note::
 
-   When a NotFound view callable is invoked, it is passed a
+   When a Not Found View callable is invoked, it is passed a
    :term:`request`.  The ``exception`` attribute of the request will be an
    instance of the :exc:`~pyramid.httpexceptions.HTTPNotFound` exception that
    caused the Not Found View to be called.  The value of
@@ -122,7 +123,7 @@ Here's some sample code that implements a minimal NotFound view callable:
 
 .. warning::
 
-   When a NotFound view callable accepts an argument list as
+   When a Not Found View callable accepts an argument list as
    described in :ref:`request_and_context_view_definitions`, the ``context``
    passed as the first argument to the view callable will be the
    :exc:`~pyramid.httpexceptions.HTTPNotFound` exception instance.  If
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 9f3b91c26..96c0b88cf 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -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
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index 34fda5f37..f725615f3 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -108,7 +108,7 @@ Minor Feature Additions
 - The static view machinery now raises rather than returns
   :class:`pyramid.httpexceptions.HTTPNotFound` and
   :class:`pyramid.httpexceptions.HTTPMovedPermanently` exceptions, so these can
-  be caught by the notfound view (and other exception views).
+  be caught by the Not Found View (and other exception views).
 
 - When there is a predicate mismatch exception (seen when no view matches for
   a given request due to predicates not working), the exception now contains
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 1b89437ea..201ce9899 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1615,7 +1615,7 @@ class ViewsConfiguratorMixin(object):
         append_slash=False,
         **predicates
         ):
-        """ Add a default notfound view to the current configuration state.
+        """ Add a default Not Found View to the current configuration state.
         The view will be called when Pyramid or application code raises an
         :exc:`pyramid.httpexceptions.HTTPForbidden` exception (e.g. when a
         view cannot be found for the request).  The simplest example is:
@@ -1634,9 +1634,9 @@ class ViewsConfiguratorMixin(object):
         :meth:`pyramid.config.Configurator.add_view`, this method will raise
         an exception if passed ``name``, ``permission``, ``context``,
         ``for_``, or ``http_cache`` keyword arguments.  These argument values
-        make no sense in the context of a notfound view.
+        make no sense in the context of a Not Found View.
 
-        If ``append_slash`` is ``True``, when this notfound view is invoked,
+        If ``append_slash`` is ``True``, when this Not Found View is invoked,
         and the current path info does not end in a slash, the notfound logic
         will attempt to find a :term:`route` that matches the request's path
         info suffixed with a slash.  If such a route exists, Pyramid will
diff --git a/pyramid/view.py b/pyramid/view.py
index cc1854e20..00a68e60f 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -340,7 +340,7 @@ class notfound_view_config(object):
     argument restricts the set of circumstances under which this notfound
     view will be invoked.
 
-    If ``append_slash`` is ``True``, when the notfound view is invoked, and
+    If ``append_slash`` is ``True``, when the Not Found View is invoked, and
     the current path info does not end in a slash, the notfound logic will
     attempt to find a :term:`route` that matches the request's path info
     suffixed with a slash.  If such a route exists, Pyramid will issue a