Merge branch 'main' into pm-firewall-reusable-settings

windows/security/operating-system-security/data-protection/bitlocker/network-unlock.md

@@ -46,7 +46,7 @@ The server side configuration to enable Network Unlock also requires provisionin
 The Network Unlock process follows these phases:
 
 :::row:::
-  :::column span="3":::
+  :::column span="2":::
     1. The Windows boot manager detects a Network Unlock protector in the BitLocker configuration
     2. The client computer uses its DHCP driver in the UEFI to get a valid IPv4 IP address
     3. The client computer broadcasts a vendor-specific DHCP request that contains a network key (a 256-bit intermediate key) and an AES-256 session key for the reply. The network key is encrypted by using the 2048-bit RSA Public Key of the Network Unlock certificate from the WDS server
@@ -57,8 +57,8 @@ The Network Unlock process follows these phases:
     8. This combined key is used to create an AES-256 key that unlocks the volume
     9. Windows continues the boot sequence
   :::column-end:::
-  :::column span="1":::
-    :::image type="content" source="images/network-unlock-diagram.png" alt-text="Diagram of the Network Unlock sequence." lightbox="images/network-unlock-diagram.png" border="false":::
+  :::column span="2":::
+    :::image type="content" source="images/network-unlock-diagram.svg" alt-text="Diagram of the Network Unlock sequence." lightbox="images/network-unlock-diagram.svg" border="false":::
   :::column-end:::
 :::row-end:::
 

windows/security/operating-system-security/data-protection/bitlocker/operations-guide.md

@@ -230,7 +230,7 @@ Add the desired protectors prior to encrypting the volume. The following example
 ```powershell
 $pw = Read-Host -AsSecureString
 <user inputs password>
-Enable-BitLockerKeyProtector E: -PasswordProtector -Password $pw
+Add-BitLockerKeyProtector E: -PasswordProtector -Password $pw
 ```
 
 > [!NOTE]

windows/security/operating-system-security/network-security/windows-firewall/configure-logging.md

@@ -47,7 +47,7 @@ Alternatively, you can configure devices using a [custom policy][INT-1] with the
 | *Public* | Setting name: [EnableLogSuccessConnections][CSP-10]<br>OMA-URI: `./Vendor/MSFT/Firewall/MdmStore/PublicProfile/EnableLogSuccessConnections` |
 | *Public* | Setting name: [LogMaxFileSize][CSP-13]<br>OMA-URI: `./Vendor/MSFT/Firewall/MdmStore/PublicProfile/LogMaxFileSize` |
 
-# [:::image type="icon" source="../../../images/icons/group-policy.svg" border="false"::: **Group policy**](#tab/gpo)
+# [:::image type="icon" source="../../../images/icons/group-policy.svg" border="false"::: **GPO**](#tab/gpo)
 
 [!INCLUDE [gpo-settings-1](../../../../../includes/configure/gpo-settings-1.md)]
 

windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/images/icons/group-policy.svg

@@ -1,3 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 2048 2048">
-  <path d="M1792 0q53 0 99 20t82 55 55 81 20 100q0 53-20 99t-55 82-81 55-100 20h-128v1280q0 53-20 99t-55 82-81 55-100 20H256q-53 0-99-20t-82-55-55-81-20-100q0-53 20-99t55-82 81-55 100-20V256q0-53 20-99t55-82 81-55T512 0h1280zM128 1792q0 27 10 50t27 40 41 28 50 10h930q-34-60-34-128t34-128H256q-27 0-50 10t-40 27-28 41-10 50zm1280 128q27 0 50-10t40-27 28-41 10-50V256q0-68 34-128H512q-27 0-50 10t-40 27-28 41-10 50v1280h1024q26 0 45 19t19 45q0 26-19 45t-45 19q-25 0-49 9t-42 28q-18 18-27 42t-10 49q0 27 10 50t27 40 41 28 50 10zm384-1536q27 0 50-10t40-27 28-41 10-50q0-27-10-50t-27-40-41-28-50-10q-27 0-50 10t-40 27-28 41-10 50v128h128zm-1280 0h896v128H512V384zm0 256h256v128H512V640zm0 256h256v128H512V896zm0 256h256v128H512v-128zm640-512q53 0 99 20t82 55 55 81 20 100q0 17-4 33t-4 31v539l-248-124-248 124V960q0-14-4-30t-4-34q0-53 20-99t55-82 81-55 100-20zm0 128q-27 0-50 10t-40 27-28 41-10 50q0 27 10 50t27 40 41 28 50 10q27 0 50-10t40-27 28-41 10-50q0-27-10-50t-27-40-41-28-50-10zm136 549v-204q-30 20-65 29t-71 10q-36 0-71-9t-65-30v204l136-68 136 68z" fill="#0078D4" />
-</svg>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="17.2" height="18" fill="url(#pattern0)"/>
+<defs>
+<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_48_118" transform="scale(0.0232558 0.0222222)"/>
+</pattern>
+<image id="image0_48_118" width="43" height="45" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAtCAYAAAA3BJLdAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAB3RJTUUH6AECFiANUjRVqQAABPtJREFUWAnNWTGP5DQUfoOClEhbZNAVM4jiVqLgCoq7q/YKJHZFwehoVnfNCQq0Es1BR3c12gLtT+A3UEFJCSUFEjRI2+1sMdpEYkQi7Ujhe2/GsZPYiT07s8LSTGzn+b3P7z2/ZzujqqrIVS7O31RnXzynclW4SPbXvyIqVrnwT+KYJg9no5EL7MX331XHHz+mR+9PiTCQqNwfsBbnEqL4V6zmeJNBfk6//3FDTrCXf/9WTR+khEndb4FicgDNFjkl0ZyKck7l8orig3cpciEZH8QACqROCtfIu/WXqwQMoE3SrldiAuUy70J59fK0evHqBc0+Ob53oEQxzJ+JVvP5X5TTlYCc5xkUN+6CffrkKR0fHa21ejclbTU6gw9cL2D+/Aq+eg3wBWVL9P152QUrEmRBbSXrzoNymDvLMtFoHLEbppTg8eb8YnTPHjk8F9bk7LOzEdFZh9gbbIlYwoysZQtLpCkWEmsuoDjAInYwAONtvshofr0O0sKfVyhXbjketiYxBD5O6MmHE0pTG1jhKiLafwac9qtmO03HWKxgLkCYoRLEE0sbxC3ojXfc4OAUA3Bo8QYbI+5O8NtrYUX0WOWtvQoPZu52AWblrdkcgZljYKNstFCu7P0NWrMBdzp8bxwcywfAahDraIC2CQxghcIwXbttYlT1mCPLBOlcdXg+B8BqLpMHsWP1apqQWuwtWXP1HxIltI0ALeruNW+wkhAMcyvRvCPqFu0+3XfcAysd4AEFhBRvsDn2l/OFAWIDUsDe6sgqNesENKwkSejRB5wUdJ9PrQesAQycOM5ObUsCwIp2/wBYjkHbbOp7wGpt8awlNTo1EbqulR6bMlSv6/k/SwoMs2lRE3iPZk0ynIuQEEpsgjkddvTRNjvabpFwAUidcpwNTN/eYBkoZ7B69RsA5aiO3Zd3eTuhMeJ2qPN4g+1PCi1nNiZinQCk2hdYnz289gYbBlBDqCasQBud/eAapGgMaBbMFAWqnQ1Lm5tqe2kWU1e8edzQGJCY5EqU9XmNhJBtkkLtt0wJIZ3rpQH/jSUpwFLWk4JVvHR6g2UfG29cs2hrQS4mtJDGZHR3XZM9hrfkepiHZjfA1klhx17bnnRvwBtyA2EWtgi0HkJrw4qwGsMGL8/hm3y1x8XQiM/GZT3I+IfUKfw15p1Xp9ikr4msYOWVOhFsKDgpzAGY1LF7A1hYy3HckGpMxuitq3zDIhd/dQ9X3CAVmRMsD8U1maKjlDOOaGLYXKbmawZmBVJ3lBT+BVsNUgnmFWw3m4kisG5awKk2zdNOYjIxgetx+6k15HZFdMA2YyRruLPH6nLZRU8N1C2vA5blFlhcKS7hsMdCy3CJXYBq8ahXAJCIom7d8jpgJbsw0JKXPgaq1d8S4tU0udeaM0ZuDowMUuSyFVV4NMhUVdi9/uasOjl+Jn2zT0+w1+TbkrCTp2IY8uQTs1weLy6RnkoJZ0V542QRnb6cVV9/9Tk9O3qsiTCF2jxGTRPspsYa5W9d+T83EiYLekdv7i0ioovzb2kqmnT5iqvfwi2kawV1AKxkRawR3n7mGbTac8Ec0RIfGSKYgTHZ/CoEQCAtZ0X+ZJRxLue1wT4cT5xc5KPdLz++rg6n2vBO6l2+gKuxVnE5iRt1fPAA7xhgT7/8Ad8T7EUW2E8//0onHx3aKfbcy4s/W0JR0ZiKOO2V9h92paXIkgWrzgAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>