diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.8.txt | 3 | ||||
| -rw-r--r-- | docs/topics/settings.txt | 26 |
2 files changed, 0 insertions, 29 deletions
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index f38d0990b2..209e967865 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -533,9 +533,6 @@ Miscellaneous widget to allow more customization. The undocumented ``url_markup_template`` attribute was removed in favor of ``template_with_initial``. -* When a dictionary setting is overridden in user settings, both dictionaries - are merged by default. See :ref:`dictionary-settings`. - * For consistency with other major vendors, the ``en_GB`` locale now has Monday as the first day of the week. diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt index cc9cc21652..2024d88a0f 100644 --- a/docs/topics/settings.txt +++ b/docs/topics/settings.txt @@ -110,32 +110,6 @@ between the current settings file and Django's default settings. For more, see the :djadmin:`diffsettings` documentation. -.. _dictionary-settings: - -Overriding dictionary settings ------------------------------- - -.. versionchanged:: 1.8 - -When defining a dictionary-type setting which has a non-empty value (see -:setting:`CACHES` for example), you do not have to redefine all its keys. You -can just define the keys differing from the default, and Django will simply -merge your setting value with the default value. For example, if you define -:setting:`CACHES` so:: - - CACHES = { - 'special': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '127.0.0.1:11211', - } - } - -then ``CACHES['default']`` which is set by default in Django's global settings -will still be defined, as well as the new ``'special'`` cache backend. - -If you want your setting to completely override the default value, you can add -a ``_clear_defaults`` key with a ``True`` value to the dictionary. - Using settings in Python code ============================= |