Skip to content

Commit c977026

Browse files
committed
Merge branch 'main' into release-preview-mswb
2 parents a200231 + 3cc5eae commit c977026

File tree

259 files changed

+4421
-2077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+4421
-2077
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,11 @@
17751775
"redirect_url": "/azure/site-recovery/failover-failback-overview-modernized",
17761776
"redirect_document_id": false
17771777
},
1778+
{
1779+
"source_path": "articles/site-recovery/vmware-physical-secondary-support-matrix.md",
1780+
"redirect_url": "/azure/site-recovery/vmware-physical-secondary-architecture",
1781+
"redirect_document_id": false
1782+
},
17781783
{
17791784
"source_path": "articles/site-recovery/switch-replication-appliance-preview.md",
17801785
"redirect_url": "/azure/site-recovery/switch-replication-appliance-modernized",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ The following providers offer FIDO2 security keys of different form factors that
122122
| [Feitian](https://shop.ftsafe.us/pages/microsoft) | ![y] | ![y]| ![y]| ![y]| ![y] |
123123
| [Fortinet](https://www.fortinet.com/) | ![n] | ![y]| ![n]| ![n]| ![n] |
124124
| [Giesecke + Devrient (G+D)](https://www.gi-de.com/en/identities/enterprise-security/hardware-based-authentication) | ![y] | ![y]| ![y]| ![y]| ![n] |
125+
| [Google](https://store.google.com/us/product/titan_security_key) | ![n] | ![y]| ![y]| ![n]| ![n] |
125126
| [GoTrustID Inc.](https://www.gotrustid.com/idem-key) | ![n] | ![y]| ![y]| ![y]| ![n] |
126127
| [HID](https://www.hidglobal.com/products/crescendo-key) | ![n] | ![y]| ![y]| ![n]| ![n] |
127128
| [HIDEEZ](https://hideez.com/products/hideez-key-4) | ![n] | ![y]| ![y]| ![y]| ![n] |
@@ -135,6 +136,7 @@ The following providers offer FIDO2 security keys of different form factors that
135136
| [Nymi](https://www.nymi.com/nymi-band) | ![y] | ![n]| ![y]| ![n]| ![n] |
136137
| [Octatco](https://octatco.com/) | ![y] | ![y]| ![n]| ![n]| ![n] |
137138
| [OneSpan Inc.](https://www.onespan.com/products/fido) | ![n] | ![y]| ![n]| ![y]| ![n] |
139+
| [PONE Biometrics](https://ponebiometrics.com/) | ![y] | ![n]| ![n]| ![y]| ![n] |
138140
| [Precision Biometric](https://www.innait.com/product/fido/) | ![n] | ![y]| ![n]| ![n]| ![n] |
139141
| [RSA](https://www.rsa.com/products/securid/) | ![n] | ![y]| ![n]| ![n]| ![n] |
140142
| [Sentry](https://sentryenterprises.com/) | ![n] | ![n]| ![y]| ![n]| ![n] |

articles/active-directory/authentication/concept-fido2-hardware-vendor.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ The following table lists partners who are Microsoft-compatible FIDO2 security k
4343
| [Feitian](https://shop.ftsafe.us/pages/microsoft) | ![y] | ![y]| ![y]| ![y]| ![y] |
4444
| [Fortinet](https://www.fortinet.com/) | ![n] | ![y]| ![n]| ![n]| ![n] |
4545
| [Giesecke + Devrient (G+D)](https://www.gi-de.com/en/identities/enterprise-security/hardware-based-authentication) | ![y] | ![y]| ![y]| ![y]| ![n] |
46+
| [Google](https://store.google.com/us/product/titan_security_key) | ![n] | ![y]| ![y]| ![n]| ![n] |
4647
| [GoTrustID Inc.](https://www.gotrustid.com/idem-key) | ![n] | ![y]| ![y]| ![y]| ![n] |
4748
| [HID](https://www.hidglobal.com/products/crescendo-key) | ![n] | ![y]| ![y]| ![n]| ![n] |
4849
| [HIDEEZ](https://hideez.com/products/hideez-key-4) | ![n] | ![y]| ![y]| ![y]| ![n] |
@@ -56,6 +57,7 @@ The following table lists partners who are Microsoft-compatible FIDO2 security k
5657
| [Nymi](https://www.nymi.com/nymi-band) | ![y] | ![n]| ![y]| ![n]| ![n] |
5758
| [Octatco](https://octatco.com/) | ![y] | ![y]| ![n]| ![n]| ![n] |
5859
| [OneSpan Inc.](https://www.onespan.com/products/fido) | ![n] | ![y]| ![n]| ![y]| ![n] |
60+
| [PONE Biometrics](https://ponebiometrics.com/) | ![y] | ![n]| ![n]| ![y]| ![n] |
5961
| [Precision Biometric](https://www.innait.com/product/fido/) | ![n] | ![y]| ![n]| ![n]| ![n] |
6062
| [RSA](https://www.rsa.com/products/securid/) | ![n] | ![y]| ![n]| ![n]| ![n] |
6163
| [Sentry](https://sentryenterprises.com/) | ![n] | ![n]| ![y]| ![n]| ![n] |

articles/active-directory/conditional-access/workload-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Create a risk-based Conditional Access policy that applies to service principals
7373
1. Set the **Configure** toggle to **Yes**.
7474
1. Select the levels of risk where you want this policy to trigger.
7575
1. Select **Done**.
76-
1. Under **Grant**, **Block access** is the only available option. Access is blocked when a token request is made from outside the allowed range.
76+
1. Under **Grant**, **Block access** is the only available option. Access is blocked when the specified risk levels are seen.
7777
1. Your policy can be saved in **Report-only** mode, allowing administrators to estimate the effects, or policy is enforced by turning policy **On**.
7878
1. Select **Create** to complete your policy.
7979

articles/active-directory/develop/authentication-national-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The following table lists the base URLs for the Azure AD endpoints used to regis
4646
You can find the authentication endpoints for your application.
4747

4848
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator).
49-
1. Browse to **Identity** > **Applications** > **Application registrations**.
49+
1. Browse to **Identity** > **Applications** > **App registrations**.
5050
1. Select **Endpoints** in the top menu.
5151

5252
The **Endpoints** page is displayed showing the authentication endpoints for the application.

articles/active-directory/develop/howto-call-a-web-api-with-curl.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Follow these steps to create the web API registration:
7272

7373
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
7474
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
75-
1. Browse to **Identity** > **Applications** > **Application registrations**.
75+
1. Browse to **Identity** > **Applications** > **App registrations**.
7676
1. Select **New registration**.
7777
1. Enter a **Name** for the application, such as *NewWebAPI1*.
7878
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select **Help me choose** option.
@@ -118,7 +118,7 @@ Follow these steps to create the web app registration:
118118

119119
::: zone pivot="no-api"
120120

121-
1. Select **Home** to return to the home page. Browse to **Identity** > **Applications** > **Application registrations**.
121+
1. Select **Home** to return to the home page. Browse to **Identity** > **Applications** > **App registrations**.
122122
1. Select **New registration**.
123123
1. Enter a **Name** for the application, such as `web-app-calls-web-api`.
124124
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select the **Help me choose** option.
@@ -131,7 +131,7 @@ Follow these steps to create the web app registration:
131131

132132
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
133133
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
134-
1. Browse to **Identity** > **Applications** > **Application registrations**.
134+
1. Browse to **Identity** > **Applications** > **App registrations**.
135135
1. Select **New registration**.
136136
1. Enter a Name for the application, such as `web-app-calls-web-api`.
137137
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select the **Help me choose** option.
@@ -258,7 +258,7 @@ The authorization code flow begins with the client directing the user to the `/a
258258
```
259259

260260
1. Copy the URL, replace the following parameters and paste it into your browser:
261-
- `{tenant_id}` is the web app **Directory (tenant) ID**. This should be the same value across both of the applications's **Overview** pane **App registrations**.
261+
- `{tenant_id}` is the web app **Directory (tenant) ID**.
262262
- `{web-app-calls-web-api_application_client_id}` is the **Application (client) ID** on the web app's (*web-app-calls-web-api*) **Overview** pane.
263263
- `{web_API_application_client_id}` is the **Application (client) ID** on the web API's (*NewWebAPI1*) **Overview** pane.
264264
1. Sign in as a user in the Azure AD tenant in which the apps are registered. Consent to any requests for access, if necessary.
@@ -283,7 +283,7 @@ cURL can now be used to request an access token from the Microsoft identity plat
283283
-d 'grant_type=authorization_code' \
284284
-d 'client_secret={client_secret}'
285285
```
286-
- `{tenant_id}` is the web app **Directory (tenant) ID**. This should be the same value across both of the applications's **Overview** pane **App registrations**.
286+
- `{tenant_id}` is the web app **Directory (tenant) ID**.
287287
- `client_id={web-app-calls-web-api_application_client_id}`, and `session_state={web-app-calls-web-api_application_client_id}` is the **Application (client) ID** on the web application's (*web-app-calls-web-api*) **Overview** pane.
288288
- `api://{web_API_application_client_id}/Forecast.Read` is the **Application (client) ID** on the web API's (*NewWebAPI1*) **Overview** pane.
289289
- `code={authorization_code}` is the authorization code that was received in [Request an authorization code](#request-an-authorization-code). This enables the cURL tool to request an access token.

articles/active-directory/develop/howto-call-a-web-api-with-postman.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Follow these steps to create the web API registration:
7171

7272
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
7373
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
74-
1. Browse to **Identity** > **Applications** > **Application registrations**.
74+
1. Browse to **Identity** > **Applications** > **App registrations**.
7575
1. Select **New registration**.
7676
1. Enter a **Name** for the application, such as _NewWebAPI1_.
7777
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select **Help me choose** option.
@@ -116,7 +116,7 @@ Follow these steps to create the web app registration:
116116

117117
::: zone pivot="no-api"
118118

119-
Select **Home** to return to the home page. Browse to **Identity** > **Applications** > **Application registrations**.
119+
Select **Home** to return to the home page. Browse to **Identity** > **Applications** > **App registrations**.
120120
1. Select **New registration**.
121121
1. Enter a **Name** for the application, such as `web-app-calls-web-api`.
122122
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select the **Help me choose** option.
@@ -129,7 +129,7 @@ Select **Home** to return to the home page. Browse to **Identity** > **Applicati
129129

130130
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
131131
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
132-
1. Browse to **Identity** > **Applications** > **Application registrations**.
132+
1. Browse to **Identity** > **Applications** > **App registrations**.
133133
1. Select **New registration**.
134134
1. Enter a Name for the application, such as `web-app-calls-web-api`.
135135
1. For **Supported account types**, select **Accounts in this organizational directory only**. For information on different account types, select the **Help me choose** option.
@@ -183,8 +183,8 @@ You may also notice the **User.Read** permission for the Microsoft Graph API. Th
183183

184184
1. Navigate to `ms-identity-docs-code-dotnet/web-api` folder and open `appsettings.json`, replace the `{APPLICATION_CLIENT_ID}` and `{DIRECTORY_TENANT_ID}` with:
185185

186-
- `{APPLICATION_CLIENT_ID}` is the web API **Application (client) ID** on the app's **Overview** pane **App registrations**.
187-
- `{DIRECTORY_TENANT_ID}` is the web API **Directory (tenant) ID** on the app's **Overview** pane **App registrations**.
186+
- `{APPLICATION_CLIENT_ID}` is the web API **Application (client) ID** on the app's **Overview** pane.
187+
- `{DIRECTORY_TENANT_ID}` is the web API **Directory (tenant) ID** on the app's **Overview** pane.
188188

189189
1. Execute the following command to start the app:
190190

articles/active-directory/develop/howto-configure-app-instance-property-locks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To configure an app instance lock:
3838

3939
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator).
4040
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
41-
1. Browse to **Identity** > **Applications** > **Application registrations**.
41+
1. Browse to **Identity** > **Applications** > **App registrations**.
4242
1. Select the application you want to configure.
4343
1. Select **Authentication**, and then select **Configure** under the *App instance property lock* section.
4444

articles/active-directory/develop/msal-android-single-sign-on.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Once you've generated a signature hash with _keytool_, use the Azure portal to g
116116

117117
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator).
118118
1. If access to multiple tenants is available, use the **Directories + subscriptions** filter :::image type="icon" source="media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
119-
1. Browse to **Identity** > **Applications** > **Application registrations**.
119+
1. Browse to **Identity** > **Applications** > **App registrations**.
120120
1. Select your application, and then select **Authentication** > **Add a platform** > **Android**.
121121
1. In the **Configure your Android app** pane that opens, enter the **Signature hash** that you generated earlier and a **Package name**.
122122
1. Select the **Configure** button.

articles/active-directory/develop/msal-net-use-brokers-with-xamarin-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Add the redirect URI to the app's registration. To generate a properly formatted
182182
**To generate the redirect URI:**
183183

184184
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator).
185-
1. Browse to **Identity** > **Applications** > **Application registrations**.
185+
1. Browse to **Identity** > **Applications** > **App registrations**.
186186
1. Search for and select the application.
187187
1. Select **Authentication** > **Add a platform** > **iOS / macOS**
188188
1. Enter your bundle ID, and then select **Configure**.

0 commit comments

Comments
 (0)