Merge pull request #722 from petercpg/1217_zhtw

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 4367e950b7d0f93de9067a0d884231cc11854f67..d12ecc51728d10552060f4cd4b70c3ce3a6a4c5a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -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.
 
 
 `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`\
 
 **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/>
 Value (string):
 ```
 <enabled/>

-<data id="ManagedBookmarks" value='
+<data id="JSON" value='

 [
   {
     "toplevel_name": "My managed bookmarks folder"
 [
   {
     "toplevel_name": "My managed bookmarks folder"


@@ -3803,7 +3803,7 @@ Value (string):
 ```
 ### PictureInPicture
 
 ```
 ### 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\
 
 **Compatibility:** Firefox 78, Firefox ESR 78\
 **CCK2 Equivalent:** N/A\


@@ -3811,12 +3811,15 @@ Enable or disable Picture-in-Picture.
 
 #### Windows (GPO)
 ```
 
 #### 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:
 ```
 ```
 #### 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):
 ```
 ```
 Value (string):
 ```


@@ -3826,14 +3829,22 @@ Value (string):
 ```
 <dict>
   <key>PictureInPicture</key>
 ```
 <dict>
   <key>PictureInPicture</key>

-  <true/> | <false/>
+  <dict>
+    <key>Enabled</key>
+    <true/> | <false/>
+    <key>Locked</key>
+    <true/> | <false/>
+  </dict>

 </dict>
 ```
 #### policies.json
 ```
 {
   "policies": {
 </dict>
 ```
 #### policies.json
 ```
 {
   "policies": {

-    "PictureInPicture": true | false
+    "PictureInPicture": {
+      "Enabled": true | false,
+      "Locked": true, false
+    }

   }
 }
 ```
   }
 }
 ```


@@ -3934,9 +3945,11 @@ intl.
 layout.
 media.
 network.
 layout.
 media.
 network.

+pdfjs. (Firefox 84, Firefox ESR 78.6)

 places.
 print.
 signon. (Firefox 83, Firefox ESR 78.5)
 places.
 print.
 signon. (Firefox 83, Firefox ESR 78.5)

+spellchecker. (Firefox 84, Firefox ESR 78.6)

 ui.
 widget.
 ```
 ui.
 widget.
 ```