From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Thu, 25 Jul 2019 18:00:08 +0000 (-0500)
Subject: Merge branch 'master' into SupportMenu
X-Git-Tag: v1.8.1~3^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/c6855c16e88996a3f7ebd930973c4b68ecd31bfa?ds=sidebyside;hp=--cc
Merge branch 'master' into SupportMenu
---
c6855c16e88996a3f7ebd930973c4b68ecd31bfa
diff --cc README.md
index e60fbe9,0143b5a..ddcd1b2
--- a/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
}
}
```
+### SupportMenu
+Add a menuitem to the help menu for specifying support information.
+
- **Compatibility:** Firefox 68, Firefox ESR 68\
++**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
+```
+
+ SupportMenu
+
+ Title
+ SupportMenu
+ URL
+ http://example.com/support
+ AccessKey
+ S
+
+
+```
+### 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 windows/en-US/firefox.adml
index 15ff6ae,6e21991..25aa0a3
--- a/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
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cache
+ Cookies
+ Download History
+ Form & Search History
+ Browsing History
+ Active Logins
+ Site Preferences
+ Offline Website Data
+
+
+ Search
+ Top Sites
+ Download History
+ Recommended by Pocket
+ Snippets
+ Don't allow settings to be changed
+
diff --cc windows/firefox.admx
index 0ad7e9d,aa17af0..75ef4bb
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -2324,15 -2510,244 +2510,253 @@@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ Ask Every Time
+
+
+ -
+
+ Select Automatically
+
+
+
+
+
-