Update docs

diff --git a/docs/index.md b/docs/index.md
index 82bc71b2373de7d8061a1fb9172f5ab3826a0977..1444e0d509231ad23df640211c6df9a82f5d0430 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -2928,6 +2928,8 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\EmailTracking = 0x1 |
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\SuspectedFingerprinting = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions\1 = "https://example.com"
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Category = "strict" | "standard"
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\SuspectedFingerprinting = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions\1 = "https://example.com"
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Category = "strict" | "standard"

+Software\Policies\Mozilla\Firefox\EnableTrackingProtection\BaselineExceptions = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\EnableTrackingProtection\ConvenienceExceptions = 0x1 | 0x0

 ```
 #### Windows (Intune)
 OMA-URI:
 ```
 #### Windows (Intune)
 OMA-URI:


@@ -2995,6 +2997,22 @@ Value (string):
 ```
 <enabled/> or <disabled/>
 ```
 ```
 <enabled/> or <disabled/>
 ```

+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/H_TrackingProtection_BaselineExceptions
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/H_TrackingProtection_ConvenienceExceptions
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```

 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>


@@ -3018,6 +3036,10 @@ Value (string):
     <array>
       <string>https://example.com</string>
     </array>
     <array>
       <string>https://example.com</string>
     </array>

+    <key>BaselineExceptions</key>
+    <true/> | <false/>
+    <key>ConvenienceExceptions</key>
+    <true/> | <false/>

   </dict>
 </dict>
 ```
   </dict>
 </dict>
 ```


@@ -3033,7 +3055,9 @@ Value (string):
       "EmailTracking": true | false,
       "SuspectedFingerprinting": true | false,
       "Category": "strict" | "standard",
       "EmailTracking": true | false,
       "SuspectedFingerprinting": true | false,
       "Category": "strict" | "standard",

-      "Exceptions": ["https://example.com"]
+      "Exceptions": ["https://example.com"],
+      "BaselineExceptions": true | false,
+      "ConvenienceExceptions": true | false

     }
   }
 }
     }
   }
 }

diff --git a/linux/policies.json b/linux/policies.json
index a7823089dc9dd41b2691903cd2108a6ecfc865a9..3813e09b443749f8c6d0ac040fa17f48f8dccddd 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -104,7 +104,9 @@
       "EmailTracking": true | false,
       "SuspectedFingerprinting": true | false,
       "Category": "strict" | "standard",
       "EmailTracking": true | false,
       "SuspectedFingerprinting": true | false,
       "Category": "strict" | "standard",

-      "Exceptions": ["https://example.com"]
+      "Exceptions": ["https://example.com"],
+      "BaselineExceptions": true | false,
+      "ConvenienceExceptions": true | false

     },
     "EncryptedMediaExtensions": {
       "Enabled": true | false,
     },
     "EncryptedMediaExtensions": {
       "Enabled": true | false,


@@ -152,6 +154,7 @@
       "Locked": true | false
     },
     "GenerativeAI": {
       "Locked": true | false
     },
     "GenerativeAI": {

+      "Enabled": true | false,

       "Chatbot": true | false,
       "LinkPreviews": true | false,
       "TabGroups": true | false,
       "Chatbot": true | false,
       "LinkPreviews": true | false,
       "TabGroups": true | false,

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 28fb093a36fa0543394d5f249e4aa2b72277e250..576c4da2e2697d2b13d2f71649d55f1a8f4f4332 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -250,6 +250,10 @@
                <array>
                        <string>https://example.com</string>
                </array>
                <array>
                        <string>https://example.com</string>
                </array>

+               <key>BaselineExceptions</key>
+               <true/>
+               <key>ConvenienceExceptions</key>
+               <true/>

        </dict>
        <key>EncryptedMediaExtensions</key>
                <dict>
        </dict>
        <key>EncryptedMediaExtensions</key>
                <dict>


@@ -337,6 +341,8 @@
        </dict>
     <key>GenerativeAI</key>
     <dict>
        </dict>
     <key>GenerativeAI</key>
     <dict>

+        <key>Enabled</key>
+        <true/>

         <key>Chatbot</key>
         <false/>
         <key>LinkPreviews</key>
         <key>Chatbot</key>
         <false/>
         <key>LinkPreviews</key>