diff options
| author | Michael Merickel <michael@merickel.org> | 2012-05-03 00:11:50 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-05-03 00:11:50 -0500 |
| commit | c1c2b6ad8e22f9cba291de8903edfa4c7c741dca (patch) | |
| tree | c3bfa436eafa3903af04a4f4f3750a7ddb216830 /docs/narr/startup.rst | |
| parent | c3df7a76fa9f92201fbf57693b580b8904fac038 (diff) | |
| parent | 004882434aa166a58c3b2148322e08ce61ec4cb7 (diff) | |
| download | pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.gz pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.bz2 pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.zip | |
Merge branch 'master' into feature.json-api
Diffstat (limited to 'docs/narr/startup.rst')
| -rw-r--r-- | docs/narr/startup.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst index 8e28835af..f5c741f52 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -42,8 +42,8 @@ Here's a high-level time-ordered overview of what happens when you press ``[pipeline:main]``, or ``[composite:main]`` in the ``.ini`` file. This section represents the configuration of a :term:`WSGI` application that will be served. If you're using a simple application (e.g. - ``[app:main]``), the application :term:`entry point` or :term:`dotted - Python name` will be named on the ``use=`` line within the section's + ``[app:main]``), the application's ``paste.app_factory`` :term:`entry + point` will be named on the ``use=`` line within the section's configuration. If, instead of a simple application, you're using a WSGI :term:`pipeline` (e.g. a ``[pipeline:main]`` section), the application named on the "last" element will refer to your :app:`Pyramid` application. @@ -59,11 +59,11 @@ Here's a high-level time-ordered overview of what happens when you press system for this application. See :ref:`logging_config` for more information. -#. The application's *constructor* named by the entry point reference or - dotted Python name on the ``use=`` line of the section representing your - :app:`Pyramid` application is passed the key/value parameters mentioned - within the section in which it's defined. The constructor is meant to - return a :term:`router` instance, which is a :term:`WSGI` application. +#. The application's *constructor* named by the entry point reference on the + ``use=`` line of the section representing your :app:`Pyramid` application + is passed the key/value parameters mentioned within the section in which + it's defined. The constructor is meant to return a :term:`router` + instance, which is a :term:`WSGI` application. For :app:`Pyramid` applications, the constructor will be a function named ``main`` in the ``__init__.py`` file within the :term:`package` in which |