Skip to content

Commit e1141b6

Browse files
committed
Implicit setup can also fail with ImproperlyConfigured.
Fix #511.
1 parent ee2b85d commit e1141b6

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

docs/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,10 @@
265265

266266

267267
# Example configuration for intersphinx: refer to the Python standard library.
268-
intersphinx_mapping = {'http://docs.python.org/': None}
268+
intersphinx_mapping = {
269+
'http://docs.python.org/': None,
270+
'http://docs.djangoproject.com/en/dev/': 'http://docs.djangoproject.com/en/dev/_objects/',
271+
}
269272

270273
# -- Options for Read the Docs --------------------------------------------
271274

docs/installation.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ what it does, or if you prefer defining your settings explicitly, read below.
5555
.. warning::
5656

5757
The automatic setup imports your project's URLconf in order to add the
58-
Debug Toolbar's URLs. This may trigger circular imports when the URLconf
59-
imports views that import models. If you're hitting an :exc:`ImportError`,
60-
follow the explicit setup instructions.
58+
Debug Toolbar's URLs. This may trigger circular imports, for instance when
59+
the URLconf imports views that import models. If the development server
60+
crashes with a long stack trace after hitting an :exc:`ImportError` or an
61+
:exc:`~django.core.exceptions.ImproperlyConfigured` exception, follow the
62+
explicit setup instructions.
6163

6264
Explicit setup
6365
--------------

0 commit comments

Comments
 (0)