diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-01 23:43:15 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-01 23:43:15 -0500 |
| commit | d82f1d93a914d483bec51d6463dcb4dc923719ee (patch) | |
| tree | ec8e45fa1698466fa2253681d595df649893ecfe /docs | |
| parent | 1ab81b7d9bbab2b29f4c58581bf62c5389ad068e (diff) | |
| parent | ad9cbebd3372116731d1c7681fa483930b928852 (diff) | |
| download | pyramid-d82f1d93a914d483bec51d6463dcb4dc923719ee.tar.gz pyramid-d82f1d93a914d483bec51d6463dcb4dc923719ee.tar.bz2 pyramid-d82f1d93a914d483bec51d6463dcb4dc923719ee.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/startup.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst index 78b119687..8e28835af 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -102,10 +102,9 @@ Here's a high-level time-ordered overview of what happens when you press the meanings of these keys. #. The ``main`` function first constructs a - :class:`~pyramid.config.Configurator` instance, passing a root resource - factory (constructor) to it as its ``root_factory`` argument, and - ``settings`` dictionary captured via the ``**settings`` kwarg as its - ``settings`` argument. + :class:`~pyramid.config.Configurator` instance, passing the ``settings`` + dictionary captured via the ``**settings`` kwarg as its ``settings`` + argument. The ``settings`` dictionary contains all the options in the ``[app:main]`` section of our .ini file except the ``use`` option (which is internal to |