From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 4 Feb 2026 14:37:09 +0000 (-0500)
Subject: Merge pull request #1293 from bsmth/readme
X-Git-Tag: v7.8~4
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9443a124ae6a271d307b2df6bc106613c5f911fa?hp=17b72617b35c1422bcbfe7c85977fbbee5699e60
Merge pull request #1293 from bsmth/readme
chore: Update README to point to new docs site
---
diff --git a/docs/index.md b/docs/index.md
index 3e0aa48..5324d51 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -316,7 +316,7 @@ Value (string):
Prevent Firefox from being updated beyond the specified version.
-You can specify the any version as ```xx.``` and Firefox will be updated with all minor versions, but will not be updated beyond the major version.
+You can specify the version as ```xx.``` and Firefox will be updated with all minor versions, but will not be updated beyond the major version.
You can also specify the version as ```xx.xx.``` and Firefox will be updated with all patch versions, but will not be updated beyond the minor version.
@@ -2965,7 +2965,7 @@ IF `BaselineExceptions` is true, Firefox will automatically apply exceptions req
If `ConvenienceExceptions`is true, Firefox will apply exceptions automatically that are only required to fix minor issues and make convenience features available. (Firefox 145)
-Note: Users can change `BaselineExceptions` and `ConvenienceExceptions` even when `Category` is set to ```strict``` unless `Locked` is set to true.
+Note: Users can change `BaselineExceptions` and `ConvenienceExceptions` even when `Category` is set to ```strict``` unless `Locked` is set to true. If `Locked` is set to true, the defaults are used unless a different value is specified in policy for `BaselineExceptions` and `ConvenienceExceptions`.
**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5. Category added in Firefox 142/140.2. BaselineExceptions and ConvenienceExceptions added in Firefox 145)\
**CCK2 Equivalent:** N/A\
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 576c4da..5187231 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -328,7 +328,7 @@
Locked
- FirefoxHome
+ FirefoxSuggest
WebSuggestions
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 9fc6046..a81c870 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
-
+
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index abbf649..2de8141 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
-
+
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 8981f13..49b74ce 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index b24cd4a..3549760 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
-
+
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 2f5e45a..245edb5 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1,5 +1,5 @@
-
+