summaryrefslogtreecommitdiff
path: root/docs/narr/configuration.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
committerChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
commitbc328b8ed02a758841f3e900b52e7ef4187792a2 (patch)
tree1b3e4f0e9799331a383385f67b906575612cf152 /docs/narr/configuration.rst
parent7e9c54ed645db97049a0848eececad3437624163 (diff)
parent03b469479c6a70d89cf18b2fdc91c223c9f6197a (diff)
downloadpyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.gz
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.bz2
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.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.