From: Michael Kaply <consulting@kaply.com>
Date: Fri, 23 Mar 2018 19:38:27 +0000 (-0500)
Subject: Merge branch 'master' into 1433870_EnableTrackingProtection
X-Git-Tag: 0.9~31^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9ee558d61c6a0db8d59dbdca634a2bbadae07871?hp=--cc

Merge branch 'master' into 1433870_EnableTrackingProtection
---

9ee558d61c6a0db8d59dbdca634a2bbadae07871
diff --cc README.md
index 8c9cdcc,42e0382..c263320
--- a/README.md
+++ b/README.md
@@@ -197,21 -197,21 +197,36 @@@ This policy stops Firefox from checkin
    }
  }
  ```
 +### EnableTrackingProtection
 +This policy affects tracking protection.
 +
 +If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
 +
 +If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
 +
 +If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
 +```
 +{
 +  "policies": {
 +    "EnableTrackingProtection": {
 +      "Value": [true, false],
 +      "Locked": [true, false]
 +    }
+ ### NoDefaultBookmarks
+ Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+ ```
+ {
+   "policies": {
+     "NoDefaultBookmarks": true
+   }
+ }
+ ```
+ ### NoSmartBookmarks
+ Remove the Smart Bookmarks (Most Visited, Recent Tags)
+ ```
+ {
+   "policies": {
+     "NoSmartBookmarks": true
    }
  }
  ```