From 9b8192ce5101b622dbbae61f5ce784cd3e144a4d Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Tue, 24 Dec 2013 16:28:31 +0100 Subject: Updated a few doc paragraphs following the app-loading refactor. --- docs/ref/settings.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'docs/ref') 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 -`. - -.. admonition:: App names 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. +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 `. + +.. admonition:: Application labels must be unique + + 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 -- cgit v1.3