1
0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00

Fixed #23384 -- Allowed overriding part of a dictionary-type setting

This change is needed for upcoming changes where settings might be
grouped in a parent dictionary.
Thanks Tim Graham for the review.
This commit is contained in:
Claude Paroz
2014-08-29 14:54:08 +02:00
parent 05a8cef428
commit 66757fee7e
9 changed files with 123 additions and 5 deletions

View File

@@ -530,6 +530,9 @@ 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`.
.. _deprecated-features-1.8:
Features deprecated in 1.8