Merge branch 'master' into SupportMenu

diff --git a/README.md b/README.md
index f62e6e95b01c7d8076af2aafba64463eec7838b1..9316b24704449838d828a80a33fa00ad12b4594c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2257,3 +2257,16 @@ Software\Policies\Mozilla\Firefox\WebsiteFilters\Exceptions\1 = "http://example.
   }
 }
 ```
+### SupportMenu
+This policy adds a menuitem to the help menu for specifying support information.
+```
+{
+  "policies": {
+    "SupportMenu": {
+      "Title": "Click here for help", /* Title of the menu */
+      "URL": "http://example.edu/", /* Destination URL */
+      "AccessKey": "C" /* Shortcut key */
+    }
+  }
+}
+```

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 699245d3b9bd70cae8beff5ab4bb6cb4583e52ac..8405a891734573c507b6a1b0b037aaa72bd2543d 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -345,5 +345,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 3f6572f6a875593474613dfda10d454d805d9e6e..15ff6aee320f3dbb2f0463ed200ca93cc47cae30 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -497,6 +497,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>
@@ -655,6 +659,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>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5a8dca51181efb46fec2286ed189eaf4f65a5c3d..0ad7e9dfc74bc61d6dd5b2e0aedcb88f1dad27f7 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2324,6 +2324,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>
   </policies>
 </policyDefinitions>