diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-24 21:23:59 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-24 21:23:59 -0400 |
| commit | c4fa9ed5726fe2dd323f89eb7be38287067def20 (patch) | |
| tree | 5e2925daa42d128039b6105d1da55ee2c64748c0 /docs/narr/startup.rst | |
| parent | 4588e5b3e303813d70a466bb64d31655ef295bda (diff) | |
| parent | 4396c62c5ebb07ffdc418955c251ed4d62d45817 (diff) | |
| download | pyramid-c4fa9ed5726fe2dd323f89eb7be38287067def20.tar.gz pyramid-c4fa9ed5726fe2dd323f89eb7be38287067def20.tar.bz2 pyramid-c4fa9ed5726fe2dd323f89eb7be38287067def20.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/startup.rst')
| -rw-r--r-- | docs/narr/startup.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst index 8661c8f6a..68df9d417 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -112,11 +112,11 @@ Here's a high-level time-ordered overview of what happens when you press (which is internal to Paste) such as ``reload_templates``, ``debug_authorization``, etc. -#. The ``main`` function then calls various methods on the an instance of the - class :class:`~pyramid.config.Configurator` method. The intent of - calling these methods is to populate an :term:`application registry`, - which represents the :app:`Pyramid` configuration related to the - application. +#. The ``main`` function then calls various methods on the instance of the + class :class:`~pyramid.config.Configurator` created in the previous step. + The intent of calling these methods is to populate an + :term:`application registry`, which represents the :app:`Pyramid` + configuration related to the application. #. The :meth:`~pyramid.config.Configurator.make_wsgi_app` method is called. The result is a :term:`router` instance. The router is associated with |