diff options
| author | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-04-05 22:56:48 +0200 |
|---|---|---|
| committer | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-04-05 23:26:09 +0200 |
| commit | f5eb753eebbda6fa55ccc5108fcc325931a17f85 (patch) | |
| tree | e57ecad8ed5c7fb04bec7caffc99fda022ffab7f /docs/narr/extconfig.rst | |
| parent | e556961d789ccf52430d19d44297cceb1f537405 (diff) | |
| download | pyramid-f5eb753eebbda6fa55ccc5108fcc325931a17f85.tar.gz pyramid-f5eb753eebbda6fa55ccc5108fcc325931a17f85.tar.bz2 pyramid-f5eb753eebbda6fa55ccc5108fcc325931a17f85.zip | |
fix some cross-references
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: |