summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-11-11 22:56:18 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-11-11 22:56:18 +0000
commit1873c95b3134688e9e724caa6d3ce664160dd47c (patch)
treefbd2a13c3263cc79af98c75a331ece77077ab3a7
parentbf33198f437ec0c7d6484be78bc884503e2d2793 (diff)
downloaddjango-1873c95b3134688e9e724caa6d3ce664160dd47c.tar.gz
Added INSTALLED_APPS to global_settings. It's an empty tuple by default.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py3
-rw-r--r--docs/settings.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 03609ffee6..882f1154ad 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -78,6 +78,9 @@ DATABASE_PORT = '' # Set to empty string for default. Not used with
# Host for sending e-mail.
EMAIL_HOST = 'localhost'
+# List of strings representing installed apps.
+INSTALLED_APPS = ()
+
# List of locations of the template source files, in search order.
TEMPLATE_DIRS = ()
diff --git a/docs/settings.txt b/docs/settings.txt
index b5287b26a2..4d4b7ca85d 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -361,7 +361,7 @@ the 404 e-mailer. See ``SEND_BROKEN_LINK_EMAILS`` and ``IGNORABLE_404_ENDS``.
INSTALLED_APPS
--------------
-Default: Not defined
+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