summaryrefslogtreecommitdiff
path: root/docs/narr/configuration.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-09-29 13:05:22 -0500
committerMichael Merickel <michael@merickel.org>2014-09-29 13:05:22 -0500
commit159105a203dc62ef6306fb3537caab42bca0df8e (patch)
treeaaf0311c318edbb9c240fac6a0a04b0a39cbe18a /docs/narr/configuration.rst
parent534ce342d61571a93b3f89b72f3ff8323d0f0f0b (diff)
parent4a63f6ac8f19d21eebf23bd8c9f833f2b676287b (diff)
downloadpyramid-159105a203dc62ef6306fb3537caab42bca0df8e.tar.gz
pyramid-159105a203dc62ef6306fb3537caab42bca0df8e.tar.bz2
pyramid-159105a203dc62ef6306fb3537caab42bca0df8e.zip
Merge pull request #1396 from kpinc/doc_config
Doc config
Diffstat (limited to 'docs/narr/configuration.rst')
-rw-r--r--docs/narr/configuration.rst4
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.