summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index b5c10d4084..db63c8ba94 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2690,6 +2690,11 @@ A ready-to-use instance of the storage backends can be retrieved from
:data:`django.core.files.storage.storages`. Use a key corresponding to the
backend definition in :setting:`STORAGES`.
+.. admonition:: Is my value merged with the default value?
+
+ Defining this setting overrides the default value and is *not* merged with
+ it.
+
.. setting:: TEMPLATES
``TEMPLATES``