Merge pull request #693 from CLiX90/patch-1

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 9fbfc367085dbe5915410ed7f8642587c058515b..2f5dd30479bf6acdcf1146d45638d41e7e6ffdc7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 | **[`PictureInPicture`](#pictureinpicture)** | Enable or disable Picture-in-Picture.
 | **[`PopupBlocking`](#popupblocking)** | Configure the default pop-up window policy as well as origins for which pop-up windows are allowed.
 | **[`Preferences`](#preferences)** | Set and lock preferences.
 | **[`PictureInPicture`](#pictureinpicture)** | Enable or disable Picture-in-Picture.
 | **[`PopupBlocking`](#popupblocking)** | Configure the default pop-up window policy as well as origins for which pop-up windows are allowed.
 | **[`Preferences`](#preferences)** | Set and lock preferences.

-| **[`Preferences (Deprecated)`](#preferences--deprecated)** | Set and lock some preferences.
+| **[`Preferences (Deprecated)`](#preferences-deprecated)** | Set and lock some preferences.

 | **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading.
 | **[`Proxy`](#proxy)** | Configure proxy settings.
 | **[`RequestedLocales`](#requestedlocales)** | Set the the list of requested locales for the application in order of preference.
 | **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading.
 | **[`Proxy`](#proxy)** | Configure proxy settings.
 | **[`RequestedLocales`](#requestedlocales)** | Set the the list of requested locales for the application in order of preference.


@@ -1592,7 +1592,7 @@ Value (string):
   <dict>
     <key>InvalidCertificate</key>
     <true/> | <false/>
   <dict>
     <key>InvalidCertificate</key>
     <true/> | <false/>

-    <key><SafeBrowsing/key>
+    <key>SafeBrowsing</key>

     <true/> | <false/>
   </dict>
 </dict>
     <true/> | <false/>
   </dict>
 </dict>


@@ -2071,11 +2071,11 @@ Value (string):
   <dict>
     <key>Value</key>
     <true/> | <false/>
   <dict>
     <key>Value</key>
     <true/> | <false/>

-    <key><Locked</key>
+    <key>Locked</key>

     <true/> | <false/>
     <true/> | <false/>

-    <key><Cryptomining</key>
+    <key>Cryptomining</key>

     <true/> | <false/>
     <true/> | <false/>

-    <key><Fingerprinting</key>
+    <key>Fingerprinting</key>

     <true/> | <false/>
     <key>Exceptions</key>
     <array>
     <true/> | <false/>
     <key>Exceptions</key>
     <array>


@@ -2130,7 +2130,7 @@ Value (string):
   <dict>
     <key>Enabled</key>
     <true/> | <false/>
   <dict>
     <key>Enabled</key>
     <true/> | <false/>

-    <key><Locked</key>
+    <key>Locked</key>

     <true/> | <false/>
   </dict>
 </dict>
     <true/> | <false/>
   </dict>
 </dict>


@@ -3343,7 +3343,7 @@ Value (string):
   <dict>
     <key>Enabled</key>
     <true/> | <false/>
   <dict>
     <key>Enabled</key>
     <true/> | <false/>

-    <key><EnablePermissions</key>
+    <key>EnablePermissions</key>

     <true/> | <false/>
   </dict>
 </dict>
     <true/> | <false/>
   </dict>
 </dict>


@@ -3787,9 +3787,13 @@ Using the preference as the key, set the `Value` to the corresponding preference
 
 `Status` can be "default", "locked", "user" or "clear"
 
 
 `Status` can be "default", "locked", "user" or "clear"
 

+Default preferences can be modified by the user.
+

 If a value is locked, it is also set as the default.
 
 If a value is locked, it is also set as the default.
 

-User preferences persist across invocations of Firefox.
+User preferences persist across invocations of Firefox. It is the equivalent of a user setting the preference. They are most useful when a preference is needed very early in startup so it can't be set as default by policy.
+
+User preferences persist even if the policy is removed, so if you need to remove them, you should use the clear policy.

 
 See the examples below for more detail.
 
 
 See the examples below for more detail.