SanitizeOnShutdown policy

diff --git a/README.md b/README.md
index 4ca48a026597487a0b82005785242e370e2f959a..4cc4496757d363e6f684163302e3996b51a92720 100644 (file)
--- a/README.md
+++ b/README.md
@@ -392,7 +392,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL
 ```
 {
   "policies": {
-    "OverridePostUpdatePagep": "http://example.org"
+    "OverridePostUpdatePage": "http://example.org"
   }
 }
 ```
@@ -436,3 +436,12 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se
   }
 }
 ```
+### SanitizeOnShutdown
+If this policy is set to true,  all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data.
+```
+{
+  "policies": {
+    "SanitizeOnShutdown": [true|false]
+  }
+}
+```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7e962f8e54b2d77f915288997be722058fcbfa89..42113abeb15d733dfb0cf03e42fd442930e2ab0d 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -175,6 +175,10 @@ If this policy is disabled or not configured the first run page is displayed.</s
       <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="SanitizeOnShutdown">Clear all data when browser is closed</string>
+      <string id="SanitizeOnShutdown_Explain">If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing &amp; Download History, Cookies, Active Logins, Cache, Form &amp; Search History, Site Preferences and Offline Website Data.
+
+If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 07862d3dfdcd99f0ecf23726d3c93a2c71989915..f8589c622e535c496b58ddb2632774dc41acb9a1 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -558,6 +558,16 @@
         <text id="OverridePage" valueName="OverridePostUpdatePage"/>
       </elements>
     </policy>
+    <policy name="SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />