Merge branch 'master' into ManagedBookmarks

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 2616385e678b576711b9304094dcc0c150c5d27c..fe8588e8f5e9855b1741f7056e793667a8237ce0 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitions revision="2.3" schemaVersion="1.0">
+<policyDefinitions revision="2.4" schemaVersion="1.0">

   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>

-  <resources minRequiredRevision="2.3"/>
+  <resources minRequiredRevision="2.4"/>

   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>


@@ -3700,5 +3700,12 @@
         <multiText id="JSON" valueName="Preferences"  maxLength="2048"/>
       </elements>
     </policy>
         <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>
   </policies>
 </policyDefinitions>