summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBruno Alla <alla.brunoo@gmail.com>2023-07-17 11:19:51 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-07-24 21:07:41 +0200
commit12ebd9a1ac8b1de34a2d4615fa830d132f6e56b9 (patch)
tree1e10287de55e77d5378527487d5f44cd0c50aad9 /docs
parent1f9d00ef9f6e6a76433b1239f19b6fd64a07b7ef (diff)
[4.2.x] Refs #34712 -- Doc'd that defining STORAGES overrides the default configuration.
Backport of 86561844ce66cda3e6a8c22d4ace4c2d1bc1f2e7 from main
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``