diff options
| author | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-02-16 01:10:49 +0200 |
|---|---|---|
| committer | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-03-05 01:53:59 +0200 |
| commit | 62ea1b60f18d8ac0bab2331852f9ef8bee1fad57 (patch) | |
| tree | 680105bd015591e4c4c6dcdf8a40c8b4d80577ea /docs | |
| parent | cd8ac801ac1ccefb81c2e015124be910cb8c93de (diff) | |
| download | pyramid-62ea1b60f18d8ac0bab2331852f9ef8bee1fad57.tar.gz pyramid-62ea1b60f18d8ac0bab2331852f9ef8bee1fad57.tar.bz2 pyramid-62ea1b60f18d8ac0bab2331852f9ef8bee1fad57.zip | |
fix link
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/paste.rst | 2 | ||||
| -rw-r--r-- | docs/narr/startup.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/narr/paste.rst b/docs/narr/paste.rst index 86b047aec..efec1f092 100644 --- a/docs/narr/paste.rst +++ b/docs/narr/paste.rst @@ -85,6 +85,8 @@ function. This is the function called by :term:`PasteDeploy` when the ``pserve`` command is invoked against our application. It accepts a global configuration object and *returns* an instance of our application. +.. _defaults_section_of_pastedeploy_file: + ``[DEFAULTS]`` Section of a PasteDeploy ``.ini`` File ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/narr/startup.rst b/docs/narr/startup.rst index f5c741f52..3a9225032 100644 --- a/docs/narr/startup.rst +++ b/docs/narr/startup.rst @@ -77,9 +77,9 @@ 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 (if `[DEFAULT] - <http://docs.pylonsproject.org/projects/pyramid/dev/narr/paste.html#defaults-section-of-a-pastedeploy-ini-file>`__ - is present). It also accepts a ``**settings`` argument, which collects + section of an ``.ini`` file + (if :ref:`[DEFAULT] <defaults_section_of_pastedeploy_file>` 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 |