Skip to content

Commit 35a0216

Browse files
authored
Merge pull request #206547 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents cba707e + 5202667 commit 35a0216

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

articles/active-directory/authentication/concept-authentication-methods.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The following table outlines when an authentication method can be used during a
6262

6363
| Method | Primary authentication | Secondary authentication |
6464
|--------------------------------|:----------------------:|:-------------------------:|
65-
| Windows Hello for Business | Yes | MFA |
65+
| Windows Hello for Business | Yes | MFA\* |
6666
| Microsoft Authenticator app | Yes | MFA and SSPR |
6767
| FIDO2 security key | Yes | MFA |
6868
| OATH hardware tokens (preview) | No | MFA and SSPR |
@@ -71,6 +71,8 @@ The following table outlines when an authentication method can be used during a
7171
| Voice call | No | MFA and SSPR |
7272
| Password | Yes | |
7373

74+
> \* Windows Hello for Business, by itself, does not serve as a step-up MFA credential. For example, an MFA Challenge from Sign-in Frequency or SAML Request containing forceAuthn=true. Windows Hello for Business can serve as a step-up MFA credential by being used in FIDO2 authentication. This requires users to be enabled for FIDO2 authentication to work sucessfully.
75+
7476
All of these authentication methods can be configured in the Azure portal, and increasingly using the [Microsoft Graph REST API](/graph/api/resources/authenticationmethods-overview).
7577

7678
To learn more about how each authentication method works, see the following separate conceptual articles:

articles/active-directory/hybrid/concept-azure-ad-connect-sync-default-configuration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ The following attribute rules apply:
7171
### Contact out-of-box rules
7272
A contact object must satisfy the following to be synchronized:
7373

74+
* Must have mail attribute value.
7475
* The contact must be mail-enabled. It is verified with the following rules:
7576
* `IsPresent([proxyAddresses]) = True)`. The proxyAddresses attribute must be populated.
7677
* A primary email address can be found in either the proxyAddresses attribute or the mail attribute. The presence of an \@ is used to verify that the content is an email address. One of these two rules must be evaluated to True.

articles/virtual-desktop/security-guide.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ By restricting operating system capabilities, you can strengthen the security of
148148

149149
Trusted launch are Gen2 Azure VMs with enhanced security features aimed to protect against “bottom of the stack” threats through attack vectors such as rootkits, boot kits, and kernel-level malware. The following are the enhanced security features of trusted launch, all of which are supported in Azure Virtual Desktop. To learn more about trusted launch, visit [Trusted launch for Azure virtual machines](../virtual-machines/trusted-launch.md).
150150

151-
>[!NOTE]
152-
>Bring your own custom image for Trusted Launch VM is not yet supported. When deploying an AVD Host Pool, you will be limited to the list of pre-canned OS images listed in the dropdown "Image" combo box.
153151

154152
### Secure Boot
155153

articles/virtual-machines/automatic-extension-upgrade.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Automatic Extension Upgrade supports the following extensions (and more are adde
7171
- [Guest Configuration Extension](./extensions/guest-configuration.md) – Linux and Windows
7272
- Key Vault – [Linux](./extensions/key-vault-linux.md) and [Windows](./extensions/key-vault-windows.md)
7373
- [Azure Monitor Agent](../azure-monitor/agents/azure-monitor-agent-overview.md)
74+
- [DSC extension for Linux](extensions/dsc-linux.md)
7475

7576

7677
## Enabling Automatic Extension Upgrade

0 commit comments

Comments
 (0)