From: Michael Kaply <consulting@kaply.com>
Date: Mon, 19 Mar 2018 20:25:12 +0000 (-0500)
Subject: Merge pull request #24 from mozilla/1440574_DisableFeedbackCommands
X-Git-Tag: 0.9~38
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/905cf3997e69f8e82ce7d5a407c681458358e2c1?hp=8e81bff30fa667c76113f1363f7918767c60bb7b

Merge pull request #24 from mozilla/1440574_DisableFeedbackCommands

Policy for DisableFeedbackCommands. Fixes #17
---

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 027211d..2e716d0 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -33,6 +33,8 @@
       <string id="DisableBuiltinPDFViewer_Explain">Disables PDF.js, which displays PDFs within Firefox.</string>
       <string id="DisableDeveloperTools">Disable Developer Tools</string>
       <string id="DisableDeveloperTools_Explain">Prevents access to developer tools.</string>
+      <string id="DisableFeedbackCommands">Disable Feedback Commands</string>
+      <string id="DisableFeedbackCommands_Explain">Prevents ability to send feedback from the help menu (&quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot;).</string>
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts_Explain">Disables Firefox Account based services, including Sync.</string>
       <string id="DisableFirefoxScreenshots">Disable Firefox Screenshots</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 261bb08..c97352b 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -118,7 +118,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="DisableFirefoxScreenshots" class="Both" displayName="$(string.DisableFirefoxScreenshots)" explainText="$(string.DisableFirefoxScreenshots_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxScreenshots">
+    <policy name="DisableFeedbackCommands" class="Both" displayName="$(string.DisableFeedbackCommands)" explainText="$(string.DisableFeedbackCommands_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFeedbackCommands">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <enabledValue>
@@ -138,6 +138,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableFirefoxScreenshots" class="Both" displayName="$(string.DisableFirefoxScreenshots)" explainText="$(string.DisableFirefoxScreenshots_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxScreenshots">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableFirefoxStudies" class="Both" displayName="$(string.DisableFirefoxStudies)" explainText="$(string.DisableFirefoxStudies_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxStudies">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>