diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-11-21 14:12:47 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2018-11-21 14:12:47 -0800 |
| commit | 28f24e7592fc5a7fd28874e9a350f80674583471 (patch) | |
| tree | 02e402ea6276267ac33884e505ad74a31e70bee9 /docs/narr/advconfig.rst | |
| parent | 403fd94b39954a1587f2236f8a3ddd2514e8ecb0 (diff) | |
| parent | 57c9362fb214e926f535961f3a78c54e0cce15ba (diff) | |
| download | pyramid-28f24e7592fc5a7fd28874e9a350f80674583471.tar.gz pyramid-28f24e7592fc5a7fd28874e9a350f80674583471.tar.bz2 pyramid-28f24e7592fc5a7fd28874e9a350f80674583471.zip | |
Merge remote-tracking branch 'upstream/master'
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 322741648..33edb0eae 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -168,9 +168,13 @@ Using ``config.commit()`` You can manually commit a configuration by using the :meth:`~pyramid.config.Configurator.commit` method between configuration calls. +After a commit, more :term:`configuration declaration`\s may be added to a :term:`configurator`. +New declarations will not conflict with committed declarations. +The new declarations will override committed declarations. + For example, we prevent conflicts from occurring in the application we examined -previously as the result of adding a ``commit``. Here's the application that -generates conflicts: +previously by adding a ``commit``. +Here's the application that generates conflicts: .. code-block:: python :linenos: |