diff options
| author | Chris McDonough <chrism@plope.com> | 2014-04-07 09:55:11 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-04-07 09:55:11 -0400 |
| commit | bcf18220be9c21ff4b1af50f45b90aadfa7820f5 (patch) | |
| tree | 99232b448c08c5689117cb84c025efb349b50b0f /docs/narr/advconfig.rst | |
| parent | d7b647d27ebde9bc8203629b651e69d6e7ac7c38 (diff) | |
| parent | 32200c3af84c352c066eb2c402496305375912e4 (diff) | |
| download | pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.gz pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.tar.bz2 pyramid-bcf18220be9c21ff4b1af50f45b90aadfa7820f5.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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()`` +++++++++++++++++++++++++ |
