summaryrefslogtreecommitdiff
path: root/docs/narr/startup.rst
diff options
context:
space:
mode:
authorCypha <dilirst@gmail.com>2011-10-24 04:39:04 -0400
committerCypha <dilirst@gmail.com>2011-10-24 04:39:04 -0400
commit2217d19853a5c389dd809983f69fb31e6e7c9c4b (patch)
treec66650968159a79144e1446945b9329c4fca083d /docs/narr/startup.rst
parentd7ac00322fe7669d02d38b8f9fa02fa66e268fbc (diff)
downloadpyramid-2217d19853a5c389dd809983f69fb31e6e7c9c4b.tar.gz
pyramid-2217d19853a5c389dd809983f69fb31e6e7c9c4b.tar.bz2
pyramid-2217d19853a5c389dd809983f69fb31e6e7c9c4b.zip
clarified [DEFAULT] as an optional section in .ini
Diffstat (limited to 'docs/narr/startup.rst')
-rw-r--r--docs/narr/startup.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst
index f4ebef154..0d5acfa47 100644
--- a/docs/narr/startup.rst
+++ b/docs/narr/startup.rst
@@ -76,12 +76,12 @@ Here's a high-level time-ordered overview of what happens when you press
Note that the constructor function accepts a ``global_config`` argument,
which is a dictionary of key/value pairs mentioned in the ``[DEFAULT]``
- section of an ``.ini`` file. It also accepts a ``**settings`` argument,
- which collects another set of arbitrary key/value pairs. The arbitrary
- key/value pairs received by this function in ``**settings`` will be
- composed of all the key/value pairs that are present in the ``[app:main]``
- section (except for the ``use=`` setting) when this function is called by
- when you run ``pserve``.
+ section of an ``.ini`` file (if ``[DEFAULT]`` is present). It also accepts
+ a ``**settings`` argument, which collects another set of arbitrary
+ key/value pairs. The arbitrary key/value pairs received by this function
+ in ``**settings`` will be composed of all the key/value pairs that are
+ present in the ``[app:main]`` section (except for the ``use=`` setting)
+ when this function is called by when you run ``pserve``.
Our generated ``development.ini`` file looks like so: