diff options
| author | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
| commit | 1f0106e2debcfc82e17c55385ce9a01985ae458c (patch) | |
| tree | d51720ba9314c23d0a7e9f5d7a6e9d7f238bf24b /docs/narr/extconfig.rst | |
| parent | d64fa6136d0dec6717b273362de548d8f3bf47e8 (diff) | |
| parent | d037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 (diff) | |
| download | pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.gz pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.bz2 pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.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: |