Don't add Stories to GPO (yet)

diff --git a/docs/index.md b/docs/index.md
index 759df2a7fe225fead75b0de4cdffd274cd94ef1b..9cbf5164aab33a6c94f5e9ab74e49cee8f3ae5df 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -3421,7 +3421,7 @@ Value (string):
 ### FirefoxHome
 Customize the Firefox Home page.
 
 ### FirefoxHome
 Customize the Firefox Home page.
 

-**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4, Snippets was deprecated in Firefox 122, Stories and SponsoredStories were added in Firefox 141 to replace Pocket and SponsoredPocket)
+**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4, Snippets was deprecated in Firefox 122, Stories and SponsoredStories were added in Firefox 141 to replace Pocket and SponsoredPocket.)

 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored`
 
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored`
 


@@ -3432,7 +3432,6 @@ Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0

-Software\Policies\Mozilla\Firefox\FirefoxHome\Stories = 0x1 | 0x0

 Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0


@@ -3450,9 +3449,7 @@ Value (string):
 <data id="FirefoxHome_SponsoredTopSites" value="true | false"/>
 <data id="FirefoxHome_Highlights" value="true | false"/>
 <data id="FirefoxHome_Pocket" value="true | false"/>
 <data id="FirefoxHome_SponsoredTopSites" value="true | false"/>
 <data id="FirefoxHome_Highlights" value="true | false"/>
 <data id="FirefoxHome_Pocket" value="true | false"/>

-<data id="FirefoxHome_Stories" value="true | false"/>

 <data id="FirefoxHome_SponsoredPocket" value="true | false"/>
 <data id="FirefoxHome_SponsoredPocket" value="true | false"/>

-<data id="FirefoxHome_SponsoredStories" value="true | false"/>

 <data id="FirefoxHome_Snippets" value="true | false"/>
 <data id="FirefoxHome_Locked" value="true | false"/>
 ```
 <data id="FirefoxHome_Snippets" value="true | false"/>
 <data id="FirefoxHome_Locked" value="true | false"/>
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 07364e710e5e9509ab208139be2e623b97c63926..8fda805308f6281d7cc23a8344e35664b90dad01 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -78,6 +78,7 @@
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 or later</string>
       <string id="SUPPORTED_FF138_ONLY">Firefox 138 or later</string>
       <string id="SUPPORTED_FF138">Firefox 138, Firefox 128.10 ESR</string>
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 or later</string>
       <string id="SUPPORTED_FF138_ONLY">Firefox 138 or later</string>
       <string id="SUPPORTED_FF138">Firefox 138, Firefox 128.10 ESR</string>

+      <string id="SUPPORTED_FF141">Firefox 141 or l;at, Firefox 140.1 ESR or later</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 87454afd0eb44306515012df3614247cc5f9291b..d55cfd164ab3dcd73b075d20b122ad5c9a55bf31 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -80,6 +80,7 @@
       <definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>
       <definition name="SUPPORTED_FF137_ONLY" displayName="$(string.SUPPORTED_FF137_ONLY)"/>
       <definition name="SUPPORTED_FF138_ONLY" displayName="$(string.SUPPORTED_FF138_ONLY)"/>
       <definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>
       <definition name="SUPPORTED_FF137_ONLY" displayName="$(string.SUPPORTED_FF137_ONLY)"/>
       <definition name="SUPPORTED_FF138_ONLY" displayName="$(string.SUPPORTED_FF138_ONLY)"/>

+      <definition name="SUPPORTED_FF141" displayName="$(string.SUPPORTED_FF141)"/>

     </definitions>
   </supportedOn>
   <categories>
     </definitions>
   </supportedOn>
   <categories>