Remove deprecated items from more places

diff --git a/docs/index.md b/docs/index.md
index eee977c49a49adfd69aa13fae7e5685b5b5a2f98..37daa3d5336add49f403e25e9d0a00730aa5f385 100644 (file)
--- 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\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\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)
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Locked = 0x1 | 0x0
 ```
 #### Windows (Intune)


@@ -5920,22 +5917,6 @@ Value (string):
 ```
 OMA-URI:
 ```
 ```
 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):
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/E_SanitizeOnShutdown_History
 ```
 Value (string):


@@ -5960,14 +5941,6 @@ Value (string):
 ```
 OMA-URI:
 ```
 ```
 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):
 ./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/>
     <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>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>
     <key>Locked</key>
     <true/> | <false/>
   </dict>


@@ -6007,12 +5974,9 @@ Value (string):
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,

-      "Downloads": true | false,
-      "FormData": true | false,

       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,

-      "OfflineApps": true | false,

       "Locked": true | false
     }
   }
       "Locked": true | false
     }
   }

diff --git a/linux/policies.json b/linux/policies.json
index 2b6f031e19a4503e21091bb029eb9f87d5086136..129ae2f42a681b3ea00ec10f8e685536fb71abc7 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -312,12 +312,9 @@
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,

-      "Downloads": true | false,
-      "FormData": true | false,

       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,

-      "OfflineApps": true | false,

       "Locked": true | false
     },
     "SearchEngines": {
       "Locked": true | false
     },
     "SearchEngines": {

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index c3a39132e2f72d9a6af4c201b9568f2f93814578..3a10ebe25485c661d94648e5eb6ebf6aabfc0233 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -630,7 +630,20 @@
                <string>en-US</string>
        </array>
        <key>SanitizeOnShutdown</key>
                <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>
        <key>SearchBar</key>
        <string>separate</string>
        <key>SecurityDevices</key>