summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-28 18:33:12 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-28 18:33:12 +0000
commitafc4deb5565e7da2f50e41fa90d74edbd4640e03 (patch)
treec6284ed839766b889092f06e388a5acb21720c75 /docs
parentfa8994cd8e981b3e84f943ce5c492387d2861bd2 (diff)
downloadpyramid-afc4deb5565e7da2f50e41fa90d74edbd4640e03.tar.gz
pyramid-afc4deb5565e7da2f50e41fa90d74edbd4640e03.tar.bz2
pyramid-afc4deb5565e7da2f50e41fa90d74edbd4640e03.zip
Fix mistakes caught by Rossi.
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/configuration.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst
index 7c14439db..283156cc7 100644
--- a/docs/narr/configuration.rst
+++ b/docs/narr/configuration.rst
@@ -206,8 +206,8 @@ In :mod:`repoze.bfg` terms, :term:`traversal` is the act of walking
over a *directed graph* of objects from a :term:`root` object using
the individual path segments of the "path info" portion of a URL (the
data following the hostname and port number, but before any query
-strng elements or fragments, for example the ``/a/b/c`` portion of the
-URL ``http://example.com/a/b/c?foo=1``) in order to find a
+string elements or fragments, for example the ``/a/b/c`` portion of
+the URL ``http://example.com/a/b/c?foo=1``) in order to find a
:term:`context` object and a :term:`view name`. The combination of
the :term:`context` object and the :term:`view name` (and, in more
complex configurations, other :term:`predicate` values) are used to
@@ -417,12 +417,12 @@ argument, the ``name`` predicate with a value of ``''``, meaning that
we'd like :mod:`repoze.bfg` to invoke the ``hello_world`` view
callable for any request for the :term:`default view` of an object.
-Since our ``hello_world`` view callable returns a Response instance
-with a body of ``Hello world!``` in the configuration implied by this
-script, a user agent to a server running this application will receive
+Our ``hello_world`` :term:`view callable` returns a Response instance
+with a body of ``Hello world!`` in the configuration implied by this
+script. It is configured as a :term:`default view`. Therefore, a
+user agent contacting a server running this application will receive
the greeting ``Hello world!`` when any :term:`default view` is
-invoked, unless :mod:`repoze.bfg` finds a more specific view
-configuration in its application registry for a given request.
+invoked.
.. sidebar:: View Dispatch and Ordering
@@ -441,7 +441,7 @@ configuration in its application registry for a given request.
most specific callable when a request is dispatched to it.
The line ``config.add_view(goodbye_world, name='goodbye')`` registers
-the ``hello_world`` function as a view callable. The line calls
+the ``goodbye_world`` function as a view callable. The line calls
``add_view`` with the view callable as the first required positional
argument, and a :term:`predicate` keyword argument ``name`` with the
value ``'goodbye'``. This :term:`view configuration` implies that a