diff options
| author | Steve Piercy <web@stevepiercy.com> | 2014-02-10 22:36:08 -0600 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2014-02-10 22:36:08 -0600 |
| commit | c444a314433ae55148eadd6481120bb875a954c1 (patch) | |
| tree | 886f63ba4c3d37346330473aadab043e74bbc55b /docs/narr/advconfig.rst | |
| parent | 15c9fb86a26d05056bf744621596eb3e4e3f12f7 (diff) | |
| parent | 2033eeb3602f330930585678aac926749b9c22f7 (diff) | |
| download | pyramid-c444a314433ae55148eadd6481120bb875a954c1.tar.gz pyramid-c444a314433ae55148eadd6481120bb875a954c1.tar.bz2 pyramid-c444a314433ae55148eadd6481120bb875a954c1.zip | |
Merge pull request #1241 from stevepiercy/master
Garden Sphinx directives
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 8 |
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()`` +++++++++++++++++++++++++ |