summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorPaweł Marczewski <pwmarcz@gmail.com>2016-11-05 12:31:37 +0100
committerTim Graham <timograham@gmail.com>2016-11-10 07:50:49 -0500
commit50f9e736fa701664c5659d0653aff75b7f4489b6 (patch)
treed19a19558e570cef0d6f24786214eb421a69f304 /docs/ref
parent373c6c409c310cb61e1e9c9aff4adba379ffd0b4 (diff)
Fixed #27438 -- Added the diffsettings --default option.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/django-admin.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 86b5e724fa..c35e728f26 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -223,7 +223,7 @@ Specifies the database onto which to open a shell. Defaults to ``default``.
.. django-admin:: diffsettings
Displays differences between the current settings file and Django's default
-settings.
+settings (or another settings file specified by :option:`--default`).
Settings that don't appear in the defaults are followed by ``"###"``. For
example, the default settings don't define :setting:`ROOT_URLCONF`, so
@@ -235,6 +235,13 @@ example, the default settings don't define :setting:`ROOT_URLCONF`, so
Displays all settings, even if they have Django's default value. Such settings
are prefixed by ``"###"``.
+.. django-admin-option:: --default MODULE
+
+.. versionadded:: 1.11
+
+The settings module to compare the current settings against. Leave empty to
+compare against Django's default settings.
+
``dumpdata``
------------