From 2811108a264d8907189d4d0d48de4060bf6db414 Mon Sep 17 00:00:00 2001
From: anoadragon453 <anoadragon453@users.noreply.github.com>
Date: Tue, 7 Jun 2022 10:54:23 +0000
Subject: deploy: a47636c570c80928af7652d70073496f602511bc

---
 develop/usage/configuration/config_documentation.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'develop/usage/configuration/config_documentation.html')

diff --git a/develop/usage/configuration/config_documentation.html b/develop/usage/configuration/config_documentation.html
index cb15fe21ba..27463cf88b 100644
--- a/develop/usage/configuration/config_documentation.html
+++ b/develop/usage/configuration/config_documentation.html
@@ -1449,6 +1449,11 @@ otherwise downloaded by a local or remote user. If the media has never
 been accessed, the media's creation time is used instead. Both thumbnails
 and the original media will be removed. If either of these options are unset,
 then media of that type will not be purged.</p>
+<p>Local or cached remote media that has been
+<a href="../../admin_api/media_admin_api.html#quarantining-media-in-a-room">quarantined</a>
+will not be deleted. Similarly, local media that has been marked as
+<a href="../../admin_api/media_admin_api.html#protecting-media-from-being-quarantined">protected from quarantine</a>
+will not be deleted.</p>
 <p>Example configuration:</p>
 <pre><code class="language-yaml">media_retention:
     local_media_lifetime: 90d
-- 
cgit 1.5.1