OverridePostUpdatePage policy

diff --git a/README.md b/README.md
index 1650860b133819e11fb5e87f0287d67a5ba17664..34da6c7ccf711e57a495106ccba9b0b53378914f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -385,6 +385,15 @@ This policy allowed you to override the first run page. If you leave the URL bla
   }
 }
 ```
   }
 }
 ```

+### OverridePostUpdatePage
+This policy allowed you to override the upgrade page page. If you leave the URL blank, the upgrade page will not be displayed.
+```
+{
+  "policies": {
+    "OverridePostUpdatePage": "http://example.org"
+  }
+}
+```

 ### Bookmarks
 This policy allows you to specify bookmarks. You can have any number of bookmarks although only ten are specified in the ADMX file.
 Placement can be specified as either toolbar or menu. If a folder is specified, it is automatically created and bookmarks with the
 ### Bookmarks
 This policy allows you to specify bookmarks. You can have any number of bookmarks although only ten are specified in the ADMX file.
 Placement can be specified as either toolbar or menu. If a folder is specified, it is automatically created and bookmarks with the

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 32f1a4bff740fa5cf5a9f61a2fc5744de0911597..d3d981def38f25ba157341c78e6813e1eaffe48f 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -161,6 +161,10 @@ If this policy is disabled or not configured, the user can change their Flash pr
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 
 If this policy is disabled or not configured the first run page is displayed.</string>
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 
 If this policy is disabled or not configured the first run page is displayed.</string>

+      <string id="OverridePostUpdatePage">Override the upgrade page</string>
+      <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
+
+If this policy is disabled or not configured the upgrade is displayed.</string>

       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>


@@ -211,8 +215,8 @@ If this policy is enabled, private browsing is enabled by default in both the br
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>

-      <presentation id="OverrideFirstRunPage">
-        <textBox refId="OverrideFirstRunPage">
+      <presentation id="OverridePage">
+        <textBox refId="OverridePage">

           <label>URL:</label>
         </textBox>
       </presentation>
           <label>URL:</label>
         </textBox>
       </presentation>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 05243611a7983f766795dfbae2a595a8c91a4798..9271004cf7f0a1fcf0f0c9989f45ecf80b064eb3 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -524,11 +524,18 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-    <policy name="OverrideFirstRunPage" class="Both" displayName="$(string.OverrideFirstRunPage)" explainText="$(string.OverrideFirstRunPage_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.OverrideFirstRunPage)" >
+    <policy name="OverrideFirstRunPage" class="Both" displayName="$(string.OverrideFirstRunPage)" explainText="$(string.OverrideFirstRunPage_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.OverridePage)" >

       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
       <elements>
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
       <elements>

-        <text id="OverrideFirstRunPage" key="Software\Policies\Mozilla\Firefox" valueName="OverrideFirstRunPage"/>
+        <text id="OverridePage" valueName="OverrideFirstRunPage"/>
+      </elements>
+    </policy>
+    <policy name="OverridePostUpdatePage" class="Both" displayName="$(string.OverridePostUpdatePage)" explainText="$(string.OverridePostUpdatePage_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.OverridePage)" >
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements>
+        <text id="OverridePage" valueName="OverridePostUpdatePage"/>

       </elements>
     </policy>
     <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       </elements>
     </policy>
     <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >