From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 16 Nov 2020 19:57:25 +0000 (-0600)
Subject: Merge branch 'master' into ManagedBookmarks
X-Git-Tag: v2.5~1^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/4ff712b2eeeb1a7bd1b418421fdcdcc26f147c0c?hp=a38d9286bab30dec315e27cfc131bec399e2b070

Merge branch 'master' into ManagedBookmarks
---

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 283f806..e2520ec 100644
--- 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 db6648b..fe8588e 100644
--- 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>