diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-23 12:10:16 -0400 |
| commit | 47b8cf7e9b578464b533383083f7135271db0f9e (patch) | |
| tree | 724c40d50f21773b6585ab7d9731b8bf7a93a71c /docs/narr/extconfig.rst | |
| parent | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff) | |
| parent | dcaabcb87ca584c289efe70a604db0502838df3d (diff) | |
| download | pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.gz pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.bz2 pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/extconfig.rst')
| -rw-r--r-- | docs/narr/extconfig.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/extconfig.rst b/docs/narr/extconfig.rst index f33326279..659056952 100644 --- a/docs/narr/extconfig.rst +++ b/docs/narr/extconfig.rst @@ -129,8 +129,8 @@ called (either explicitly or as the result of calling :meth:`~pyramid.config.Configurator.make_wsgi_app`), conflicting actions are potentially automatically resolved as per :ref:`automatic_conflict_resolution`. If a conflict cannot be automatically -resolved, a :exc:`ConfigurationConflictError` is raised and application -startup is prevented. +resolved, a :exc:`pyramid.exceptions.ConfigurationConflictError` is raised +and application startup is prevented. In our above example, therefore, if a consumer of our ``add_jammyjam`` directive did this: |