diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 9 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 3 |
2 files changed, 11 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`` ------------ diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index bbe1d63028..a612cb0e12 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -281,6 +281,9 @@ Management Commands * The new :option:`loaddata --exclude` option allows excluding models and apps while loading data from fixtures. +* The new :option:`diffsettings --default` option allows specifying a settings + module other than Django's default settings to compare against. + Migrations ~~~~~~~~~~ |