summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-12-10 15:34:30 -0500
committerChris McDonough <chrism@plope.com>2012-12-10 15:34:30 -0500
commit8389a5b3339b18f2ba7242d05d11ecb64371f3d9 (patch)
tree113a6b7aea8015518c89cfa42e9bb0df34bed37c /docs/narr/project.rst
parenta078e197d04400d2430206fe31e3398c761b20a3 (diff)
parentf3a84be3b0e37b74acc26cfb413800610af85b86 (diff)
downloadpyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.tar.gz
pyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.tar.bz2
pyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index b08948e43..fb62f4bd2 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -829,25 +829,25 @@ also informs Python that the directory which contains it is a *package*.
#. Line 1 imports the :term:`Configurator` class from :mod:`pyramid.config`
that we use later.
-#. Lines 3-10 define a function named ``main`` that returns a :app:`Pyramid`
+#. Lines 4-11 define a function named ``main`` that returns a :app:`Pyramid`
WSGI application. This function is meant to be called by the
:term:`PasteDeploy` framework as a result of running ``pserve``.
Within this function, application configuration is performed.
- Line 6 creates an instance of a :term:`Configurator`.
+ Line 7 creates an instance of a :term:`Configurator`.
- Line 7 registers a static view, which will serve up the files from the
+ Line 8 registers a static view, which will serve up the files from the
``myproject:static`` :term:`asset specification` (the ``static``
directory of the ``myproject`` package).
- Line 8 adds a :term:`route` to the configuration. This route is later
+ Line 9 adds a :term:`route` to the configuration. This route is later
used by a view in the ``views`` module.
- Line 9 calls ``config.scan()``, which picks up view registrations declared
+ Line 10 calls ``config.scan()``, which picks up view registrations declared
elsewhere in the package (in this case, in the ``views.py`` module).
- Line 10 returns a :term:`WSGI` application to the caller of the function
+ Line 11 returns a :term:`WSGI` application to the caller of the function
(Pyramid's pserve).
.. index::
@@ -865,7 +865,7 @@ and which returns a :term:`response`.
:language: python
:linenos:
-Lines 3-5 define and register a :term:`view callable` named ``my_view``. The
+Lines 4-6 define and register a :term:`view callable` named ``my_view``. The
function named ``my_view`` is decorated with a ``view_config`` decorator
(which is processed by the ``config.scan()`` line in our ``__init__.py``).
The view_config decorator asserts that this view be found when a