summaryrefslogtreecommitdiff
path: root/docs/narr/configuration.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
commit5d0b1beaf3b09045fd3dd71244938ee6e391ebf3 (patch)
tree2fd3a374d4c937184497e5589bcf93391833949a /docs/narr/configuration.rst
parent650d3d5fa383d89a3b28029162d6ef4d58be3da1 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.gz
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.bz2
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
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.