summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-04-25 17:39:49 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-04-25 17:40:33 +0200
commit788fce4c917eee27b10f38f7eb0b75cd2af3ec43 (patch)
tree052b6ab00be9ccd230c2adcfac6a600a9b95ecfd
parentc050ce7de2091f580bf85ab367d9c7f5cb26f44c (diff)
[1.7.x] Fixed a confusing heading in applications docs.
Refs #22422. Backport of 0315f01 from master
-rw-r--r--docs/ref/applications.txt10
-rw-r--r--docs/releases/1.7.txt2
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt
index 04083de2b9..3137073fa0 100644
--- a/docs/ref/applications.txt
+++ b/docs/ref/applications.txt
@@ -307,10 +307,10 @@ Application registry
exists. Raises :exc:`~exceptions.ValueError` when called with a single
argument that doesn't contain exactly one dot.
-.. _application-loading-process:
+.. _applications-troubleshooting:
-Application loading process
-===========================
+Troubleshooting
+===============
Django loads application configurations and models as soon as it starts. Here
are some common problems you may encounter:
@@ -343,8 +343,8 @@ are some common problems you may encounter:
results. The code will be executed when you first need its results. This
concept is known as "lazy evaluation".
-* ``django.contrib.admin`` will now automatically perform autodiscovery of
- ``admin`` modules in installed applications. To prevent it, change your
+* ``django.contrib.admin`` automatically performs autodiscovery of ``admin``
+ modules in installed applications. To prevent it, change your
:setting:`INSTALLED_APPS` to contain
``'django.contrib.admin.apps.SimpleAdminConfig'`` instead of
``'django.contrib.admin'``.
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index e242d18ae9..c1d0fa5951 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -877,7 +877,7 @@ Start-up sequence
Django 1.7 loads application configurations and models as soon as it starts.
While this behavior is more straightforward and is believed to be more robust,
-regressions cannot be ruled out. See :ref:`application-loading-process` for
+regressions cannot be ruled out. See :ref:`applications-troubleshooting` for
solutions to some problems you may encounter.
Standalone scripts