Remove pipes in samples

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index d31a81a559f45454107bafa53ab8c71ffade2566..94218250d90e6d21d2d6de608bc72875a28833b5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed.
 | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation.
 | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin.
 | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed.
 | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation.
 | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin.

-| **[`MasterPassword`](#masterpassword)** | Require or prevent using a master password.

 | **[`NetworkPrediction`](#networkprediction)** | Enable or disable network prediction (DNS prefetching).
 | **[`NewTabPage`](#newtabpage)** | Enable or disable the New Tab page.
 | **[`NoDefaultBookmarks`](#nodefaultbookmarks)** | Disable the creation of default bookmarks.
 | **[`NetworkPrediction`](#networkprediction)** | Enable or disable network prediction (DNS prefetching).
 | **[`NewTabPage`](#newtabpage)** | Enable or disable the New Tab page.
 | **[`NoDefaultBookmarks`](#nodefaultbookmarks)** | Disable the creation of default bookmarks.


@@ -569,6 +568,8 @@ Value (string):
 
 Trust certificates that have been added to the operating system certificate store by a user or administrator.
 
 
 Trust certificates that have been added to the operating system certificate store by a user or administrator.
 

+Note: This policy only works on Windows and macOS. For Linux discussion, see [bug 1600509](https://bugzilla.mozilla.org/show_bug.cgi?id=1600509).
+

 See https://support.mozilla.org/kb/setting-certificate-authorities-firefox for more detail.
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (macOS support in Firefox 63, Firefox ESR 68)\
 See https://support.mozilla.org/kb/setting-certificate-authorities-firefox for more detail.
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (macOS support in Firefox 63, Firefox ESR 68)\


@@ -2127,6 +2128,34 @@ Software\Policies\Mozilla\Firefox\Extensions\Install\2 = "//path/to/xpi"
 Software\Policies\Mozilla\Firefox\Extensions\Uninstall\1 = "bad_addon_id@mozilla.org"
 Software\Policies\Mozilla\Firefox\Extensions\Locked\1 = "addon_id@mozilla.org"
 ```
 Software\Policies\Mozilla\Firefox\Extensions\Uninstall\1 = "bad_addon_id@mozilla.org"
 Software\Policies\Mozilla\Firefox\Extensions\Locked\1 = "addon_id@mozilla.org"
 ```

+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Install
+```
+Value (string):
+```
+<enabled/>
+<data id="Extensions" value="1&#xF000;https://addons.mozilla.org/firefox/downloads/somefile.xpi&#xF000;2&#xF000;//path/to/xpi"/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Uninstall
+```
+Value (string):
+```
+<enabled/>
+<data id="Extensions" value="1&#xF000;bad_addon_id@mozilla.org"/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Locked
+```
+Value (string):
+```
+<enabled/>
+<data id="Extensions" value="1&#xF000;addon_id@mozilla.org"/>
+```

 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>


@@ -2903,43 +2932,6 @@ Value (string):
   }
 }
 ```
   }
 }
 ```

-### MasterPassword
-Require or prevent using a master password.
-
-If this value is true, a master password is required. If this values is false, it works the same as `DisableMasterPasswordCreation` and removes the master password functionality.
-
-**Compatibility:** Firefox 78, Firefox ESR 78\
-**CCK2 Equivalent:** `noMasterPassword`\
-**Preferences Affected:** N/A
-
-#### Windows (GPO)
-```
-Software\Policies\Mozilla\Firefox\MasterPassword = 0x1 | 0x0
-```
-#### Windows (Intune)
-OMA-URI:
-```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/MasterPassword
-```
-Value (string):
-```
-<enabled/> or <disabled/>
-```
-#### macOS
-```
-<dict>
-  <key>MasterPassword</key>
-  <true/> | <false/>
-</dict>
-```
-#### policies.json
-```
-{
-  "policies": {
-    "MasterPassword": true | false
-  }
-}
-```

 ### NetworkPrediction
 Enable or disable network prediction (DNS prefetching).
 
 ### NetworkPrediction
 Enable or disable network prediction (DNS prefetching).
 


@@ -3745,6 +3737,15 @@ Value (string):
 ```
 <enabled/> or <disabled/>
 ```
 ```
 <enabled/> or <disabled/>
 ```

+OMA-URI: (periods are replaced by underscores)
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/string_preference_name
+```
+Value (string):
+```
+<enabled/>
+<data id="Preferences_String" value="string_value"/>
+```

 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>