diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-23 14:57:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-23 14:57:01 -0400 |
| commit | d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (patch) | |
| tree | 36784e20002ecc4cb6675901b3cc2bda36e54caa /docs/narr/advconfig.rst | |
| parent | 0c5bb0aa329239df877ccb053280e398766eb434 (diff) | |
| parent | c740e8bd20c049cbab43ce0a1cd5a4533fe6b849 (diff) | |
| download | pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.gz pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.bz2 pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.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()`` +++++++++++++++++++++++++ |