diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-11-22 07:12:22 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 07:12:22 +0900 |
| commit | 57c9362fb214e926f535961f3a78c54e0cce15ba (patch) | |
| tree | 064a665789a57c2811ba9a4da685854eadcf18b3 /docs/narr/advconfig.rst | |
| parent | a3b59b55fbb41da9c8c1c34d1bf54b52fbf00d54 (diff) | |
| parent | d9e13bef1c8252f65febfdda5eae341eba987c9a (diff) | |
| download | pyramid-57c9362fb214e926f535961f3a78c54e0cce15ba.tar.gz pyramid-57c9362fb214e926f535961f3a78c54e0cce15ba.tar.bz2 pyramid-57c9362fb214e926f535961f3a78c54e0cce15ba.zip | |
Merge pull request #3405 from kpinc/iniprocessing
Describe the points at which ini files are processed
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: |