summaryrefslogtreecommitdiff
path: root/docs/narr/advconfig.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2014-02-10 03:22:33 -0600
committerSteve Piercy <web@stevepiercy.com>2014-02-10 22:32:34 -0600
commit2033eeb3602f330930585678aac926749b9c22f7 (patch)
tree8c0b12ea184357772b7c703f8171095dfd5226d5 /docs/narr/advconfig.rst
parent5ac519452613b7bd5df22293c2ccb3b9c3597ef4 (diff)
downloadpyramid-2033eeb3602f330930585678aac926749b9c22f7.tar.gz
pyramid-2033eeb3602f330930585678aac926749b9c22f7.tar.bz2
pyramid-2033eeb3602f330930585678aac926749b9c22f7.zip
- Garden PR #1121
Diffstat (limited to 'docs/narr/advconfig.rst')
-rw-r--r--docs/narr/advconfig.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index d3431e39e..9ceaaa495 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -158,8 +158,12 @@ use :meth:`pyramid.config.Configurator.include`:
Using :meth:`~pyramid.config.Configurator.include` instead of calling the
function directly provides a modicum of automated conflict resolution, with
the configuration statements you define in the calling code overriding those
-of the included function. See also :ref:`automatic_conflict_resolution` and
-:ref:`including_configuration`.
+of the included function.
+
+.. seealso::
+
+ See also :ref:`automatic_conflict_resolution` and
+ :ref:`including_configuration`.
Using ``config.commit()``
+++++++++++++++++++++++++