diff options
| -rw-r--r-- | docs/conf.py | 5 | ||||
| -rw-r--r-- | docs/installation.rst | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 7c5d833..f4b07b5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -265,7 +265,10 @@ texinfo_documents = [ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'http://docs.python.org/': None} +intersphinx_mapping = { + 'http://docs.python.org/': None, + 'http://docs.djangoproject.com/en/dev/': 'http://docs.djangoproject.com/en/dev/_objects/', +} # -- Options for Read the Docs -------------------------------------------- diff --git a/docs/installation.rst b/docs/installation.rst index b75f9ad..f761e91 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -55,9 +55,11 @@ what it does, or if you prefer defining your settings explicitly, read below. .. warning:: The automatic setup imports your project's URLconf in order to add the - Debug Toolbar's URLs. This may trigger circular imports when the URLconf - imports views that import models. If you're hitting an :exc:`ImportError`, - follow the explicit setup instructions. + Debug Toolbar's URLs. This may trigger circular imports, for instance when + the URLconf imports views that import models. If the development server + crashes with a long stack trace after hitting an :exc:`ImportError` or an + :exc:`~django.core.exceptions.ImproperlyConfigured` exception, follow the + explicit setup instructions. Explicit setup -------------- |