Merge branch 'master' into SupportMenu

diff --cc README.md
index e60fbe91593d92b9b6194f405a4052736037955c,0143b5a1df67d8743e78f43aafd0ce6f69acec74..ddcd1b2ca1bf0984a50098a10195fcb97b9a1fa9
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -63,11 -73,12 +73,12 @@@ Policies can be specified using the Gro
  | **[`SearchEngines -> Remove`](#searchengines--remove)** | Hide built-in search engines.
  | **[`SearchEngines -> Add`](#searchengines--add)** | Add new search engines.
  | **[`SecurityDevices`](#securitydevices)** | Install PKCS #11 modules.
+ | **[`SearchSuggestEnabled`](#searchsuggestenabled)** | Enable search suggestions.
  | **[`SSLVersionMax`](#sslversionmax)** | Set and lock the maximum version of TLS.
  | **[`SSLVersionMin`](#sslversionmin)** | Set and lock the minimum version of TLS.
 +| **[`SupportMenu`](#supportmenu)** | Add a menuitem to the help menu for specifying support information.
  | **[`WebsiteFilter`](#websitefilter)** | Block websites from being visited.
  
 -
  ### AppUpdateURL
  
  Change the URL for application update.
@@@ -2217,45 -2677,6 +2677,45 @@@ Software\Policies\Mozilla\Firefox\SSLVe
    }
  }
  ```
- **Compatibility:** Firefox 68, Firefox ESR 68\
 +### SupportMenu
 +Add a menuitem to the help menu for specifying support information.
 +
++**Compatibility:** Firefox 68.0.1, Firefox ESR 68.0.1\
 +**CCK2 Equivalent:** helpMenu\
 +**Preferences Affected:** N/A
 +
 +#### Windows
 +```
 +Software\Policies\Mozilla\Firefox\SupportMenu\Title = "Support Menu"
 +Software\Policies\Mozilla\Firefox\SupportMenu\URL = "http://example.com/support"
 +Software\Policies\Mozilla\Firefox\SupportMenu\Title = "S"
 +```
 +#### macOS
 +```
 +<dict>
 +  <key>SupportMenu</key>
 +  <dict>
 +    <key>Title</key>
 +    <string>SupportMenu</string>
 +    <key>URL</key>
 +    <string>http://example.com/support</string>
 +    <key>AccessKey</key>
 +    <string>S</string>
 +  </dict>
 +</dict>
 +```
 +### JSON
 +```
 +{
 +  "policies": {
 +    "SupportMenu": {
 +      "Title": "Support Menu",
 +      "URL": "http://example.com/support",
 +      "AccessKey": "S"
 +    }
 +  }
 +}
 +```
  ### WebsiteFilter
  Block websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. The arrays are limited to 1000 entries each.
  

diff --cc mac/org.mozilla.firefox.plist
Simple merge

diff --cc windows/en-US/firefox.adml
index 15ff6aee320f3dbb2f0463ed200ca93cc47cae30,6e219915595c799e80a170c4424b8600eb12b4d8..25aa0a3cb31dd606a43ef2deed23a91f364d2319
--- 1/windows/en-US/firefox.adml
--- 2/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -659,20 -722,35 +726,49 @@@ If this policy is disabled or not confi
        <presentation id="SSLVersion">
          <dropdownList refId="SSLVersion"/>
        </presentation>
 +      <presentation id="SupportMenu">
 +        <text>Title:</text>
 +        <textBox refId="SupportMenuTitle">
 +          <label/>
 +        </textBox>
 +        <text>URL:</text>
 +        <textBox refId="SupportMenuURL">
 +          <label/>
 +        </textBox>
 +        <text>Access key:</text>
 +        <textBox refId="SupportMenuAccessKey">
 +          <label/>
 +        </textBox>
 +      </presentation>
+       <presentation id="Preferences_String">
+         <textBox refId="Preferences_String">
+           <label/>
+         </textBox>
+       </presentation>
+       <presentation id="Preferences_security_default_personal_cert">
+         <dropdownList refId="Preferences_security_default_personal_cert"/>
+       </presentation>
+       <presentation id="LocalFileLinks">
+         <listBox refId="LocalFileLinks"/>
+       </presentation>
+       <presentation id="SanitizeOnShutdown">
+         <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+         <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+         <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+         <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+         <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+         <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+         <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+         <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+       </presentation>
+       <presentation id="FirefoxHome">
+         <checkBox refId="FirefoxHome_Search">Search</checkBox>
+         <checkBox refId="FirefoxHome_TopSites">Top Sites</checkBox>
+         <checkBox refId="FirefoxHome_Highlights">Download History</checkBox>
+         <checkBox refId="FirefoxHome_Pocket">Recommended by Pocket</checkBox>
+         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
+         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
+       </presentation>
      </presentationTable>
    </resources>
  </policyDefinitionResources>

diff --cc windows/firefox.admx
index 0ad7e9dfc74bc61d6dd5b2e0aedcb88f1dad27f7,aa17af000d77a4602220214f48e21bf48ef8b22d..75ef4bbba4be1fa93ed8abe382844056f6bb7ce3
--- 1/windows/firefox.admx
--- 2/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -2324,15 -2510,244 +2510,253 @@@
          </enum>
        </elements>
      </policy>
 +    <policy name="SupportMenu" class="Both" displayName="$(string.SupportMenu)" explainText="$(string.SupportMenu_Explain)" key="Software\Policies\Mozilla\Firefox\SupportMenu" presentation="$(presentation.SupportMenu)" >
 +      <parentCategory ref="firefox" />
 +      <supportedOn ref="SUPPORTED_FF67" />
 +      <elements >
 +        <text id="SupportMenuTitle" valueName="Title" required="true" />
 +        <text id="SupportMenuURL" valueName="URL" required="true" />
 +        <text id="SupportMenuAccessKey" valueName="AccessKey" />
 +      </elements>
 +    </policy>
+     <policy name="app.update.auto" class="Both" displayName="$(string.app_update_auto)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="app.update.auto">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.cache.disk.enable" class="Both" displayName="$(string.browser_cache_disk_enable)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.cache.disk.enable">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.fixup.dns_first_for_single_words" class="Both" displayName="$(string.browser_fixup_dns_first_for_single_words)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.fixup.dns_first_for_single_words">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.search.update" class="Both" displayName="$(string.browser_search_update)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.search.update">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.tabs.warnOnClose" class="Both" displayName="$(string.browser_tabs_warnOnClose)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.tabs.warnOnClose">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.urlbar.suggest.bookmark" class="Both" displayName="$(string.browser_urlbar_suggest_bookmark)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.urlbar.suggest.bookmark">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.urlbar.suggest.history" class="Both" displayName="$(string.browser_urlbar_suggest_history)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.urlbar.suggest.history">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.urlbar.suggest.openpage" class="Both" displayName="$(string.browser_urlbar_suggest_openpage)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.urlbar.suggest.openpage">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="datareporting.policy.dataSubmissionPolicyBypassNotification" class="Both" displayName="$(string.datareporting_policy_dataSubmissionPolicyBypassNotification)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="datareporting.policy.dataSubmissionPolicyBypassNotification">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="dom.disable_window_flip" class="Both" displayName="$(string.dom_disable_window_flip)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="browser.dom.disable_window_flip">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="dom.disable_window_move_resize" class="Both" displayName="$(string.dom_disable_window_move_resize)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="dom.disable_window_move_resize">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="dom.event.contextmenu.enabled" class="Both" displayName="$(string.dom_event_contextmenu_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="dom.event.contextmenu.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="extensions.getAddons.showPane" class="Both" displayName="$(string.extensions_getAddons_showPane)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="extensions.getAddons.showPane">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="media.gmp-gmpopenh264.enabled" class="Both" displayName="$(string.media_gmp-gmpopenh264_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="media.gmp-gmpopenh264.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="media.gmp-widevinecdm.enabled" class="Both" displayName="$(string.media_gmp-widevinecdm_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="media.gmp-widevinecdm.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="network.dns.disableIPv6" class="Both" displayName="$(string.network_dns_disableIPv6)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="network.dns.disableIPv6">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="network.IDN_show_punycode" class="Both" displayName="$(string.network_IDN_show_punycode)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="network.IDN_show_punycode">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="places.history.enabled" class="Both" displayName="$(string.places_history_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="places.history.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="security.ssl.errorReporting.enabled" class="Both" displayName="$(string.security_ssl_errorReporting_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.ssl.errorReporting.enabled">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="ui.key.menuAccessKeyFocuses" class="Both" displayName="$(string.ui_key_menuAccessKeyFocuses)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="ui.key.menuAccessKeyFocuses">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="browser.cache.disk.parent_directory" class="Both" displayName="$(string.browser_cache_disk_parent_directory)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
+       <parentCategory ref="Preferences" />
+       <supportedOn ref="SUPPORTED_FF68" />
+       <elements >
+         <text id="Preferences_String" valueName="browser.cache.disk.parent_directory" required="true" />
+       </elements>
+     </policy>
+     <policy name="dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl" class="Both" displayName="$(string.dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
+       <parentCategory ref="Preferences" />
+       <supportedOn ref="SUPPORTED_FF68" />
+       <elements >
+         <text id="Preferences_String" valueName="dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl" required="true" />
+       </elements>
+     </policy>
+     <policy name="dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl" class="Both" displayName="$(string.dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
+       <parentCategory ref="Preferences" />
+       <supportedOn ref="SUPPORTED_FF68" />
+       <elements >
+         <text id="Preferences_String" valueName="dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl" required="true" />
+       </elements>
+     </policy>
+     <policy name="security.default_personal_cert" class="Both" displayName="$(string.security_default_personal_cert)" explainText="$(string.Preferences_Enum_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_security_default_personal_cert)" >
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF68"/>
+       <elements>
+         <enum id="Preferences_security_default_personal_cert" valueName="security.default_personal_cert">
+           <item displayName="$(string.Preferences_security_default_personal_cert_Ask_Every_Time)">
+             <value>
+               <string>Ask Every Time</string>
+             </value>
+           </item>
+           <item displayName="$(string.Preferences_security_default_personal_cert_Select_Automatically)">
+             <value>
+               <string>Select Automatically</string>
+             </value>
+           </item>
+         </enum>
+       </elements>
+     </policy>
    </policies>
  </policyDefinitions>
-