Change to OR separator

[policy-templates.git] / docs / index.md

diff --git a/docs/index.md b/docs/index.md
index 9d40284c8734ccfc74034d5848beb7ad95ccf872..f7a76c7d05d5c8d6e17087236d5d7c3965c63243 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -317,7 +317,9 @@ Prevent Firefox from being updated beyond the specified version.
 
 You can specify the any version as ```xx.``` and Firefox will be updated with all minor versions, but will not be updated beyond the major version.
 
-You can also specify the version as ```xx.xx``` and Firefox will be updated with all patch versions, but will not be updated beyond the minor version.
+You can also specify the version as ```xx.xx.``` and Firefox will be updated with all patch versions, but will not be updated beyond the minor version.
+
+Note: The value MUST end in a dot(.).
 
 You should specify a version that exists or is guaranteed to exist. If you specify a version that doesn't end up existing, Firefox will update beyond that version.
 
@@ -2928,6 +2930,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\BaselineExceptions = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\EnableTrackingProtection\ConvenienceExceptions = 0x1 | 0x0
 ```
 #### Windows (Intune)
 OMA-URI:
@@ -2995,6 +2999,22 @@ Value (string):
 ```
 <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>
@@ -3018,6 +3038,10 @@ Value (string):
     <array>
       <string>https://example.com</string>
     </array>
+    <key>BaselineExceptions</key>
+    <true/> | <false/>
+    <key>ConvenienceExceptions</key>
+    <true/> | <false/>
   </dict>
 </dict>
 ```
@@ -3033,7 +3057,9 @@ Value (string):
       "EmailTracking": true | false,
       "SuspectedFingerprinting": true | false,
       "Category": "strict" | "standard",
-      "Exceptions": ["https://example.com"]
+      "Exceptions": ["https://example.com"],
+      "BaselineExceptions": true | false,
+      "ConvenienceExceptions": true | false
     }
   }
 }
@@ -3555,9 +3581,11 @@ Value (string):
 ### FirefoxSuggest
 Customize Firefox Suggest (US only).
 
+As of Firefox 146, `WebSuggestions` turns off Suggest completely.
+
 **Compatibility:** Firefox 118, Firefox ESR 115.3.
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.urlbar.suggest.quicksuggest.nonsponsored`, `browser.urlbar.suggest.quicksuggest.sponsored`, `browser.urlbar.quicksuggest.dataCollection.enabled`
+**Preferences Affected:** `browser.urlbar.suggest.quicksuggest.all`, `browser.urlbar.suggest.quicksuggest.sponsored`, `browser.urlbar.quicksuggest.dataCollection.enabled`
 
 #### Windows (GPO)
 ```
@@ -3632,20 +3660,23 @@ Value (string):
 
 Configure generative AI features.
 
-`Chatbot` If false, AI chatbots are not available in the sidebar.
+`Enabled` Controls whether generative AI features are enabled by default. If false, all generative AI features are disabled by default. Individual generative AI policies can override this setting.
+
+`Chatbot` Controls access to AI chatbots in the sidebar. If false, AI chatbots are not available in the sidebar.
 
-`LinkPreviews` If false, AI is not used to generate link previews (Firefox 144).
+`LinkPreviews` (Firefox 144+) Controls whether AI is used to generate link previews. If false, AI is not used to generate link previews.
 
-`TabGroups` If false,  AI is not used to suggest names and tabs for tab groups (Firefox 144).
+`TabGroups` (Firefox 144+) Controls whether AI is used to suggest names and tabs for tab groups. If false, AI is not used to suggest names or tabs for tab groups.
 
-`Locked` prevents the user from changing generative AI preferences.
+`Locked` Prevents the user from changing generative AI preferences.
 
 **Compatibility:** Firefox 144, Firefox ESR 140.4\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.ml.chat.enabled`, `browser.ml.linkPreview.optin`, `browser.tabs.groups.smart.userEnabled`
+**Preferences Affected:** `browser.ml.chat.enabled`, `browser.ml.chat.page`, `browser.ml.linkPreview.optin`, `browser.tabs.groups.smart.userEnabled`
 
 #### Windows (GPO)
 ```
+Software\Policies\Mozilla\Firefox\GenerativeAI\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\Chatbot = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\LinkPreviews = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\TabGroups = 0x1 | 0x0
@@ -3654,6 +3685,7 @@ Software\Policies\Mozilla\Firefox\GenerativeAI\Locked = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_Enabled
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_Chatbot
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_LinkPreviews
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_TabGroups
@@ -3668,6 +3700,8 @@ Value (string):
 <dict>
   <key>GenerativeAI</key>
   <dict>
+    <key>Enabled</key>
+    <true/> | <false/>
     <key>Chatbot</key>
     <true/> | <false/>
     <key>LinkPreviews</key>
@@ -3684,6 +3718,7 @@ Value (string):
 {
   "policies": {
     "GenerativeAI": {
+      "Enabled": true | false,
       "Chatbot": true | false,
       "LinkPreviews": true | false,
       "TabGroups": true | false,