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=b8c72d165052bc2ea433620858127018fa655d0c

Merge branch 'master' into 1433870_EnableTrackingProtection
---

diff --git a/README.md b/README.md
index 8c9cdcc..c263320 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,21 @@ If Value is set to true, private browsing is enabled by default in both the brow
       "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
   }
 }
 ```
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index c259fcb..617ef77 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -73,6 +73,10 @@
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementMenu">Menu</string>
+      <string id="NoDefaultBookmarks">No Default Bookmarks</string>
+      <string id="NoDefaultBookmarks_Explain">Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.</string>
+      <string id="NoSmartBookmarks">No Smart Bookmarks</string>
+      <string id="NoSmartBookmarks_Explain">Remove the Smart Bookmarks (Most Visited, Recent Tags)</string>
       <string id="HomepageURL">URL for Home page</string>
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 39f6038..b06e532 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -238,6 +238,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="NoSmartBookmarks" class="Both" displayName="$(string.NoSmartBookmarks)" explainText="$(string.NoSmartBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoSmartBookmarks">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DontCheckDefaultBrowser" class="Both" displayName="$(string.DontCheckDefaultBrowser)" explainText="$(string.DontCheckDefaultBrowser_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DontCheckDefaultBrowser">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>