summaryrefslogtreecommitdiff
path: root/docs/narr/firstapp.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2011-12-02 09:44:21 -0600
committerMichael Merickel <michael@merickel.org>2011-12-02 09:44:21 -0600
commitf0a1b9b491bab0ac90be6765ddf56a0696d4f863 (patch)
tree1000f37b6f6afa273621f1187526e96a4c3e176d /docs/narr/firstapp.rst
parent5999a8c3ae406902987989cf7c48d3c08b6638cf (diff)
downloadpyramid-f0a1b9b491bab0ac90be6765ddf56a0696d4f863.tar.gz
pyramid-f0a1b9b491bab0ac90be6765ddf56a0696d4f863.tar.bz2
pyramid-f0a1b9b491bab0ac90be6765ddf56a0696d4f863.zip
Attempted to clean this up further.
Diffstat (limited to 'docs/narr/firstapp.rst')
-rw-r--r--docs/narr/firstapp.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index 2c8e346b1..c082f616b 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -71,11 +71,10 @@ named ``hello_world``.
:linenos:
:pyobject: hello_world
-This function doesn't do anything very difficult. The function accepts a
-single argument (``request``). The ``hello_world`` function returns an
+The function accepts a single argument (``request``) and it returns an
instance of the :class:`pyramid.response.Response` class. The single
-argument to the class' constructor value is computed from arguments
-matched from the url route. This value becomes the body of the response.
+argument to the class' constructor is a string computed from parameters
+matched from the URL. This value becomes the body of the response.
This function is known as a :term:`view callable`. A view callable
accepts a single argument, ``request``. It is expected to return a
@@ -157,7 +156,7 @@ Adding Configuration
:lines: 10-11
First line above calls the :meth:`pyramid.config.Configurator.add_route`
-method, which registers a :term:`route` to match any url path that begins
+method, which registers a :term:`route` to match any URL path that begins
with ``/hello/`` followed by a string.
The second line, ``config.add_view(hello_world, route_name='hello')``,