From 20a91cce04c72bc8c64a1c43b7398edac7b709cc Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 17 Mar 2013 20:48:30 +0100 Subject: Fixed #17037 -- Added a --all option to diffsettings. --- docs/ref/django-admin.txt | 7 +++++-- docs/releases/1.6.txt | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'docs') 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 -------------------------------------------- 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 `. +* The :djadmin:`diffsettings` comand gained a ``--all`` option. + Backwards incompatible changes in 1.6 ===================================== -- cgit v1.3