Merge pull request #1196 from gregstoll/master

Add Content Analysis policies for PlainTextOnly and TimeoutResult

diff --git a/docs/index.md b/docs/index.md
index 58c401616d6f964d9133eb179b5b134a5093ed0a..1fa7e71e32c8a00df33143de59d52367c371bfbf 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -676,7 +676,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/AutoLaunchProtocolsFromOriginsOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AutoLaunchProtocolsFromOriginsOneLine
 ```
 Value (string):
 ```
@@ -954,7 +954,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/BookmarksOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/BookmarksOneLine
 ```
 Value (string):
 ```
@@ -1199,7 +1199,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ContainersOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ContainersOneLine
 ```
 Value (string):
 ```
@@ -3073,7 +3073,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine
 ```
 Value (string):
 ```
@@ -3220,6 +3220,7 @@ The configuration for each extension is another dictionary that can contain the
 | `updates_disabled` | (Firefox 89, Firefox ESR 78.11) Boolean that indicates whether or not to disable automatic updates for an individual extension.
 | `default_area` | (Firefox 113) String that indicates where to place the extension icon by default. Possible values are `navbar` and `menupanel`.
 | `temporarily_allow_weak_signatures`| (Firefox 127) A boolean that indicates whether to allow installing extensions signed using deprecated signature algorithms.
+| `private_browsing`| (Firefox 136, Firefox ESR 128.8) A boolean that indicates whether or not this extension should be enabled in private browsing.
 
 **Compatibility:** Firefox 69, Firefox ESR 68.1 (As of Firefox 85, Firefox ESR 78.7, installing a theme makes it the default.)\
 **CCK2 Equivalent:** N/A\
@@ -3273,8 +3274,7 @@ Value (string):
     "installation_mode": "force_installed",
     "install_url": "https://addons.mozilla.org/firefox/downloads/latest/adguardadblocker@adguard.com/latest.xpi"
   },
-  {
-    "https-everywhere@eff.org": {
+  "https-everywhere@eff.org": {
     "installation_mode": "allowed",
     "updates_disabled": false
   }
@@ -3691,7 +3691,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/HandlersOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/HandlersOneLine
 ```
 Value (string):
 ```
@@ -4307,7 +4307,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ManagedBoomarksOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ManagedBoomarksOneLine
 ```
 Value (string):
 ```
@@ -5519,7 +5519,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/PreferencesOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PreferencesOneLine
 ```
 Value (string):
 ```
@@ -6975,7 +6975,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/WebsiteFilterOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/WebsiteFilterOneLine
 ```
 Value (string):
 ```

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 7d05d8268b26166b063548d7a8d76c7f9b18d405..8ec4c78a815fac5c76424c8bc994f98ee5f0d2ba 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.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f28aec40d321a7f24c76307992e4ca39b0903689..0033bbdbedd4bdde739ff2eaa9b2c84fbc23ad06 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.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

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

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 1b75eed0daab3743dd8d763c21fd074634ec3821..c6f25eeb8c41cee9ede503fd35152a71dce44d92 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 59020e045a9f5f6fc46a8205094bd54e33891bcc..57f753f3e658ded7c4cbe4f4d0a231a6274cb457 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>