summaryrefslogtreecommitdiff
path: root/docs/narr/advconfig.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-20 06:10:38 -0400
committerChris McDonough <chrism@plope.com>2011-07-20 06:10:38 -0400
commit6ce1e0cf1a141767ee0aca70786c15dd993347c5 (patch)
treeed279497d354709b63d0fdc2c1e71cb88c424df7 /docs/narr/advconfig.rst
parent9dfd3436711d6ef5f4a759f43acca859a9391c26 (diff)
downloadpyramid-6ce1e0cf1a141767ee0aca70786c15dd993347c5.tar.gz
pyramid-6ce1e0cf1a141767ee0aca70786c15dd993347c5.tar.bz2
pyramid-6ce1e0cf1a141767ee0aca70786c15dd993347c5.zip
add more index markers
Diffstat (limited to 'docs/narr/advconfig.rst')
-rw-r--r--docs/narr/advconfig.rst9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 3bd9c2a4e..8040a465f 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -14,7 +14,7 @@ you to ignore relative configuration statement ordering in some
circumstances.
.. index::
- single: imperative configuration
+ pair: configuration; conflict detection
.. _conflict_detection:
@@ -299,6 +299,9 @@ These are the methods of the configurator which provide conflict detection:
provides conflict detection, because it's implemented in terms of the
conflict-aware ``add_route`` and ``add_view`` methods.
+.. index::
+ pair: configuration; including from external sources
+
.. _including_configuration:
Including Configuration from External Sources
@@ -397,6 +400,10 @@ constraints: the routes they imply require relative ordering. Such ordering
constraints are not absolved by two-phase configuration. Routes are still
added in configuration execution order.
+.. index::
+ single: add_directive
+ pair: configurator; adding directives
+
.. _add_directive:
Adding Methods to the Configurator via ``add_directive``