Merge branch 'mozilla:master' into master

[policy-templates.git] / mac / README.md

diff --git a/mac/README.md b/mac/README.md
index 9fa0ac11541e5540699968fc9ec68472075c5a80..ca56ca6f136af199a721bc35463d03b34a09de28 100644 (file)
--- a/mac/README.md
+++ b/mac/README.md
@@ -1,6 +1,4 @@
-**IMPORTANT**: These files are in active development along with the policies in Firefox. To get the policy information that corresponds to a specific release, go to https://github.com/mozilla/policy-templates/releases.
-
-Starting with Firefox 64 and Firefox ESR 60.4, Firefox supports configuration files on macOS.
+**IMPORTANT**: To use enterprise policies on macOS, you must set the `EnterprisePoliciesEnabled` policy.

 
 An example plist file with all options is available here:
 
 
 An example plist file with all options is available here:
 


@@ -9,7 +7,7 @@ https://github.com/mozilla/policy-templates/blob/master/mac/org.mozilla.firefox.
 If you want to set specific options from the command line, we also provide flattened shortcuts to any item that is nested in the plist file.
 
 For example, this policy:
 If you want to set specific options from the command line, we also provide flattened shortcuts to any item that is nested in the plist file.
 
 For example, this policy:

-```
+```json

 {
   "policies": {
     "Homepage": {
 {
   "policies": {
     "Homepage": {


@@ -19,14 +17,14 @@ For example, this policy:
 }
 ```
 which would be set in the plist file like this:
 }
 ```
 which would be set in the plist file like this:

+```xml
+<key>Homepage</key>
+<dict>
+  <key>URL</key>
+  <string>http://example.com</string>
+</dict>

 ```
 ```

-  <key>Homepage</key>
-  <dict>
-    <key>URL</key>
-    <string>http://example.com</string>
-  </dict>
-```
-As correctly writing nested values with the `defaults` command can be hard, Firefox also supports writing nested values by separating them with `__`, like this:
+Correctly writing the nested value with the `defaults` command can be hard, so you can flatten the keys by separating them with `__`, like this:

 ```bash
 sudo defaults write /Library/Preferences/org.mozilla.firefox Homepage__URL -string "http://example.com"
 ```
 ```bash
 sudo defaults write /Library/Preferences/org.mozilla.firefox Homepage__URL -string "http://example.com"
 ```


@@ -34,3 +32,8 @@ Before any command line policies will work, you need to enable policies like thi
 ```bash
 sudo defaults write /Library/Preferences/org.mozilla.firefox EnterprisePoliciesEnabled -bool TRUE
 ```
 ```bash
 sudo defaults write /Library/Preferences/org.mozilla.firefox EnterprisePoliciesEnabled -bool TRUE
 ```

+If you want to set user specific policies, use ~/Library without sudo:
+```bash
+defaults write ~/Library/Preferences/org.mozilla.firefox EnterprisePoliciesEnabled -bool TRUE
+defaults write ~/Library/Preferences/org.mozilla.firefox Homepage__URL -string "http://example.com"
+```