summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
commitb6f6e5506fa51a79eb5b0bb3c95b01878526fbff (patch)
tree277dbc6019c7f5b0f2cb1b35074186e247f526a8 /docs/narr/project.rst
parent673d55a3188d88c5fcf66062a894818a66722334 (diff)
parentdd53294c3342f58e0fb62b20ad61e59c1f88ac8b (diff)
downloadpyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.gz
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.bz2
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.zip
merge changes from master
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 15fe0fdb3..225ced59c 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -751,14 +751,14 @@ also informs Python that the directory which contains it is a *package*.
#. Line 2 imports the ``get_root`` function from
:mod:`myproject.models` that we use later.
-#. Lines 4-14 define a function that returns a :app:`Pyramid`
+#. Lines 4-12 define a function that returns a :app:`Pyramid`
WSGI application. This function is meant to be called
by the :term:`PasteDeploy` framework as a result of running
``paster serve``.
Within this function, configuration is performed.
- Lines 9-11 register a "default view" (a view that has no ``name``
+ Lines 8-10 register a "default view" (a view that has no ``name``
attribute). It is registered so that it will be found when the
:term:`context` of the request is an instance of the
:class:`myproject.models.MyModel` class. The first argument to
@@ -772,11 +772,11 @@ also informs Python that the directory which contains it is a *package*.
``templates`` directory of the ``myproject`` package. The template file
it actually points to is a :term:`Chameleon` ZPT template file.
- Line 12 registers a static view, which will serve up the files from the
+ Line 11 registers a static view, which will serve up the files from the
``mypackage:static`` :term:`resource specification` (the ``static``
directory of the ``mypackage`` package).
- Line 14 returns a :term:`WSGI` application to the caller of the function
+ Line 12 returns a :term:`WSGI` application to the caller of the function
(Paste).
``views.py``