Merge branch 'master' into ManagedBookmarks

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 283f80654a111282ecf88094d0135cb4470f390c..e2520ecddb857313a60932ff272f0023144e83d9 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -819,6 +819,12 @@ If this policy is enabled, you can use JSON to configure preferences.
 If this policy is disabled or not configured, preferences are not modified.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="ManagedBookmarks">Managed Bookmarks</string>
+      <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
+
+If this policy is disabled or not configured, managed bookmarks are not added.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#managedbookmarks.</string>
       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
 
 For a description of the preference, see:

diff --git a/windows/firefox.admx b/windows/firefox.admx
index db6648bc50744c68e782c47ca043fb0faf8a59a4..fe8588e8f5e9855b1741f7056e793667a8237ce0 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3700,5 +3700,12 @@
         <multiText id="JSON" valueName="Preferences"  maxLength="2048"/>
       </elements>
     </policy>
+    <policy name="ManagedBookmarks" class="Both" displayName="$(string.ManagedBookmarks)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)"  presentation="$(presentation.JSON)">">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF83"/>
+      <elements>
+        <multiText id="JSON" valueName="ManagedBookmarks"  maxLength="2048"/>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>