From b719d54a86ff9808740d626b5a8c34c41ad57253 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 29 Jun 2023 11:53:04 -0400 Subject: [PATCH] Add UserMessaging->Locked to documentation --- README.md | 9 ++++++++- docs/index.md | 9 ++++++++- linux/policies.json | 3 ++- mac/org.mozilla.firefox.plist | 4 ++++ windows/de-DE/firefox.adml | 4 ++++ windows/en-US/firefox.adml | 4 ++++ windows/es-ES/firefox.adml | 4 ++++ windows/firefox.admx | 10 ++++++++++ windows/fr-FR/firefox.adml | 4 ++++ windows/it-IT/firefox.adml | 4 ++++ windows/ru-RU/firefox.adml | 4 ++++ windows/zh-CN/firefox.adml | 4 ++++ windows/zh-TW/firefox.adml | 4 ++++ 13 files changed, 64 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 30f9a4b..55b4877 100644 --- a/README.md +++ b/README.md @@ -6141,6 +6141,8 @@ Prevent Firefox from messaging the user in certain situations. `MoreFromMozilla` If false, don't show the "More from Mozilla" section in Preferences. (Firefox 98) +`Locked` prevents the user from changing user messaging preferences. + **Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** `browser.messaging-system.whatsNewPanel.enabled`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla` @@ -6153,6 +6155,7 @@ Software\Policies\Mozilla\Firefox\UserMessaging\FeatureRecommendations = 0x1 | 0 Software\Policies\Mozilla\Firefox\UserMessaging\UrlbarInterventions = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\SkipOnboarding = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\MoreFromMozilla = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\UserMessaging\Locked = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: @@ -6163,6 +6166,7 @@ OMA-URI: ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_UrlbarInterventions ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_SkipOnboarding ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_MoreFromMozilla +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_Locked ``` Value (string): ``` @@ -6185,6 +6189,8 @@ Value (string): | MoreFromMozilla | + Locked + | ``` @@ -6198,7 +6204,8 @@ Value (string): "FeatureRecommendations": true | false, "UrlbarInterventions": true | false, "SkipOnboarding": true | false, - "MoreFromMozilla": true | false + "MoreFromMozilla": true | false, + "Locked": true | false } } } diff --git a/docs/index.md b/docs/index.md index 3f61842..8570a9f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -6083,6 +6083,8 @@ Prevent Firefox from messaging the user in certain situations. `MoreFromMozilla` If false, don't show the "More from Mozilla" section in Preferences. (Firefox 98) +`Locked` prevents the user from changing user messaging preferences. + **Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** `browser.messaging-system.whatsNewPanel.enabled`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla` @@ -6095,6 +6097,7 @@ Software\Policies\Mozilla\Firefox\UserMessaging\FeatureRecommendations = 0x1 | 0 Software\Policies\Mozilla\Firefox\UserMessaging\UrlbarInterventions = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\SkipOnboarding = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\MoreFromMozilla = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\UserMessaging\Locked = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: @@ -6105,6 +6108,7 @@ OMA-URI: ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_UrlbarInterventions ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_SkipOnboarding ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_MoreFromMozilla +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_Locked ``` Value (string): ``` @@ -6127,6 +6131,8 @@ Value (string): | MoreFromMozilla | + Locked + | ``` @@ -6140,7 +6146,8 @@ Value (string): "FeatureRecommendations": true | false, "UrlbarInterventions": true | false, "SkipOnboarding": true | false, - "MoreFromMozilla": true | false + "MoreFromMozilla": true | false, + "Locked": true | false } } } diff --git a/linux/policies.json b/linux/policies.json index 61017ef..ca1daee 100644 --- a/linux/policies.json +++ b/linux/policies.json @@ -347,7 +347,8 @@ "FeatureRecommendations": true | false, "UrlbarInterventions": true | false, "SkipOnboarding": true | false, - "MoreFromMozilla": true | false + "MoreFromMozilla": true | false, + "Locked": true | false }, "UseSystemPrintDialog": true | false., "WebsiteFilter": { diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 65ffc7f..b37abd9 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -618,6 +618,10 @@ SkipOnboarding + MoreFromMozilla + + Locked + UseSystemPrintDialog diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 90e2677..19cf39a 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -847,6 +847,10 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde Wenn diese Richtlinieneinstellung deaktiviert ist, wird der Abschnitt "Mehr von Mozilla" in den Einstellungen nicht angezeigt. Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird der Abschnitt "Mehr von Mozilla" in den Einstellungen angezeigt. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 23344de..f1dabd1 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -847,6 +847,10 @@ If this policy is disabled or not configured, onboarding messages will be shown If this policy is disabled, the More from Mozilla section will not be shown in preferences. If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index ecc48fb..0eb239b 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -849,6 +849,10 @@ If this policy is disabled or not configured, onboarding messages will be shown If this policy is disabled, the More from Mozilla section will not be shown in preferences. If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/firefox.admx b/windows/firefox.admx index 93e780d..fb00375 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -3729,6 +3729,16 @@ + + + + + + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 4bcdb23..0c0fd0f 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -848,6 +848,10 @@ If this policy is disabled or not configured, onboarding messages will be shown If this policy is disabled, the More from Mozilla section will not be shown in preferences. If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 6373ae6..05bd735 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -849,6 +849,10 @@ If this policy is disabled or not configured, onboarding messages will be shown If this policy is disabled, the More from Mozilla section will not be shown in preferences. If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index bc94b5d..016561d 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -849,6 +849,10 @@ If this policy is disabled or not configured, no PKCS #11 modules will be delete Если эта политика отключена, раздел «Дополнительно от Mozilla» не будет отображаться в настройках. Если эта политика включена или не настроена, раздел «Дополнительно от Mozilla» будет отображаться в настройках. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index 7832d5d..c0324b0 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -849,6 +849,10 @@ If this policy is disabled or not configured, onboarding messages will be shown If this policy is disabled, the More from Mozilla section will not be shown in preferences. If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences. + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index ea40e20..ad8b9de 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -847,6 +847,10 @@ If this policy is disabled or not configured, no PKCS #11 modules will be delete 若停用此原則，偏好設定中將不會顯示「Mozilla 的更多產品」頁面。 若啟用或不設定此原則，將會在偏好設定中顯示「Mozilla 的更多產品」頁面。 + Do not allow user messaging preferences to be changed + If this policy is disabled, user messaging preferences can be changed by the user. + +If this policy is enabled or not configured, user messaging preferences cannot be changed by the user. TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLS_DHE_RSA_WITH_AES_256_CBC_SHA TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA -- 2.34.1