Merge pull request #728 from SkyBeam/patch-1

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 4367e950b7d0f93de9067a0d884231cc11854f67..be3de129d8db6632f854e951b3cb52764d2d23e5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1051,7 +1051,7 @@ Value (string):
 ```
 {
   "policies": {
-    "DisabledCiphers" {
+    "DisabledCiphers": {
       "TLS_DHE_RSA_WITH_AES_128_CBC_SHA": true | false,
       "TLS_DHE_RSA_WITH_AES_256_CBC_SHA": true | false,
       "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": true | false,
@@ -1060,8 +1060,8 @@ Value (string):
       "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": true | false,
       "TLS_RSA_WITH_AES_128_CBC_SHA": true | false,
       "TLS_RSA_WITH_AES_256_CBC_SHA": true | false,
-      "TLS_RSA_WITH_3DES_EDE_CBC_SHA": true | false
-      "TLS_RSA_WITH_AES_128_GCM_SHA256": true | false
+      "TLS_RSA_WITH_3DES_EDE_CBC_SHA": true | false,
+      "TLS_RSA_WITH_AES_128_GCM_SHA256": true | false,
       "TLS_RSA_WITH_AES_256_GCM_SHA384": true | false
     }
   }
@@ -2784,7 +2784,7 @@ Configure the default homepage and how Firefox starts.
 
 `StartPage` is how Firefox starts. The choices are no homepage, the default homepage or the previous session.
 
-With Firefox 78, an additional option as added for `Startpage`, `homepage-locked`. This allows for locking the homepage, but still allowing the user to choose whether or not they want to restore their session.
+With Firefox 78, an additional option as added for `Startpage`, `homepage-locked`. If this is value is set for the Startpage, the user will always get the homepage at startup and cannot choose to restore their session.
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4, homepage-locked added in Firefox 78)\
 **CCK2 Equivalent:** `homePage`,`lockHomePage`\
@@ -3062,7 +3062,7 @@ OMA-URI:
 Value (string):
 ```
 <enabled/>
-<data id="ManagedBookmarks" value='
+<data id="JSON" value='
 [
   {
     "toplevel_name": "My managed bookmarks folder"
@@ -3803,7 +3803,7 @@ Value (string):
 ```
 ### PictureInPicture
 
-Enable or disable Picture-in-Picture.
+Enable or disable Picture-in-Picture as well as lock it.
 
 **Compatibility:** Firefox 78, Firefox ESR 78\
 **CCK2 Equivalent:** N/A\
@@ -3811,12 +3811,15 @@ Enable or disable Picture-in-Picture.
 
 #### Windows (GPO)
 ```
-Software\Policies\Mozilla\Firefox\PictureInPicture = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\PictureInPicture\Enabled = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\PictureInPicture\Locked = 0x1 | 0x0
+
 ```
 #### Windows (Intune)
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PictureInPicture
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~PictureInPicture/PictureInPicture_Enabled
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~PictureInPicture/PictureInPicture_Locked
 ```
 Value (string):
 ```
@@ -3826,14 +3829,22 @@ Value (string):
 ```
 <dict>
   <key>PictureInPicture</key>
-  <true/> | <false/>
+  <dict>
+    <key>Enabled</key>
+    <true/> | <false/>
+    <key>Locked</key>
+    <true/> | <false/>
+  </dict>
 </dict>
 ```
 #### policies.json
 ```
 {
   "policies": {
-    "PictureInPicture": true | false
+    "PictureInPicture": {
+      "Enabled": true | false,
+      "Locked": true, false
+    }
   }
 }
 ```
@@ -3934,9 +3945,11 @@ intl.
 layout.
 media.
 network.
+pdfjs. (Firefox 84, Firefox ESR 78.6)
 places.
 print.
 signon. (Firefox 83, Firefox ESR 78.5)
+spellchecker. (Firefox 84, Firefox ESR 78.6)
 ui.
 widget.
 ```
@@ -4010,7 +4023,7 @@ OMA-URI:
 Value (string):
 ```
 <enabled/>
-<data id="Preferences" value='
+<data id="JSON" value='
 {
   "accessibility.force_disabled": {
     "Value": 1,
@@ -4475,6 +4488,70 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Locked = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/A_SanitizeOnShutdown_Cache
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/B_SanitizeOnShutdown_Cookies
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/C_SanitizeOnShutdown_Downloads
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/D_SanitizeOnShutdown_FormData
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/E_SanitizeOnShutdown_History
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/F_SanitizeOnShutdown_Sessions
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/G_SanitizeOnShutdown_SiteSettings
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/H_SanitizeOnShutdown_OfflineApps
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/I_SanitizeOnShutdown_Locked
 ```
 Value (string):