From: drlellinger <39723641+drlellinger@users.noreply.github.com>
Date: Tue, 26 Nov 2019 11:48:46 +0000 (+0100)
Subject: Merge pull request #2 from drlellinger/AppUpdateURL-fix
X-Git-Tag: v1.11~1^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/bc7813c6ee0be8fda560cbfced583e63677ecaad?ds=sidebyside;hp=-c

Merge pull request #2 from drlellinger/AppUpdateURL-fix

Change AppUpdateURL setting
---

bc7813c6ee0be8fda560cbfced583e63677ecaad
diff --combined windows/firefox.admx
index d821643,8125530..430f28a
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -19,7 -19,6 +19,7 @@@
        <definition name="SUPPORTED_FF68" displayName="$(string.SUPPORTED_FF68)"/>
        <definition name="SUPPORTED_FF6801" displayName="$(string.SUPPORTED_FF6801)"/>
        <definition name="SUPPORTED_FF70" displayName="$(string.SUPPORTED_FF70)"/>
 +      <definition name="SUPPORTED_FF71" displayName="$(string.SUPPORTED_FF71)"/>
      </definitions>
    </supportedOn>
    <categories>
@@@ -141,16 -140,6 +141,16 @@@
          </boolean>
        </elements>
      </policy>
 +    <policy name="Authentication_Locked" class="Both" displayName="$(string.Authentication_Locked)" explainText="$(string.Authentication_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Authentication" valueName="Locked">
 +      <parentCategory ref="Authentication"/>
 +      <supportedOn ref="SUPPORTED_FF71"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
      <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_FF60"/>
@@@ -578,16 -567,6 +578,16 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
 +    <policy name="DisablePasswordReveal" class="Both" displayName="$(string.DisablePasswordReveal)" explainText="$(string.DisablePasswordReveal_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisablePasswordReveal">
 +      <parentCategory ref="firefox"/>
 +      <supportedOn ref="SUPPORTED_FF71"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
      <policy name="DisablePocket" class="Both" displayName="$(string.DisablePocket)" explainText="$(string.DisablePocket_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisablePocket">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_FF60"/>
@@@ -2525,7 -2504,7 +2525,7 @@@
          <list id="SearchEngines_Remove" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" valuePrefix=""/>
        </elements>
      </policy>
-     <policy name="AppUpdateURL" class="Both" displayName="$(string.AppUpdateURL)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.AppUpdateURL)" >
+     <policy name="AppUpdateURL" class="Machine" displayName="$(string.AppUpdateURL)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.AppUpdateURL)" >
        <parentCategory ref="firefox" />
        <supportedOn ref="SUPPORTED_FF62" />
        <elements >