From: Michael Kaply <consulting@kaply.com>
Date: Mon, 9 Apr 2018 15:25:48 +0000 (-0500)
Subject: CreateMasterPassword -> DisableMasterPasswordCreation
X-Git-Tag: 0.9~11^2~3
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/b6ec8586f5dd0fe21c54c63f450df1ffa016a912

CreateMasterPassword -> DisableMasterPasswordCreation
---

diff --git a/README.md b/README.md
index f73e478..e530e8f 100644
--- a/README.md
+++ b/README.md
@@ -93,12 +93,12 @@ This policy controls various settings related to cookies.
   }
 }
 ```
-### CreateMasterPassword
-This policy removes the master password functionality.
+### DisableMasterPasswordCreation
+This policy removes the master password functionality if set to true.
 ```
 {
   "policies": {
-    "CreateMasterPassword": false
+    "DisableMasterPasswordCreation": [true|false]
   }
 }
 ```
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6524d26..5575e19 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -40,8 +40,10 @@ If this policy is disabled or not configured, users can set images as their desk
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>
-      <string id="CreateMasterPassword">Create Master Password</string>
-      <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
+      <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
+      <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
+
+If this policy is disabled or not configured, users can create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
       <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index a18a28f..64dab3a 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -195,7 +195,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="CreateMasterPassword" class="Both" displayName="$(string.CreateMasterPassword)" explainText="$(string.CreateMasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CreateMasterPassword">
+    <policy name="DisableMasterPasswordCreation" class="Both" displayName="$(string.DisableMasterPasswordCreation)" explainText="$(string.DisableMasterPasswordCreation_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableMasterPasswordCreation">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <enabledValue>