From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:46:08 +0000 (-0400)
Subject: Merge pull request #1108 from maltejur/bug1882559
X-Git-Tag: v5.12~14
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/36c2b82abefb68091e09a7610bebc2acfc4b5ed9?hp=-c

Merge pull request #1108 from maltejur/bug1882559

Add documentation for Mixed Content Level 2 and GPC prefs
---

36c2b82abefb68091e09a7610bebc2acfc4b5ed9
diff --combined windows/firefox.admx
index 8ae146e,d242e84..106c52e
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -1,10 -1,10 +1,10 @@@
  <?xml version="1.0" encoding="utf-8"?>
 -<policyDefinitions revision="5.10" schemaVersion="1.0">
 +<policyDefinitions revision="5.11" schemaVersion="1.0">
    <policyNamespaces>
      <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
      <using prefix="Mozilla" namespace="Mozilla.Policies"/>
    </policyNamespaces>
 -  <resources minRequiredRevision="5.10"/>
 +  <resources minRequiredRevision="5.11"/>
    <supportedOn>
      <definitions>
        <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@@ -3359,6 -3359,26 +3359,26 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="security_mixed_content_block_display_content" class="Both" displayName="$(string.security_mixed_content_block_display_content)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.mixed_content.block_display_content">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF127"/>
+       <enabledValue>
+         <decimal value="0"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="1"/>
+       </disabledValue>
+     </policy>
+     <policy name="security_mixed_content_upgrade_display_content" class="Both" displayName="$(string.security_mixed_content_upgrade_display_content)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.mixed_content.upgrade_display_content">
+       <parentCategory ref="Preferences"/>
+       <supportedOn ref="SUPPORTED_FF127"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="security_ssl_errorReporting_enabled" class="Both" displayName="$(string.security_ssl_errorReporting_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.ssl.errorReporting.enabled">
        <parentCategory ref="Preferences"/>
        <supportedOn ref="SUPPORTED_FF68"/>