From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 6 Apr 2020 20:31:42 +0000 (-0500)
Subject: Merge branch 'master' into DNSOverHTTPS_ExcludedDomains
X-Git-Tag: v1.15~9^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/1a0722e4ce84218f68ad588386c5f0c77e4cb657?hp=--cc

Merge branch 'master' into DNSOverHTTPS_ExcludedDomains
---

1a0722e4ce84218f68ad588386c5f0c77e4cb657
diff --cc windows/firefox.admx
index 99439d8,36948d5..8e9567a
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -87,11 -91,21 +91,24 @@@
      <category displayName="$(string.TrackingProtection_group)" name="TrackingProtection">
        <parentCategory ref="firefox"/>
      </category>
 +    <category displayName="$(string.DNSOverHTTPS_group)" name="DNSOverHTTPS">
 +      <parentCategory ref="firefox"/>
 +    </category>
+     <category displayName="$(string.UserMessaging_group)" name="UserMessaging">
+       <parentCategory ref="firefox"/>
+     </category>
    </categories>
    <policies>
+     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_FF75"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
        <parentCategory ref="Authentication"/>
        <supportedOn ref="SUPPORTED_FF60"/>