Merge branch 'master' of github.com:mozilla/policy-templates

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

diff --git a/docs/index.md b/docs/index.md
index 62aa780059315f120939ce91a6a0e7a4a138b518..547851697246ef5428e387406810c9675bbbe653 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -2884,9 +2884,13 @@ If `Fingerprinting` is set to true, fingerprinting scripts on websites are block
 
 If `EmailTracking` is set to true, hidden email tracking pixels and scripts on websites are blocked. (Firefox 112)
 
+If `SuspectedFingerprinting` is set to true, Firefox reduces the amount of information exposed to websites to protect against potential fingerprinting attempts. (Firefox 142, Firefox ESR 140.2)
+
 `Exceptions` are origins for which tracking protection is not enabled.
 
-**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5)\
+`Category` can be either ```strict``` or ```standard```. If category is set, it overrides all other settings except `Exceptions` and the user cannot change the category. (Firefox 142, Firefox ESR 140.2)
+
+**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5. Category added in Firefox 142/140.2.)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.trackingprotection.enabled`, `privacy.trackingprotection.pbmode.enabled`, `privacy.trackingprotection.cryptomining.enabled`, `privacy.trackingprotection.fingerprinting.enabled`
 
@@ -2897,7 +2901,9 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Cryptomining = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\EmailTracking = 0x1 | 0x0
+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"
 ```
 #### Windows (Intune)
 OMA-URI:
@@ -2949,6 +2955,22 @@ Value (string):
 ```
 <enabled/> or <disabled/>
 ```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/G_TrackingProtection_Category
+```
+Value (string):
+```
+<data id="TrackingProtection_Category" value="strict | standard"/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/H_TrackingProtection_SuspectedFingerprinting
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
 #### macOS
 ```
 <dict>
@@ -2964,7 +2986,11 @@ Value (string):
     <true/> | <false/>
     <key>EmailTracking</key>
     <true/> | <false/>
+    <key>SuspectedFingerprinting</key>
+    <true/> | <false/>
     <key>Exceptions</key>
+    <key>Category</key>
+    <string>strict | standard</string>
     <array>
       <string>https://example.com</string>
     </array>
@@ -2981,6 +3007,8 @@ Value (string):
       "Cryptomining": true | false,
       "Fingerprinting": true | false,
       "EmailTracking": true | false,
+      "SuspectedFingerprinting": true | false,
+      "Category": "strict" | "standard",
       "Exceptions": ["https://example.com"]
     }
   }
@@ -3859,9 +3887,14 @@ Configure the default homepage and how Firefox starts.
 
 `Additional` allows for more than one homepage.
 
-`StartPage` is how Firefox starts. The choices are no homepage, the default homepage or the previous session.
+`StartPage` is how Firefox starts.
 
-With Firefox 78, an additional option as added for `Startpage`, `homepage-locked`. If this is value is set for the Startpage, the user will always get the homepage at startup and cannot choose to restore their session.
+| Value             | Description
+|-------------------|-----------------------------------------------------------------------------
+| `none`            | Start with a blank page (no homepage, no previous session).
+| `homepage`        | Start with the homepage in `URL` policy.
+| `previous-session`| Restore the previous session (all tabs and windows reopen).
+| `homepage-locked` | Always force the homepage at startup, users cannot choose session restore. (Firefox 78)
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4, homepage-locked added in Firefox 78)\
 **CCK2 Equivalent:** `homePage`,`lockHomePage`\