From 12ebd9a1ac8b1de34a2d4615fa830d132f6e56b9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 17 Jul 2023 11:19:51 +0100 Subject: [PATCH] [4.2.x] Refs #34712 -- Doc'd that defining STORAGES overrides the default configuration. Backport of 86561844ce66cda3e6a8c22d4ace4c2d1bc1f2e7 from main --- docs/ref/settings.txt | 5 +++++ 1 file changed, 5 insertions(+) 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``