Add Simplified Chinese Language Files

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 70d83886adab470e78ad612a9f46f06915be6b5e..c4427eb7616fb0ba375e2580e0ba222dba134c18 100644 (file)
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 
 Enable or disable **automatic** application update.
 
-If set to true, application updates are installed without user approval.
+If set to true, application updates are installed without user approval within Firefox. The operating system might still require approval.
 
 If set to false, application updates are downloaded but the user can choose when to install the update.
 
@@ -141,7 +141,7 @@ Value (string):
 ```
 ### AppUpdateURL
 
-Change the URL for application update.
+Change the URL for application update if you are providing Firefox updates from a custom update server.
 
 **Compatibility:** Firefox 62, Firefox ESR 60.2\
 **CCK2 Equivalent:** N/A\
@@ -466,6 +466,8 @@ Value (string):
 ```
 ### Bookmarks
 
+Note: [`ManagedBookmarks`](#managedbookmarks) is the new recommended way to add bookmarks. This policy will continue to be supported.
+
 Add bookmarks in either the bookmarks toolbar or menu. Only `Title` and `URL` are required. If `Placement` is not specified, the bookmark will be placed on the toolbar. If `Folder` is specified, it is automatically created and bookmarks with the same folder name are grouped together.
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
@@ -902,7 +904,7 @@ Value (string):
 }
 ```
 ### DisableAppUpdate
-Turn off application updates.
+Turn off application updates within Firefox.
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **CCK2 Equivalent:** `disableFirefoxUpdates`\
@@ -1070,6 +1072,8 @@ Value (string):
 ### DisableDefaultBrowserAgent
 Prevent the default browser agent from taking any actions. Only applicable to Windows; other platforms don’t have the agent.
 
+The browser agent is a Windows-only scheduled task which runs in the background to collect and submit data about the browser that the user has set as their OS default. More information is available [here](https://firefox-source-docs.mozilla.org/toolkit/mozapps/defaultagent/default-browser-agent/index.html).
+
 **Compatibility:** Firefox 75, Firefox ESR 68.7 (Windows only)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
@@ -2265,13 +2269,13 @@ The configuration for each extension is another dictionary that can contain the
 | `blocked_install_message` | This maps to a string specifying the error message to display to users if they're blocked from installing an extension. This setting allows you to append text to the generic error message displayed when the extension is blocked. This could be be used to direct users to your help desk, explain why a particular extension is blocked, or something else. This setting can be used only for the default configuration.
 | `restricted_domains` | An array of domains on which content scripts can't be run. This setting can be used only for the default configuration.
 
-**Compatibility:** Firefox 69, Firefox ESR 68.1\
+**Compatibility:** Firefox 69, Firefox ESR 68.1 (As of Firefox 85, Firefox ESR 78.7, installing a theme makes it the default.)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
 #### Windows (GPO)
-```
 Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) =
+```
 {
   "*": {
     "blocked_install_message": "Custom error message.",
@@ -2511,8 +2515,8 @@ Within each handler type, you specify the given mimeType/extension/scheme as a k
 **Preferences Affected:** N/A
 
 #### Windows (GPO)
-```
 Software\Policies\Mozilla\Firefox\Handlers (REG_MULTI_SZ) =
+```
 {
   "mimeTypes": {
     "application/msword": {
@@ -3029,8 +3033,8 @@ The syntax of this policy is exactly the same as the [Chrome ManagedBookmarks po
 **Preferences Affected:** N/A
 
 #### Windows (GPO)
-```
 Software\Policies\Mozilla\Firefox\ManagedBookmarks (REG_MULTI_SZ) =
+```
 [
   {
     "toplevel_name": "My managed bookmarks folder"
@@ -3803,7 +3807,7 @@ Value (string):
 ```
 ### PictureInPicture
 
-Enable or disable Picture-in-Picture as well as lock it.
+Enable or disable Picture-in-Picture as well as prevent the user from enabling or disabling it (Locked).
 
 **Compatibility:** Firefox 78, Firefox ESR 78\
 **CCK2 Equivalent:** N/A\
@@ -3998,8 +4002,8 @@ Status
 **Preferences Affected:** Many
 
 #### Windows (GPO)
-```
 Software\Policies\Mozilla\Firefox\Preferences (REG_MULTI_SZ) =
+```
 {
   "accessibility.force_disabled": {
     "Value": 1,
@@ -4023,7 +4027,7 @@ OMA-URI:
 Value (string):
 ```
 <enabled/>
-<data id="Preferences" value='
+<data id="JSON" value='
 {
   "accessibility.force_disabled": {
     "Value": 1,