summaryrefslogtreecommitdiff
path: root/docs/narr/configuration.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-02 13:57:30 -0400
committerChris McDonough <chrism@plope.com>2015-04-02 13:57:30 -0400
commit45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f (patch)
tree9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 /docs/narr/configuration.rst
parentb6498fce8c1418f3c7b33d31aa9c151a86bc4166 (diff)
parent575ff8050b0cbdbf424947361f419b803568e122 (diff)
downloadpyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.gz
pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.bz2
pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.zip
Merge branch 'master' of github.com:Pylons/pyramid
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.