diff options
| author | Michael Merickel <michael@merickel.org> | 2011-12-02 09:44:57 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2011-12-02 09:44:57 -0600 |
| commit | 9ac23411c968cda869770d66e6b0ab7108b90ba5 (patch) | |
| tree | 1000f37b6f6afa273621f1187526e96a4c3e176d /docs | |
| parent | 65fb3b371d63f59fa94ec2b5a431894eb78060be (diff) | |
| parent | f0a1b9b491bab0ac90be6765ddf56a0696d4f863 (diff) | |
| download | pyramid-9ac23411c968cda869770d66e6b0ab7108b90ba5.tar.gz pyramid-9ac23411c968cda869770d66e6b0ab7108b90ba5.tar.bz2 pyramid-9ac23411c968cda869770d66e6b0ab7108b90ba5.zip | |
Merge branch 'pull.364'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/firstapp.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst index ccc2b8b18..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 functions accepts a -single argument (``request``). The ``hello_world`` function returns an -instance of the :class:`pyramid.response.Response`. The single argument to -the class' constructor is value computed from arguments matched from the url -route. This value becomes the body of the response. +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 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')``, |
