From: Michael Kaply <consulting@kaply.com>
Date: Fri, 31 Aug 2018 17:00:08 +0000 (-0700)
Subject: Merge pull request #219 from jeffreymcclain/patch-1
X-Git-Tag: v1.2~17
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/f7bcc751ad94b921dde261df10293b65caa02af2?hp=348ff87574d059b66c5f9a659c2818cd940e8b29

Merge pull request #219 from jeffreymcclain/patch-1

Fixed Typos
---

diff --git a/README.md b/README.md
index c0d8424..9e54f14 100644
--- a/README.md
+++ b/README.md
@@ -306,7 +306,7 @@ If this policy is not configured, tracking protection is not enabled by default
 
 If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
 
-If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
+If Value is set to true, tracking protection is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
 ```
 {
   "policies": {
@@ -397,7 +397,7 @@ This policy sets the behavior of Flash on the specified domains, as well as the
     "FlashPlugin": {
       "Allow": ["http://example.org/"], /* Sites on the allow list do not override Flash being completely disabled */
       "Block": ["http://example.edu/"],
-      "Default": [true|false], /* If this is set to true, flash is always enabled. If it is set to false, Flash is never enabled */
+      "Default": [true|false], /* If this is set to true, Flash is always enabled. If it is set to false, Flash is never enabled */
       "Locked": [true|false]
     }
   }
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index b58c9cb..18b353c 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -228,7 +228,7 @@ If this policy is disabled or not configured, the default Flash policy is follow
 
 If this policy is disabled or not configured, the default Flash policy is followed.</string>
       <string id="FlashPlugin_Default">Activate Flash on websites</string>
-      <string id="FlashPlugin_Default_Explain">If this policy is enabled, Flash is always activates on websites.
+      <string id="FlashPlugin_Default_Explain">If this policy is enabled, Flash is always activated on websites.
 
 If this policy is disabled, Flash is never activated on websites, even if they are in the specified in the Allow list.