Merge pull request #1311 from mozilla/LocalNetworkAccess

[policy-templates.git] / docs / index.md

diff --git a/docs/index.md b/docs/index.md
index a7a4348816af9525a18f00e41bd79da4dbe0780a..e5dfe9a3f1bc1bda5d5035995f4ce2a54ea85fbc 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -1842,7 +1842,7 @@ Value (string):
       "IsPerUser": true | false,
       "PipePathName": "pipe_custom_name",
       "ShowBlockedResult": true | false,
       "IsPerUser": true | false,
       "PipePathName": "pipe_custom_name",
       "ShowBlockedResult": true | false,

-      "TimeoutResult": 0 | 1 | 2,
+      "TimeoutResult": 0 | 1 | 2

     }
   }
 }
     }
   }
 }


@@ -1983,7 +1983,7 @@ Value (string):
       "Block": ["http://example.edu/"],
       "Locked": true | false,
       "Behavior": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign",
       "Block": ["http://example.edu/"],
       "Locked": true | false,
       "Behavior": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign",

-      "BehaviorPrivateBrowsing": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign",
+      "BehaviorPrivateBrowsing": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign"

     }
   }
 }
     }
   }
 }


@@ -2174,7 +2174,7 @@ Value (string):
 {
   "policies": {
     "DisabledCiphers": {
 {
   "policies": {
     "DisabledCiphers": {

-      "CIPHER_NAME": true | false,
+      "CIPHER_NAME": true | false

     }
   }
 }
     }
   }
 }


@@ -3155,7 +3155,7 @@ Value (string):
       "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",
       "Locked": true | false,
       "ExcludedDomains": ["example.com"],
       "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",
       "Locked": true | false,
       "ExcludedDomains": ["example.com"],

-      "Fallback": true | false,
+      "Fallback": true | false

     }
   }
 }
     }
   }
 }


@@ -3260,7 +3260,7 @@ If `SuspectedFingerprinting` is set to true, Firefox reduces the amount of infor
 
 `Exceptions` are origins for which tracking protection is not enabled.
 
 
 `Exceptions` are origins for which tracking protection is not enabled.
 

-`Category` can be either ```strict``` or ```standard```. If category is set, it overrides all other settings except `Exceptions` and the user cannot change the category. (Firefox 142, Firefox ESR 140.2)
+`Category` can be either ```strict``` or ```standard```. If category is set, it overrides all other settings except `Exceptions`, `BaselineExceptions` and `ConvenienceExceptions`, and the user cannot change the category. (Firefox 142, Firefox ESR 140.2)

 
 IF `BaselineExceptions` is true, Firefox will automatically apply exceptions required to avoid major website breakage. (Firefox 145)
 
 
 IF `BaselineExceptions` is true, Firefox will automatically apply exceptions required to avoid major website breakage. (Firefox 145)