Merge branch 'master' of github.com:mozilla/policy-templates into addFeature/AppUpdateURL

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index dd2ddd7628f26ae7251b8138c862bca74619bfba..e68d61052d3199387a6e0f3c364327e7657f8441 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -23,6 +23,10 @@
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="Authentication_SPNEGO">SPNEGO</string>
+      <string id="AppUpdateURL">URL for Firefox Updates</string>
+      <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an other update server than the default. This could be helpful, if you run your own update server in your network and the clients have no direct access to the internet and the Mozilla update server.
+
+If this policy is disabled or not configured, the default update URL is used.</string>
       <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
 If this policy is disabled or not configured, no websites are permitted to engage in SPNEGO authentication with the browser.

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1be3b6e7cd37af8c70e4e11e5d1262e0720f7dd0..6b8c2dab7ca1573585c50513d945b14fe6852e7c 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -49,6 +49,14 @@
     </category>
   </categories>
   <policies>
+    <policies>
+      <policy name="AppUpdateURL" class="Both" displayName="$(string.AppUpdateURL)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.AppUpdateURL)" >
+      <parentCategory ref="Firefox" />
+      <supportedOn ref="SUPPORTED_FF60ESR" />
+      <elements >
+        <text id="AppUpdateURL" valueName="URL" required="true" />
+      </elements>
+    </policy>
     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
       <parentCategory ref="Authentication"/>
       <supportedOn ref="SUPPORTED_FF60ESR"/>