Merge branch 'master' into DLP_Templates

diff --git a/docs/index.md b/docs/index.md
index 64012042b998c78a6686581bb1cfac7263680acf..130ed1d35be5f9cd35d16a2052261cd50ddbd70f 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -1270,7 +1270,7 @@ Configure Firefox to use an agent for Data Loss Prevention (DLP) that is compati
 
 `ShowBlockedResult` indicates whether Firefox should show a notification when a DLP request is denied. The default is true.
 
-**Compatibility:** Firefox 127\
+**Compatibility:** Firefox 130\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.contentanalysis.agent_name`, `browser.contentanalysis.agent_timeout`, `browser.contentanalysis.allow_url_regex_list`, `browser.contentanalysis.bypass_for_same_tab_operations`, `browser.contentanalysis.client_signature`, `browser.contentanalysis.default_result`, `browser.contentanalysis.deny_url_regex_list`, `browser.contentanalysis.enabled`, `browser.contentanalysis.is_per_user`, `browser.contentanalysis.pipe_path_name`, `browser.contentanalysis.show_blocked_result`
 
@@ -3356,7 +3356,7 @@ Software\Policies\Mozilla\Firefox\FirefoxSuggest\Locked = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/WebSuggestions
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/FirefoxSuggest_WebSuggestions
 ```
 Value (string):
 ```
@@ -3364,7 +3364,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/SponsoredSuggestions
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/FirefoxSuggest_SponsoredSuggestions
 ```
 Value (string):
 ```
@@ -3372,7 +3372,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/ImproveSuggest
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/FirefoxSuggest_ImproveSuggest
 ```
 Value (string):
 ```
@@ -3380,7 +3380,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/Locked
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~FirefoxSuggest/FirefoxSuggest_Locked
 ```
 Value (string):
 ```
@@ -3796,7 +3796,7 @@ Software\Policies\Mozilla\Firefox\HttpAllowlist\2 = "http://example.edu"
 #### Windows (Intune)
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/HttpAllowlist 
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/HttpAllowlist
 ```
 Value (string):
 ```
@@ -3806,7 +3806,7 @@ Value (string):
 #### macOS
 ```
 <dict>
-  <key>HttpAllowlist </key>
+  <key>HttpAllowlist</key>
   <array>
     <string>http://example.org</string>
     <string>http://example.edu</string>
@@ -3817,7 +3817,7 @@ Value (string):
 ```
 {
   "policies": {
-    "HttpAllowlist ": ["http://example.org",
+    "HttpAllowlist": ["http://example.org",
                        "http://example.edu"]
   }
 }

diff --git a/linux/policies.json b/linux/policies.json
index 7e1fdd485a8c0cc0d41dfaca7d6a9de51b33b0a5..003731c576964bc86acda2e58fcb79c16acd158b 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -187,7 +187,7 @@
                     "http://example.edu/"],
       "StartPage": "none" | "homepage" | "previous-session" | "homepage-locked"
     },
-    "HttpAllowlist ": ["http://example.org",
+    "HttpAllowlist": ["http://example.org",
                        "http://example.edu"],
     "HttpsOnlyMode": "allowed" | "disallowed" | "enabled" | "force_enabled",
     "InstallAddonsPermission": {

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 70431803ffcc1f0ab5c6714f732c2ccfad38fdc0..f6348d312651f41a1f40611a38137c89dcfe8192 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -403,7 +403,7 @@
                <key>StartPage</key>
                <string>homepage</string>
        </dict>
-       <key>HttpAllowlist </key>
+       <key>HttpAllowlist</key>
        <array>
                <string>http://example.org</string>
                <string>http://example.edu</string>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 28b5d54826663c65a4363ed06ca26142af1a8d18..e06a192c7ebc9aaf3288aca9cf188e5b5f0490b4 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.0" schemaVersion="1.0">
+<policyDefinitionResources revision="6.1" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 90c964e7c493839529d5d3e522fbf30003947401..499bf594cf803c9cd7e2d06e05abab2a959ac6a0 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.0" schemaVersion="1.0">
+<policyDefinitionResources revision="6.1" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>
@@ -1115,7 +1115,7 @@ If this policy is disabled or not configured, HTTPS-Only Mode is not enabled.</s
       <string id="HttpsOnlyMode_Disallowed">Off and locked</string>
       <string id="HttpsOnlyMode_Enabled">On by default</string>
       <string id="HttpsOnlyMode_ForceEnabled">On and locked</string>
-      <string id="HttpAllowlist">HTTP Allowlist </string>
+      <string id="HttpAllowlist">HTTP Allowlist</string>
       <string id="HttpAllowlist_Explain">If this policy is enabled, you can specify a list origins that will not be upgraded to HTTPS.
 
 If this policy is disabled or not configured, all origins are upgraded to HTTPS if HTTPS-Only Mode is enabled.</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 9311483ecf2dfc5e994a9570441958ce487efadd..7dc7b0bdfc667c1bee1932b767e81c8043f34c0c 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="6.0" schemaVersion="1.0">
+<policyDefinitions revision="6.1" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="6.0"/>
+  <resources minRequiredRevision="6.1"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>