diff --git a/.acrolinx-config.edn b/.acrolinx-config.edn index 64354d7a64..9f8eac523b 100644 --- a/.acrolinx-config.edn +++ b/.acrolinx-config.edn @@ -1,4 +1,4 @@ -{:allowed-branchname-matches ["master" "main"] +{:allowed-branchname-matches ["main"] :allowed-filename-matches ["windows/"] :targets diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index f9ebdac192..389a789ca5 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -405,13 +405,13 @@ { "path_to_root": "_themes.pdf", "url": "https://github.com/Microsoft/templates.docs.msft.pdf", - "branch": "master", + "branch": "main", "branch_mapping": {} }, { "path_to_root": "_themes", "url": "https://github.com/Microsoft/templates.docs.msft", - "branch": "master", + "branch": "main", "branch_mapping": {} } ], @@ -420,7 +420,7 @@ "Publish", "Pdf" ], - "master": [ + "main": [ "Publish", "Pdf" ] diff --git a/windows/client-management/mdm/surfacehub-csp.md b/windows/client-management/mdm/surfacehub-csp.md index e0a043830c..1bf5a8b231 100644 --- a/windows/client-management/mdm/surfacehub-csp.md +++ b/windows/client-management/mdm/surfacehub-csp.md @@ -31,7 +31,7 @@ SurfaceHub --------Email --------CalendarSyncEnabled --------ErrorContext ---------PasswordRotationPeriod +--------PasswordRotationEnabled ----MaintenanceHoursSimple --------Hours ------------StartTime diff --git a/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services-using-MDM.md b/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services-using-MDM.md index be4a1f0663..f12658e2d0 100644 --- a/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services-using-MDM.md +++ b/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services-using-MDM.md @@ -179,4 +179,4 @@ For Windows 10 and Windows 11, the following MDM policies are available in the [ |settings-win.data.microsoft.com| |msedge.api.cdp.microsoft.com| |\*.dl.delivery.mp.microsoft.com| - +|edge.microsoft.com| diff --git a/windows/security/identity-protection/hello-for-business/hello-faq.yml b/windows/security/identity-protection/hello-for-business/hello-faq.yml index a2c77ca4dd..27d44813f3 100644 --- a/windows/security/identity-protection/hello-for-business/hello-faq.yml +++ b/windows/security/identity-protection/hello-for-business/hello-faq.yml @@ -16,7 +16,7 @@ metadata: - highpri ms.topic: article localizationpriority: medium - ms.date: 10/15/2021 + ms.date: 02/21/2022 title: Windows Hello for Business Frequently Asked Questions (FAQ) summary: | @@ -26,6 +26,11 @@ summary: | sections: - name: Ignored questions: + + - question: What is Windows Hello for Business cloud trust? + answer: | + Windows Hello for Business cloud trust is a new trust model that is currently in preview. This trust model will enable Windows Hello for Business deployment using the infrastructure introduced for supporting [security key sign-in on Hybrid Azure AD joined devices and on-premises resource access on Azure AD Joined devices](/azure/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises). Cloud trust is the preferred deployment model if you do not need to support certificate authentication scenarios. For more information, see [Hybrid Cloud Trust Deployment (Preview)](/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-trust). + - question: What about virtual smart cards? answer: | Windows Hello for Business is the modern, two-factor credential for Windows 10. Microsoft will be deprecating virtual smart cards in the future, but no date is set at this time. Customers using Windows 10 and virtual smart cards should move to Windows Hello for Business. Microsoft will publish the date early to ensure customers have adequate lead time to move to Windows Hello for Business. Microsoft recommends that new Windows 10 deployments use Windows Hello for Business. Virtual smart cards remain supported for Windows 7 and Windows 8. diff --git a/windows/security/identity-protection/vpn/vpn-guide.md b/windows/security/identity-protection/vpn/vpn-guide.md index f1ef2a83ef..58f9b162de 100644 --- a/windows/security/identity-protection/vpn/vpn-guide.md +++ b/windows/security/identity-protection/vpn/vpn-guide.md @@ -6,7 +6,7 @@ ms.mktglfcycl: deploy ms.sitesec: library author: dansimp ms.localizationpriority: medium -ms.date: 09/09/2021 +ms.date: 02/21/2022 ms.reviewer: manager: dansimp ms.author: dansimp @@ -29,7 +29,7 @@ To create a Windows 10 VPN device configuration profile see: [Windows 10 and Win ## In this guide -| Topic | Description | +| Article | Description | | --- | --- | | [VPN connection types](vpn-connection-type.md) | Select a VPN client and tunneling protocol | | [VPN routing decisions](vpn-routing.md) | Choose between split tunnel and force tunnel configuration | @@ -37,7 +37,7 @@ To create a Windows 10 VPN device configuration profile see: [Windows 10 and Win | [VPN and conditional access](vpn-conditional-access.md) | Use Azure Active Directory policy evaluation to set access policies for VPN connections. | | [VPN name resolution](vpn-name-resolution.md) | Decide how name resolution should work | | [VPN auto-triggered profile options](vpn-auto-trigger-profile.md) | Set a VPN profile to connect automatically by app or by name, to be "always on", and to not trigger VPN on trusted networks | -| [VPN security features](vpn-security-features.md) | Set a LockDown VPN profile, configure traffic filtering, and connect VPN profile to Windows Information Protection (WIP) | +| [VPN security features](vpn-security-features.md) | Configure traffic filtering, connect a VPN profile to Windows Information Protection (WIP), and more | | [VPN profile options](vpn-profile-options.md) | Combine settings into single VPN profile using XML | diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md index cf94595896..f486f73efc 100644 --- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md +++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md @@ -46,7 +46,7 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- ```xml - 10.0.22493.0 + 10.0.22530.0 {D2BDA982-CCF6-4344-AC5B-0B44427B6816} {2E07F7E4-194C-4D20-B7C9-6F44A6C5A234} @@ -112,6 +112,14 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + @@ -145,7 +153,7 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + @@ -157,10 +165,60 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -169,6 +227,10 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + @@ -328,66 +390,114 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - + + + + + - + + + + + - + + + + - + - + + + + + + + + + + + + + + + @@ -407,33 +517,44 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + - - + + + - - + + + + + + + + + + + @@ -443,18 +564,27 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + + - - - - - - + + + + + + + + + + + + + + @@ -466,6 +596,13 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + @@ -479,8 +616,14 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + @@ -499,6 +642,42 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -526,42 +705,59 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + @@ -610,6 +806,14 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + + + + + @@ -643,7 +847,7 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - + @@ -655,10 +859,60 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -667,6 +921,10 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + + @@ -831,6 +1089,9 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- + + + @@ -845,7 +1106,7 @@ Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device- - 10.0.22493.0 + 10.0.22530.0