From: Michael Kaply <consulting@kaply.com>
Date: Fri, 23 Mar 2018 19:48:39 +0000 (-0500)
Subject: Merge pull request #34 from mozilla/smartbookmarks_wasnt_implemented
X-Git-Tag: 0.9~30
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/80dc8befdb76f33e9dcda96bddf15b3dda0e5c58?hp=22a17e8fc355540543a76e697798656afa0fbd6a

Merge pull request #34 from mozilla/smartbookmarks_wasnt_implemented

NoSmartBookmarks wasn't implemented
---

diff --git a/README.md b/README.md
index 9062eed..8d00ced 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@ If Value is set to true, private browsing is enabled by default in both the brow
     }
 ```
 ### NoDefaultBookmarks
-Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.
 ```
 {
   "policies": {
@@ -222,15 +222,6 @@ Don't create the default bookmarks. Note: this policy is only effective if used
   }
 }
 ```
-### NoSmartBookmarks
-Remove the Smart Bookmarks (Most Visited, Recent Tags)
-```
-{
-  "policies": {
-    "NoSmartBookmarks": true
-  }
-}
-```
 ### RememberPasswords
 This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
 ```
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 617ef77..c0b69c7 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -74,9 +74,7 @@
       <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="NoDefaultBookmarks_Explain">Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.</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 b06e532..c597bb1 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -248,16 +248,6 @@
         <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"/>