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 3e0aa48e66a72022648cbabd782b673d74bc8ff7..5324d51a8dd6a1681b57c05fdf29c86ccd5d53d1 100644 (file)
--- 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 576c4da2e2697d2b13d2f71649d55f1a8f4f4332..518723180f616945ba56b21b2010283c1c16676f 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -328,7 +328,7 @@
                <key>Locked</key>
                <true/>
        </dict>
-       <key>FirefoxHome</key>
+       <key>FirefoxSuggest</key>
        <dict>
                <key>WebSuggestions</key>
                <true/>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 9fc6046d2947ff83cc9fe0a218d8c904c4095f42..a81c870f2655f107cd9b5e051cfeb28d3ee27f55 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="7.6" schemaVersion="1.0">
+<policyDefinitionResources revision="7.7" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index abbf649634c7ae32f4619a4f70fe1938d7004f4e..2de8141b6a3fb2cc987bb944b39c54e14f38f6b4 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="7.6" schemaVersion="1.0">
+<policyDefinitionResources revision="7.7" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 8981f135284ddc943e56cffa63185ed639c4d210..49b74cef63ab71b3a474f302f75c1ffd92bd15d9 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="7.6" schemaVersion="1.0">
+<policyDefinitions revision="7.7" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="7.6"/>
+  <resources minRequiredRevision="7.7"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index b24cd4a46541efee4f2ca28e0a803fc002d1ae36..35497606bf16f8e360d17e292c07f5d27854df6a 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="7.6" schemaVersion="1.0">
+<policyDefinitionResources revision="7.7" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 2f5e45ab8f5c1fed89f58b24532b2b1216991ad7..245edb5df828853be2f7969e56af3627d6c50680 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="7.6" schemaVersion="1.0">
+<policyDefinitionResources revision="7.7" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>