diff options
| author | Michael Merickel <michael@merickel.org> | 2013-04-05 15:51:58 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-04-05 15:51:58 -0700 |
| commit | a62ebd5725338d753d49ff1b6b8bf0fe95b19c92 (patch) | |
| tree | e57ecad8ed5c7fb04bec7caffc99fda022ffab7f /docs/narr/extconfig.rst | |
| parent | dc272d12ec4fd9b8b3b54889b2ff9c7e5e3b8bd4 (diff) | |
| parent | f5eb753eebbda6fa55ccc5108fcc325931a17f85 (diff) | |
| download | pyramid-a62ebd5725338d753d49ff1b6b8bf0fe95b19c92.tar.gz pyramid-a62ebd5725338d753d49ff1b6b8bf0fe95b19c92.tar.bz2 pyramid-a62ebd5725338d753d49ff1b6b8bf0fe95b19c92.zip | |
Merge pull request #971 from tshepang/diff
some doc improvements
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: |