test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed a confusing heading in applications docs. 

Refs #22422.

Backport of 0315f01 from master
This commit is contained in:
Aymeric Augustin 2014-04-25 17:39:49 +02:00
parent c050ce7de2
commit 788fce4c91
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/ref/applications.txt
View File

@ -307,10 +307,10 @@ Application registry
exists. Raises :exc:`~exceptions.ValueError` when called with a single exists. Raises :exc:`~exceptions.ValueError` when called with a single
argument that doesn't contain exactly one dot. 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 Django loads application configurations and models as soon as it starts. Here
are some common problems you may encounter: 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 results. The code will be executed when you first need its results. This
concept is known as "lazy evaluation". concept is known as "lazy evaluation".
* ``django.contrib.admin`` will now automatically perform autodiscovery of * ``django.contrib.admin`` automatically performs autodiscovery of ``admin``
``admin`` modules in installed applications. To prevent it, change your modules in installed applications. To prevent it, change your
:setting:`INSTALLED_APPS` to contain :setting:`INSTALLED_APPS` to contain
``'django.contrib.admin.apps.SimpleAdminConfig'`` instead of ``'django.contrib.admin.apps.SimpleAdminConfig'`` instead of
``'django.contrib.admin'``. ``'django.contrib.admin'``.

2
docs/releases/1.7.txt
View File

@ -877,7 +877,7 @@ Start-up sequence
Django 1.7 loads application configurations and models as soon as it starts. 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, 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. solutions to some problems you may encounter.
Standalone scripts Standalone scripts