Merge branch 'master' into SupportMenu

diff --git a/README.md b/README.md
index 0143b5a1df67d8743e78f43aafd0ce6f69acec74..ddcd1b2ca1bf0984a50098a10195fcb97b9a1fa9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -76,9 +76,9 @@ Policies can be specified using the Group Policy templates on Windows (https://g
 | **[`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.
@@ -2677,6 +2677,45 @@ Software\Policies\Mozilla\Firefox\SSLVersionMin = "tls1" | "tls1.1" | "tls1.2" |
   }
 }
 ```
+### 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 --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 1c6a5900afc404be7dc593ce2ce2078ad172c29e..7d0bcad85f9a7b03f0c76332c9e2a5387d12073d 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -399,5 +399,14 @@
        <string>tls1.2</string>
        <key>SSLVersionMax</key>
        <string>tls1.3</string>
+       <key>SupportMenu</key>
+       <dict>
+               <key>Title</key>
+               <string>Click here for help</string>
+               <key>URL</key>
+               <string>http://example.edu/</string>
+               <key>AccessKey</key>
+               <string>C</string>
+       </dict>
 </dict>
 </plist>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6e219915595c799e80a170c4424b8600eb12b4d8..25aa0a3cb31dd606a43ef2deed23a91f364d2319 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -532,6 +532,10 @@ If this policy is disabled or not configured, Firefox defaults to a minimum of T
       <string id="SSLVersionMax_Explain">If this policy is enabled, Firefox will not use SSL/TLS versions greater than the value specified.
 
 If this policy is disabled or not configured, Firefox defaults to a maximum of TLS 1.3.</string>
+      <string id="SupportMenu">Support Menu</string>
+      <string id="SupportMenu_Explain">If this policy is enabled, a new menuitem is added to the help menu with support information.
+
+If this policy is disabled or not configured, no menuitem is added.</string>
       <string id="TLS1">TLS 1.0</string>
       <string id="TLS1_1">TLS 1.1</string>
       <string id="TLS1_2">TLS 1.2</string>
@@ -722,6 +726,20 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <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/>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index aa17af000d77a4602220214f48e21bf48ef8b22d..75ef4bbba4be1fa93ed8abe382844056f6bb7ce3 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2510,6 +2510,15 @@
         </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"/>