From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 14 Feb 2022 15:18:09 +0000 (-0500)
Subject: Merge pull request #865 from maiki/patch-1
X-Git-Tag: v3.7~6
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/db1193752d8b91b0a9422c04c566502742877dd7?hp=98e26b484582f279c496204d8ebc43b38bcb75b5
Merge pull request #865 from maiki/patch-1
Alphabetize a couple of policies
---
diff --git a/README.md b/README.md
index b264068..1f4a748 100644
--- a/README.md
+++ b/README.md
@@ -1073,80 +1073,6 @@ Value (string):
}
}
```
-### DisableSetDesktopBackground
-Remove the "Set As Desktop Background..." menuitem when right clicking on an image.
-
-**Compatibility:** Firefox 60, Firefox ESR 60\
-**CCK2 Equivalent:** `removeSetDesktopBackground`\
-**Preferences Affected:** N/A
-
-#### Windows (GPO)
-```
-Software\Policies\Mozilla\Firefox\DisableSetDesktopBackground = 0x1 | 0x0
-```
-#### Windows (Intune)
-OMA-URI:
-```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableSetDesktopBackground
-```
-Value (string):
-```
- or
-```
-#### macOS
-```
-
- DisableSetDesktopBackground
- |
-
-```
-#### policies.json
-```
-{
- "policies": {
- "DisableSetDesktopBackground": true | false
- }
-}
-```
-### DisableMasterPasswordCreation
-Remove the master password functionality.
-
-If this value is true, it works the same as setting [`PrimaryPassword`](#primarypassword) to false and removes the primary password functionality.
-
-If both `DisableMasterPasswordCreation` and `PrimaryPassword` are used, `DisableMasterPasswordCreation` takes precedent.
-
-**Compatibility:** Firefox 60, Firefox ESR 60\
-**CCK2 Equivalent:** `noMasterPassword`\
-**Preferences Affected:** N/A
-
-#### Windows (GPO)
-```
-Software\Policies\Mozilla\Firefox\DisableMasterPasswordCreation = 0x1 | 0x0
-```
-#### Windows (Intune)
-OMA-URI:
-```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableMasterPasswordCreation
-```
-Value (string):
-```
- or
-```
-#### macOS
-```
-
- DisableMasterPasswordCreation
- |
-
-```
-#### policies.json
-```
-{
- "policies": {
- "DisableMasterPasswordCreation": true | false
- }
-}
-```
### DefaultDownloadDirectory
Set the default download directory.
@@ -1605,6 +1531,45 @@ Value (string):
}
}
```
+### DisableMasterPasswordCreation
+Remove the master password functionality.
+
+If this value is true, it works the same as setting [`PrimaryPassword`](#primarypassword) to false and removes the primary password functionality.
+
+If both `DisableMasterPasswordCreation` and `PrimaryPassword` are used, `DisableMasterPasswordCreation` takes precedent.
+
+**Compatibility:** Firefox 60, Firefox ESR 60\
+**CCK2 Equivalent:** `noMasterPassword`\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\DisableMasterPasswordCreation = 0x1 | 0x0
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableMasterPasswordCreation
+```
+Value (string):
+```
+ or
+```
+#### macOS
+```
+
+ DisableMasterPasswordCreation
+ |
+
+```
+#### policies.json
+```
+{
+ "policies": {
+ "DisableMasterPasswordCreation": true | false
+ }
+}
+```
### DisablePasswordReveal
Do not allow passwords to be shown in saved logins
@@ -1874,6 +1839,41 @@ Value (string):
}
}
```
+### DisableSetDesktopBackground
+Remove the "Set As Desktop Background..." menuitem when right clicking on an image.
+
+**Compatibility:** Firefox 60, Firefox ESR 60\
+**CCK2 Equivalent:** `removeSetDesktopBackground`\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\DisableSetDesktopBackground = 0x1 | 0x0
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableSetDesktopBackground
+```
+Value (string):
+```
+ or
+```
+#### macOS
+```
+
+ DisableSetDesktopBackground
+ |
+
+```
+#### policies.json
+```
+{
+ "policies": {
+ "DisableSetDesktopBackground": true | false
+ }
+}
+```
### DisableSystemAddonUpdate
Prevent system add-ons from being installed or update.