From: Kirk <bytesized@users.noreply.github.com>
Date: Tue, 21 Aug 2018 16:35:05 +0000 (-0700)
Subject: Merge branch 'master' into patch-1
X-Git-Tag: v1.2~22^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/226de696757b5f6239fd3a74a79ed32c3add4fde?ds=sidebyside;hp=--cc

Merge branch 'master' into patch-1
---

226de696757b5f6239fd3a74a79ed32c3add4fde
diff --cc README.md
index 2d075a6,e6dbcbc..f3a481d
--- a/README.md
+++ b/README.md
@@@ -310,9 -310,9 +310,9 @@@ If Value is set to true, private browsi
      }
  }
  ```
 -### Extensions (ESR only)
 +### Extensions (Machine only)
- This policy controls the install, uninstall and locking of extensions. Locked extensions cannot be disabled or uninstalled.
- For Install, you can specify a list of URLs or paths.
+ This policy controls the installation, uninstallation and locking of extensions. Locked extensions cannot be disabled or uninstalled.
+ For Install, you specify a list of URLs or paths.
  For Uninstall and Locked, you specify extension IDs.
  ```
  {
@@@ -397,8 -397,8 +397,8 @@@ This policy sets the behavior of Flash 
    }
  }
  ```
 -### OverrideFirstRunPage (ESR only)
 +### OverrideFirstRunPage (Machine only)
- This policy allowed you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
+ This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
  ```
  {
    "policies": {
@@@ -406,8 -406,8 +406,8 @@@
    }
  }
  ```
 -### OverridePostUpdatePage (ESR only)
 +### OverridePostUpdatePage (Machine only)
- This policy allowed you to override the upgrade page page. If you leave the URL blank, the upgrade page will not be displayed.
+ This policy allows you to override the upgrade page. If you leave the URL blank, the upgrade page will not be displayed.
  ```
  {
    "policies": {
@@@ -476,8 -476,8 +476,8 @@@ This policy can be used to determine i
    }
  }
  ```
 -### WebsiteFilter (ESR only)
 +### WebsiteFilter (Machine only)
- Blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. The arrays are limited to 1000 entries each.
+ This policy blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. The arrays are limited to 1000 entries each.
  ```
  {
    "policies": {