diff options
| author | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
| commit | d1d3edbbafd5ed0160e70f960025a12fa0783b5b (patch) | |
| tree | d4bbc47ee9c469d3a89cf84f9df27b0edffe0f29 /docs/narr/configuration.rst | |
| parent | fe83c6bfdab16818cb434d95a09bd6510b43aa24 (diff) | |
| parent | 7dd39020afbd50f6b27e03bb81ace700ae280bef (diff) | |
| download | pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.gz pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.bz2 pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.zip | |
Merge branch 'master' into feature.security-docs-enhancements
Diffstat (limited to 'docs/narr/configuration.rst')
| -rw-r--r-- | docs/narr/configuration.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/narr/configuration.rst b/docs/narr/configuration.rst index 52615533d..f7fa94daf 100644 --- a/docs/narr/configuration.rst +++ b/docs/narr/configuration.rst @@ -17,6 +17,10 @@ plugging application code that you've written into :app:`Pyramid` is also referred to within this documentation as "configuration"; you are configuring :app:`Pyramid` to call the code that makes up your application. +.. seealso:: + For information on ``.ini`` files for Pyramid applications see the + :ref:`startup_chapter` chapter. + There are two ways to configure a :app:`Pyramid` application: :term:`imperative configuration` and :term:`declarative configuration`. Both are described below. |