From: Michael Kaply <consulting@kaply.com>
Date: Tue, 18 Dec 2018 16:21:18 +0000 (-0600)
Subject: Merge pull request #314 from bp88/patch-4
X-Git-Tag: v1.6~9
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/0f363aafa2642f56ad3b376e8971b4f04bcb94e1?hp=a10cf5f4bc71db2897cdb7265c11d2136354630e

Merge pull request #314 from bp88/patch-4

Add clarification to Certificates description
---

diff --git a/README.md b/README.md
index 21ef1ad..69ccf0b 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,13 @@ same folder name are grouped together.
 }
 ```
 ### Certificates
-This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows. Certificates can be located in the following locations:
+This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows.
+
+The ImportEnterpriseRoots key will cause Firefox to import from the system certificate store.
+
+The Install key by default will search for certificates in the locations listed below. Starting in Firefox 65, you can specify a fully qualified path (see cert3.der and cert4.pem in example). If Firefox does not find something at your fully qualified path, it will search the default directories.
+
+Certificates can be located in the following locations:
 - Windows
   - %USERPROFILE%\AppData\Local\Mozilla\Certificates
   - %USERPROFILE%\AppData\Roaming\Mozilla\Certificates
@@ -107,15 +113,14 @@ This policy can be used to install certificates or to read certificates from the
   - /usr/lib/mozilla/certificates
   - /usr/lib64/mozilla/certificates
   - ~/.mozilla/certificates
- 
-In Firefox 65, you can specify a fully qualified path.
+
 
 ```
 {
   "policies": {
     "Certificates": {
       "ImportEnterpriseRoots": true,
-      "Install": ["cert1.der", "cert2.pem"]
+      "Install": ["cert1.der", "cert2.pem", "%SYSTEMDRIVE%\Company\cert3.der", "/Library/Company/cert4.pem"]
     }
   }
 }