summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 16:28:31 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 17:20:11 +0100
commit9b8192ce5101b622dbbae61f5ce784cd3e144a4d (patch)
treeb561542c9e074a2212cbcc8790a8b73b7f780b33 /docs/ref
parentf326720a7363f305a6767d71fc3a8db2dcb05c0e (diff)
Updated a few doc paragraphs following the app-loading refactor.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt19
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 3e625ace85..fbd06976cc 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1285,18 +1285,17 @@ INSTALLED_APPS
Default: ``()`` (Empty tuple)
-A tuple of strings designating all applications that are enabled in this Django
-installation. Each string should be a full Python path to a Python package that
-contains a Django application, as created by :djadmin:`django-admin.py startapp
-<startapp>`.
+A tuple of strings designating all applications that are enabled in this
+Django installation. Each string should be a full Python path to an
+application configuration class or to a Python package containing a
+application. :ref:` Learn more about applications </ref/applications>`.
-.. admonition:: App names must be unique
+.. admonition:: Application labels must be unique
- The application names (that is, the final dotted part of the
- path to the module containing ``models.py``) defined in
- :setting:`INSTALLED_APPS` *must* be unique. For example, you can't
- include both ``django.contrib.auth`` and ``myproject.auth`` in
- INSTALLED_APPS.
+ Application labels (that is, the final part of the dotted path to
+ application packages) *must* be unique in :setting:`INSTALLED_APPS`.
+ For example, you can't include both ``django.contrib.auth`` and
+ ``myproject.auth``.
.. setting:: INTERNAL_IPS