summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-03-17 20:48:30 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-03-18 00:03:58 +0100
commit20a91cce04c72bc8c64a1c43b7398edac7b709cc (patch)
treed505ae2def12275bbec1610bd1c50850467abf72 /docs/ref/django-admin.txt
parent68905695b897e62b0c18d9edd87171a0eae4e67e (diff)
Fixed #17037 -- Added a --all option to diffsettings.
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index d31e30a14d..ac257db9f5 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -168,8 +168,11 @@ example, the default settings don't define :setting:`ROOT_URLCONF`, so
:setting:`ROOT_URLCONF` is followed by ``"###"`` in the output of
``diffsettings``.
-Note that Django's default settings live in ``django/conf/global_settings.py``,
-if you're ever curious to see the full list of defaults.
+The :djadminopt:`--all` option may be provided to display all settings, even
+if they have Django's default value. Such settings are prefixed by ``"###"``.
+
+.. versionadded:: 1.6
+ The :djadminopt:`--all` option was added.
dumpdata <appname appname appname.Model ...>
--------------------------------------------