Merge pull request #1218 from vossni/master

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

diff --git a/docs/index.md b/docs/index.md
index 1ffecb1d7009117718bbb94c9c0271f01ecdd6fd..883015b1f633e707cd44067dbe8d945a6579feda 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -2546,7 +2546,7 @@ Mozilla recommends that you do not disable telemetry. Information collected thro
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **CCK2 Equivalent:** `disableTelemetry`\
-**Preferences Affected:** `datareporting.healthreport.uploadEnabled`, `datareporting.policy.dataSubmissionEnabled`, `toolkit.telemetry.archive.enabled`
+**Preferences Affected:** `datareporting.healthreport.uploadEnabled`, `datareporting.policy.dataSubmissionEnabled`, `toolkit.telemetry.archive.enabled`, `datareporting.usage.uploadEnabled`
 
 #### Windows (GPO)
 ```
@@ -2892,6 +2892,7 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Value = 0x1 | 0x0
 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\Exceptions\1 = "https://example.com"
 ```
 #### Windows (Intune)
@@ -2921,6 +2922,14 @@ Value (string):
 ```
 OMA-URI:
 ```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/F_TrackingProtection_EmailTracking
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~TrackingProtection/D_TrackingProtection_Exceptions
 ```
 Value (string):
@@ -2949,6 +2958,8 @@ Value (string):
     <true/> | <false/>
     <key>Fingerprinting</key>
     <true/> | <false/>
+    <key>EmailTracking</key>
+    <true/> | <false/>
     <key>Exceptions</key>
     <array>
       <string>https://example.com</string>
@@ -2965,6 +2976,7 @@ Value (string):
       "Locked": true | false,
       "Cryptomining": true | false,
       "Fingerprinting": true | false,
+      "EmailTracking": true | false,
       "Exceptions": ["https://example.com"]
     }
   }
@@ -6641,7 +6653,7 @@ Software\Policies\Mozilla\Firefox\SkipTermsOfUse = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
-FIXME
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/SkipTermsOfUse
 ```
 Value (string):
 ```
@@ -6872,7 +6884,7 @@ Prevent Firefox from messaging the user in certain situations.
 
 `FeatureRecommendations` If false, don't recommend browser features.
 
-`UrlbarInterventions` If false,don't offer Firefox specific suggestions in the URL bar.
+`UrlbarInterventions` If false, don't offer Firefox specific suggestions in the URL bar.
 
 `SkipOnboarding` If true, don't show onboarding messages on the new tab page.