Merge branch 'master' into SanitizeOnShutdown_Updates

diff --combined windows/en-US/firefox.adml
index afcdc2c157cb77b7372a849a64a2fa861677d12d,1fcae1ab3a370b235dc1d68021a3aa38c137dc31..65231b168c4398651f08bb6a7962402268da342c
--- 1/windows/en-US/firefox.adml
--- 2/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="utf-8"?>
- <policyDefinitionResources revision="1.12" schemaVersion="1.0" >
+ <policyDefinitionResources revision="1.13" schemaVersion="1.0" >
    <displayName/>
    <description/>
    <resources >
@@@ -15,10 -15,12 +15,12 @@@
        <string id="SUPPORTED_FF68">Firefox 68 or later, Firefox 68 ESR or later</string>
        <string id="SUPPORTED_FF6801">Firefox 68.0.1 or later, Firefox 68.0.1 ESR or later</string>
        <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
+       <string id="SUPPORTED_FF68ESR">Firefox 68.5 ESR or later</string>
        <string id="SUPPORTED_FF69">Firefox 69 or later, Firefox 68.1 ESR or later</string>
        <string id="SUPPORTED_FF70">Firefox 70 or later, Firefox 68.2 ESR or later</string>
        <string id="SUPPORTED_FF71">Firefox 71 or later, Firefox 68.3 ESR or later</string>
        <string id="SUPPORTED_FF72">Firefox 72 or later, Firefox 68.4 ESR or later</string>
+       <string id="SUPPORTED_FF73">Firefox 73 or later, Firefox 68.5 ESR or later</string>
        <string id="firefox">Firefox</string>
        <string id="Permissions_group">Permissions</string>
        <string id="Camera_group">Camera</string>
@@@ -204,10 -206,18 +206,18 @@@ Mozilla recommends that you do not disa
        <string id="DisplayBookmarksToolbar_Explain">If this policy is enabled, the bookmarks toolbar is displayed by default. The user can still hide it.
  
  If this policy is disabled or not configured, the bookmarks toolbar is not displayed by default.</string>
-       <string id="DisplayMenuBar">Display Menu Bar</string>
+       <string id="DisplayMenuBar">Display Menu Bar (Deprecated)</string>
        <string id="DisplayMenuBar_Explain">If this policy is enabled, the menu bar is displayed by default. The user can still hide it.
  
  If this policy is disabled or not configured, the menu bar is not displayed by default.</string>
+       <string id="DisplayMenuBar_Enum">Display Menu Bar</string>
+       <string id="DisplayMenuBar_Enum_Explain">If this policy is enabled, you can choose whether or not the menu bar is displayed and whether or not the user can show and hide the menu bar.
+ 
+ If this policy is disabled or not configured, the menu bar is not displayed by default.</string>
+       <string id="DisplayMenuBar_Always">Always</string>
+       <string id="DisplayMenuBar_Never">Never</string>
+       <string id="DisplayMenuBar_Default_On">On by default</string>
+       <string id="DisplayMenuBar_Default_Off">Off by default</string>
        <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>
        <string id="DontCheckDefaultBrowser_Explain">If this policy is enabled, Firefox does not check to see if it is the default browser at startup.
  
@@@ -401,24 -411,6 +411,24 @@@ If this policy is disabled or not confi
        <string id="SanitizeOnShutdown_Explain">If this policy is enabled, you can choose data to be cleared when Firefox is closed.
  
  If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
 +      <string id="SanitizeOnShutdown_group">Clear data when browser is closed</string>
 +
 +      <string id="SanitizeOnShutdown_Cache">Cache</string>
 +      <string id="SanitizeOnShutdown_Cache_Explain">Cache</string>
 +      <string id="SanitizeOnShutdown_Cookies">Cookies</string>
 +      <string id="SanitizeOnShutdown_Cookies_Explain">Cookies</string>
 +      <string id="SanitizeOnShutdown_Downloads">Download History</string>
 +      <string id="SanitizeOnShutdown_Downloads_Explain">Download History</string>
 +      <string id="SanitizeOnShutdown_FormData">Form &amp; Search History</string>
 +      <string id="SanitizeOnShutdown_FormData_Explain">Form &amp; Search History</string>
 +      <string id="SanitizeOnShutdown_History">Browsing History</string>
 +      <string id="SanitizeOnShutdown_History_Explain">Browsing History</string>
 +      <string id="SanitizeOnShutdown_Sessions">Active Logins</string>
 +      <string id="SanitizeOnShutdown_Sessions_Explain">Active Logins</string>
 +      <string id="SanitizeOnShutdown_SiteSettings">Site Preferences</string>
 +      <string id="SanitizeOnShutdown_SiteSettings_Explain">Site Preferences</string>
 +      <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data</string>
 +      <string id="SanitizeOnShutdown_OfflineApps_Explain">Offline Website Data</string>
        <string id="WebsiteFilter_Block">Blocked websites</string>
        <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
  
@@@ -641,6 -633,8 +651,8 @@@ https://github.com/mozilla/policy-templ
        <string id="dom_event_contextmenu_enabled">dom.event.contextmenu.enabled</string>
        <string id="dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl">dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl</string>
        <string id="dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl">dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl</string>
+       <string id="dom_xmldocument_load_enabled">dom.xmldocument.load.enabled</string>
+       <string id="dom_xmldocument_async_enabled">dom.xmldocument.async.enabled</string>
        <string id="extensions_blocklist_enabled">extensions.blocklist.enabled</string>
        <string id="geo_enabled">geo.enabled</string>
        <string id="extensions_getAddons_showPane">extensions.getAddons.showPane</string>
@@@ -708,6 -702,8 +720,8 @@@
          <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
          <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>
          <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>
+         <text>Exceptions:</text>
+         <listBox refId="TrackingProtection_Exceptions"/>
        </presentation>
        <presentation id="OverridePage">
          <textBox refId="OverridePage">
@@@ -875,6 -871,9 +889,9 @@@
        <presentation id="ExtensionSettings">
          <multiTextBox refId="ExtensionSettings"/>
        </presentation>
+       <presentation id="DisplayMenuBar">
+         <dropdownList refId="DisplayMenuBar"/>
+       </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>

diff --combined windows/firefox.admx
index a4936c2abac45213ddcb4821dc08f334dd9b46d5,6867ab39cb60124f4f8cc2e22a66f538e40a3068..5d460f611875ff92b7971a05488316a43c4e3f2d
--- 1/windows/firefox.admx
--- 2/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -1,10 -1,10 +1,10 @@@
  <?xml version="1.0" encoding="utf-8"?>
- <policyDefinitions revision="1.12" schemaVersion="1.0">
+ <policyDefinitions revision="1.13" schemaVersion="1.0">
    <policyNamespaces>
      <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
      <using prefix="Mozilla" namespace="Mozilla.Policies"/>
    </policyNamespaces>
-   <resources minRequiredRevision="1.12"/>
+   <resources minRequiredRevision="1.13"/>
    <supportedOn>
      <definitions>
        <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@@ -21,6 -21,8 +21,8 @@@
        <definition name="SUPPORTED_FF70" displayName="$(string.SUPPORTED_FF70)"/>
        <definition name="SUPPORTED_FF71" displayName="$(string.SUPPORTED_FF71)"/>
        <definition name="SUPPORTED_FF72" displayName="$(string.SUPPORTED_FF72)"/>
+       <definition name="SUPPORTED_FF73" displayName="$(string.SUPPORTED_FF73)"/>
+       <definition name="SUPPORTED_FF68ESR" displayName="$(string.SUPPORTED_FF68ESR)"/>
      </definitions>
    </supportedOn>
    <categories>
@@@ -75,9 -77,6 +77,9 @@@
      <category displayName="$(string.Preferences_group)" name="Preferences">
        <parentCategory ref="firefox"/>
      </category>
 +    <category displayName="$(string.SanitizeOnShutdown_group)" name="SanitizeOnShutdown">
 +      <parentCategory ref="firefox"/>
 +    </category>
    </categories>
    <policies>
      <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)">
@@@ -692,6 -691,34 +694,34 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="DisplayMenuBar_Enum" class="Both" displayName="$(string.DisplayMenuBar_Enum)" explainText="$(string.DisplayMenuBar_Enum_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.DisplayMenuBar)">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_FF73"/>
+         <elements>
+         <enum id="DisplayMenuBar" valueName="DisplayMenuBar">
+           <item displayName="$(string.DisplayMenuBar_Always)">
+             <value>
+               <string>always</string>
+             </value>
+           </item>
+           <item displayName="$(string.DisplayMenuBar_Never)">
+             <value>
+               <string>never</string>
+             </value>
+           </item>
+           <item displayName="$(string.DisplayMenuBar_Default_On)">
+             <value>
+               <string>default-on</string>
+             </value>
+           </item>
+           <item displayName="$(string.DisplayMenuBar_Default_Off)">
+             <value>
+               <string>default-off</string>
+             </value>
+           </item>
+         </enum>
+       </elements>
+     </policy>
      <policy name="Extensions_Install" class="Both" displayName="$(string.Extensions_Install)"  key="Software\Policies\Mozilla\Firefox\Extensions\Install" explainText="$(string.Extensions_Install_Explain)" presentation="$(presentation.Extensions)">
        <parentCategory ref="Extensions"/>
        <supportedOn ref="SUPPORTED_FF60"/>
@@@ -2362,6 -2389,7 +2392,7 @@@
              <decimal value="0"/>
            </falseValue>
          </boolean>
+         <list id="TrackingProtection_Exceptions" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions" valuePrefix=""/>
        </elements>
      </policy>
      <!-- Alphabetization is based on name, so had to add B -->
@@@ -2847,6 -2875,26 +2878,26 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="dom_xmldocument_load_enabled" class="Both" displayName="$(string.dom_xmldocument_load_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="dom.xmldocument.load.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68ESR"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="dom_xmldocument_async_enabled" class="Both" displayName="$(string.dom_xmldocument_async_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="dom.xmldocument.async.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68ESR"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="extensions_blocklist_enabled" class="Both" displayName="$(string.extensions_blocklist_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="extensions.blocklist.enabled">
        <parentCategory ref="Preferences"/>
        <supportedOn ref="SUPPORTED_FF70"/>
@@@ -3084,85 -3132,5 +3135,85 @@@
          <text id="Preferences_String" valueName="widget.content.gtk-theme-override" required="true" />
        </elements>
      </policy>
 +    <policy name="SanitizeOnShutdown_Cache" class="Both" displayName="$(string.SanitizeOnShutdown_Cache)" explainText="$(string.SanitizeOnShutdown_Cache_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Cache">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_Cookies" class="Both" displayName="$(string.SanitizeOnShutdown_Cookies)" explainText="$(string.SanitizeOnShutdown_Cookies_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Cookies">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_Downloads" class="Both" displayName="$(string.SanitizeOnShutdown_Downloads)" explainText="$(string.SanitizeOnShutdown_Downloads_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Downloads">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_FormData" class="Both" displayName="$(string.SanitizeOnShutdown_FormData)" explainText="$(string.SanitizeOnShutdown_FormData_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="FormData">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_History" class="Both" displayName="$(string.SanitizeOnShutdown_History)" explainText="$(string.SanitizeOnShutdown_History_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="History">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_Sessions" class="Both" displayName="$(string.SanitizeOnShutdown_Sessions)" explainText="$(string.SanitizeOnShutdown_Sessions_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Sessions">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_SiteSettings" class="Both" displayName="$(string.SanitizeOnShutdown_SiteSettings)" explainText="$(string.SanitizeOnShutdown_SiteSettings_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SiteSettings">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
 +    <policy name="SanitizeOnShutdown_OfflineApps" class="Both" displayName="$(string.SanitizeOnShutdown_OfflineApps)" explainText="$(string.SanitizeOnShutdown_OfflineApps_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="OfflineApps">
 +      <parentCategory ref="SanitizeOnShutdown"/>
 +      <supportedOn ref="SUPPORTED_FF68"/>
 +      <enabledValue>
 +        <decimal value="1"/>
 +      </enabledValue>
 +      <disabledValue>
 +        <decimal value="0"/>
 +      </disabledValue>
 +    </policy>
    </policies>
  </policyDefinitions>