Merge pull request #979 from CLiX-1/patch-1

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 960fbd60d3491a3dc918665511d0adb32f163c5b..af46f0fa8c51fcf3a5c0cee612eb9fce5cd7e5cc 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2379,6 +2379,7 @@ OMA-URI:
 ```
 Value (string):
 ```
 ```
 Value (string):
 ```

+<enabled/>

 <data id="TrackingProtection_Exceptions" value="1&#xF000;https://example.com"/>
 ```
 OMA-URI:
 <data id="TrackingProtection_Exceptions" value="1&#xF000;https://example.com"/>
 ```
 OMA-URI:


@@ -4888,6 +4889,8 @@ Value (string):
 Configure proxy settings. These settings correspond to the connection settings in Firefox preferences.
 To specify ports, append them to the hostnames with a colon (:).
 
 Configure proxy settings. These settings correspond to the connection settings in Firefox preferences.
 To specify ports, append them to the hostnames with a colon (:).
 

+Unless you lock this policy, changes the user already has in place will take effect.
+

 `Mode` is the proxy method being used.
 
 `Locked` is whether or not proxy settings can be changed.
 `Mode` is the proxy method being used.
 
 `Locked` is whether or not proxy settings can be changed.


@@ -5728,7 +5731,7 @@ Value (string):
 <enabled/>
 <data id="SupportMenuTitle" value="Support Menu"/>
 <data id="SupportMenuURL" value="http://example.com/support"/>
 <enabled/>
 <data id="SupportMenuTitle" value="Support Menu"/>
 <data id="SupportMenuURL" value="http://example.com/support"/>

-<data id="SupportMenuAccessKey" value="S">
+<data id="SupportMenuAccessKey" value="S"/>

 ```
 #### macOS
 ```
 ```
 #### macOS
 ```