From 95b4b38c11dc10b1f308fa97aeaa8d25ec8551bb Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 1 Oct 2024 15:26:45 -0400
Subject: [PATCH] Remove deprecated items from more places

---
 docs/index.md                 | 36 -----------------------------------
 linux/policies.json           |  3 ---
 mac/org.mozilla.firefox.plist | 15 ++++++++++++++-
 3 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index eee977c..37daa3d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -5893,12 +5893,9 @@ Note: Starting with Firefox 128, History clears FormData and Downloads as well.
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cache = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cookies = 0x1 | 0x0
-Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Downloads = 0x1 | 0x0
-Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\FormData = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\History = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Sessions = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\SiteSettings = 0x1 | 0x0
-Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Locked = 0x1 | 0x0
 ```
 #### Windows (Intune)
@@ -5920,22 +5917,6 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/C_SanitizeOnShutdown_Downloads
-```
-Value (string):
-```
-<enabled/> or <disabled/>
-```
-OMA-URI:
-```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/D_SanitizeOnShutdown_FormData
-```
-Value (string):
-```
-<enabled/> or <disabled/>
-```
-OMA-URI:
-```
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/E_SanitizeOnShutdown_History
 ```
 Value (string):
@@ -5960,14 +5941,6 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/H_SanitizeOnShutdown_OfflineApps
-```
-Value (string):
-```
-<enabled/> or <disabled/>
-```
-OMA-URI:
-```
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/I_SanitizeOnShutdown_Locked
 ```
 Value (string):
@@ -5983,18 +5956,12 @@ Value (string):
     <true/> | <false/>
     <key>Cookies</key>
     <true/> | <false/>
-    <key>Downloads</key>
-    <true/> | <false/>
-    <key>FormData</key>
-    <true/> | <false/>
     <key>History</key>
     <true/> | <false/>
     <key>Sessions</key>
     <true/> | <false/>
     <key>SiteSettings</key>
     <true/> | <false/>
-    <key>OfflineApps</key>
-    <true/> | <false/>
     <key>Locked</key>
     <true/> | <false/>
   </dict>
@@ -6007,12 +5974,9 @@ Value (string):
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
-      "Downloads": true | false,
-      "FormData": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
-      "OfflineApps": true | false,
       "Locked": true | false
     }
   }
diff --git a/linux/policies.json b/linux/policies.json
index 2b6f031..129ae2f 100644
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -312,12 +312,9 @@
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
-      "Downloads": true | false,
-      "FormData": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
-      "OfflineApps": true | false,
       "Locked": true | false
     },
     "SearchEngines": {
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index c3a3913..3a10ebe 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -630,7 +630,20 @@
 		<string>en-US</string>
 	</array>
 	<key>SanitizeOnShutdown</key>
-	<true/>
+	<dict>
+		<key>Cache</key>
+		<true/>
+		<key>Cookies</key>
+		<true/>
+		<key>History</key>
+		<true/>
+		<key>Sessions</key>
+		<true/>
+		<key>SiteSettings</key>
+		<true/>
+		<key>Locked</key>
+		<true/>
+	</dict>
 	<key>SearchBar</key>
 	<string>separate</string>
 	<key>SecurityDevices</key>
-- 
2.34.1