Skip to content

Commit abcea18

Browse files
authored
Merge pull request #228046 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 473f4ab + 701ccc7 commit abcea18

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

articles/active-directory/authentication/concept-certificate-based-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following scenarios are supported:
6666

6767
The following scenarios aren't supported:
6868

69-
- Certificate Authority hints aren't supported, so the list of certificates that appears for users in the certificate picket UI isn't scoped.
69+
- Certificate Authority hints aren't supported, so the list of certificates that appears for users in the certificate picker UI isn't scoped.
7070
- Only one CRL Distribution Point (CDP) for a trusted CA is supported.
7171
- The CDP can be only HTTP URLs. We don't support Online Certificate Status Protocol (OCSP), or Lightweight Directory Access Protocol (LDAP) URLs.
7272
- Configuring other certificate-to-user account bindings, such as using the **Subject**, **Subject + Issuer** or **Issuer + Serial Number**, aren’t available in this release.

articles/active-directory/authentication/howto-authentication-methods-activity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The registration details report shows the following information for each user:
112112
- SSPR Registered (Registered, Not Registered)
113113
- SSPR Enabled (Enabled, Not Enabled)
114114
- SSPR Capable (Capable, Not Capable)
115-
- Methods registered (Email, Mobile Phone, Alternative Mobile Phone, Office Phone, Microsoft Authenticator Push, Software One Time Passcode, FIDO2, Security Key, Security questions, Hardware OATH token)
115+
- Methods registered (Alternate Mobile Phone, Email, FIDO2 Security Key, Hardware OATH token, Microsoft Authenticator app, Microsoft Passwordless phone sign-in, Mobile Phone, Office Phone, Security questions, Software OATH token, Temporary Access Pass, Windows Hello for Business)
116116

117117
![Screenshot of user registration details](media/how-to-authentication-methods-usage-insights/registration-details.png)
118118

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ To enable combined registration, complete these steps:
3636

3737
![Enable the combined security info experience for users](media/howto-registration-mfa-sspr-combined/enable-the-combined-security-info.png)
3838

39+
> [!IMPORTANT]
40+
> If your Azure tenant has already been enabled for combined registration, you might not see the configuration option for **Users can use the combined security information registration experience** or even see it grayed out.
41+
3942
> [!NOTE]
4043
> After you enable combined registration, users who register or confirm their phone number or mobile app through the new experience can use them for Azure AD Multi-Factor Authentication and SSPR, if those methods are enabled in the Azure AD Multi-Factor Authentication and SSPR policies.
4144
>

articles/expressroute/expressroute-howto-reset-peering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Azure ExpressRoute: Reset circuit peering'
2+
title: 'Azure ExpressRoute: Reset circuit peering using Azure PowerShell'
33
description: Learn how to enable and disable peerings for an Azure ExpressRoute circuit using Azure PowerShell.
44
services: expressroute
55
author: charwen
@@ -10,7 +10,7 @@ ms.date: 12/15/2020
1010
ms.author: duau
1111
---
1212

13-
# Reset ExpressRoute circuit peerings
13+
# Reset ExpressRoute circuit peerings using Azure PowerShell
1414

1515
This article describes how to enable and disable peerings of an ExpressRoute circuit using PowerShell. Peerings are enabled by default when you create them. When you disable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit will be shut down. You'll lose connectivity for this peering to Microsoft. When you enable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit will be established. The connectivity to Microsoft will be restored for this peering. You can enable and disable peering for Microsoft Peering and Azure Private Peering independently on the ExpressRoute circuit.
1616

articles/frontdoor/tier-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Azure Front Door zero-down time migration happens in three stages. The first sta
5353
> * Traffic to your Azure Front Door (classic) will continue to be serve until migration has been completed.
5454
> * Each Azure Front Door (classic) profile can create one Azure Front Door Standard or Premium profile.
5555
56-
Migration is only available can be completed using the Azure portal. Service charges for Azure Front Door Standard or Premium tier will start once migration is completed.
56+
Migration is only available and can be completed using the Azure portal. Service charges for Azure Front Door Standard or Premium tier will start once migration is completed.
5757

5858
## Breaking changes between tiers
5959

articles/frontdoor/troubleshoot-issues.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ This article describes how to troubleshoot common routing problems that you migh
1717

1818
You can request Azure Front Door to return more debugging HTTP response headers. For more information, see [optional response headers](front-door-http-headers-protocol.md#optional-debug-response-headers).
1919

20-
## 503 response from Azure Front Door after a few seconds
20+
## 503 or 504 response from Azure Front Door after a few seconds
2121

2222
### Symptom
2323

24-
* Regular requests sent to your backend without going through Azure Front Door are succeeding. Going via Azure Front Door results in 503 error responses.
24+
* Regular requests sent to your backend without going through Azure Front Door are succeeding. Going via Azure Front Door results in 503 or 504 error responses.
2525
* The failure from Azure Front Door typically appears after about 30 seconds.
2626
* Intermittent 503 errors appear with "ErrorInfo: OriginInvalidResponse."
2727

0 commit comments

Comments
 (0)