diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-03-17 20:48:30 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-03-18 00:03:58 +0100 |
| commit | 20a91cce04c72bc8c64a1c43b7398edac7b709cc (patch) | |
| tree | d505ae2def12275bbec1610bd1c50850467abf72 /docs | |
| parent | 68905695b897e62b0c18d9edd87171a0eae4e67e (diff) | |
Fixed #17037 -- Added a --all option to diffsettings.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 7 | ||||
| -rw-r--r-- | docs/releases/1.6.txt | 2 |
2 files changed, 7 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 ...> -------------------------------------------- diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index 2ab44c0744..c52f6ee3d9 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -157,6 +157,8 @@ Minor features * The documentation contains a :doc:`deployment checklist </howto/deployment/checklist>`. +* The :djadmin:`diffsettings` comand gained a ``--all`` option. + Backwards incompatible changes in 1.6 ===================================== |