Skip to content

Commit 16c87de

Browse files
authored
Merge pull request #225769 from MicrosoftDocs/main
01/31 AM OOB Publishing
2 parents ac35abe + f427dd8 commit 16c87de

File tree

151 files changed

+2516
-930
lines changed

Some content is hidden

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

151 files changed

+2516
-930
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-authentication-strength-external.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,19 @@ In external user scenarios, the MFA authentication methods that a resource tenan
3030

3131
> [!NOTE]
3232
> Currently, you can only apply authentication strength policies to external users who authenticate with Azure AD. For email one-time passcode, SAML/WS-Fed, and Google federation users, use the [MFA grant control](concept-conditional-access-grant.md#require-multi-factor-authentication) to require MFA.
33+
3334
## Configure cross-tenant access settings to trust MFA
3435

3536
Authentication strength policies work together with [MFA trust settings](../external-identities/cross-tenant-access-settings-b2b-collaboration.md#to-change-inbound-trust-settings-for-mfa-and-device-claims) in your cross-tenant access settings to determine where and how the external user must perform MFA. An Azure AD user first authenticates with their own account in their home tenant. Then when this user tries to access your resource, Azure AD applies the authentication strength Conditional Access policy and checks to see if you've enabled MFA trust.
3637

37-
- **If MFA trust is enabled**, Azure AD checks the user's authentication session for a claim indicating that MFA has been fulfilled in the user's home tenant. The table below indicates which authentication methods are acceptable for MFA fulfillment when completed in an external user's home tenant.
38-
- **If MFA trust is disabled**, the resource tenant presents the user with a challenge to complete MFA in the resource tenant using an acceptable authentication method. The table below shows which authentication methods are acceptable for MFA fulfillment by an external user.
38+
- **If MFA trust is enabled**, Azure AD checks the user's authentication session for a claim indicating that MFA has been fulfilled in the user's home tenant.
39+
- **If MFA trust is disabled**, the resource tenant presents the user with a challenge to complete MFA in the resource tenant using an acceptable authentication method.
40+
41+
The authentication methods that external users can use to satisfy MFA requirements are different depending on whether the user is completing MFA in their home tenant or the resource tenant. See the table in [Conditional Access authentication strength](https://aka.ms/b2b-auth-strengths).
3942

4043
> [!IMPORTANT]
4144
> Before you create the Conditional Access policy, check your cross-tenant access settings to make sure your inbound MFA trust settings are configured as intended.
45+
4246
## Choose an authentication strength
4347

4448
Determine if one of the built-in authentication strengths will work for your scenario or if you'll need to create a custom authentication strength.
@@ -48,9 +52,6 @@ Determine if one of the built-in authentication strengths will work for your sce
4852
1. Review the built-in authentication strengths to see if one of them meets your requirements.
4953
1. If you want to enforce a different set of authentication methods, [create a custom authentication strength](https://aka.ms/b2b-auth-strengths).
5054

51-
> [!NOTE]
52-
> The authentication methods that external users can use to satisfy MFA requirements are different depending on whether the user is completing MFA in their home tenant or the resource tenant. See the table in [Conditional Access authentication strength](https://aka.ms/b2b-auth-strengths).
53-
5455
## Create a Conditional Access policy
5556

5657
Use the following steps to create a Conditional Access policy that applies an authentication strength to external users.

articles/active-directory/fundamentals/how-to-customize-branding.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: fundamentals
1111
ms.topic: how-to
12-
ms.date: 11/21/2022
12+
ms.date: 01/31/2023
1313
ms.author: sarahlipsey
1414
ms.reviewer: almars
1515
ms.custom: "it-pro, seodec18, fasttrack-edit"
@@ -83,7 +83,7 @@ The sign-in experience process is grouped into sections. At the end of each sect
8383
- Choose one of two **Templates**: Full-screen or partial-screen background. The full-screen background could obscure your background image, so choose the partial-screen background if your background image is important.
8484
- The details of the **Header** and **Footer** options are set on the next two sections of the process.
8585

86-
- **Custom CSS**: Upload custom CSS to replace the Microsoft default style of the page. [Download the CSS template](https://download.microsoft.com/download/7/2/7/727f287a-125d-4368-a673-a785907ac5ab/custom-styles-template.css).
86+
- **Custom CSS**: Upload custom CSS to replace the Microsoft default style of the page. [Download the CSS template](https://download.microsoft.com/download/7/2/7/727f287a-125d-4368-a673-a785907ac5ab/custom-styles-template-013023.css).
8787

8888
## Header
8989

articles/aks/azure-blob-csi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@ To have a storage volume persist for your workload, you can use a StatefulSet. T
229229
[azure-csi-blob-storage-provision]: azure-csi-blob-storage-provision.md
230230
[azure-disk-csi-driver]: azure-disk-csi.md
231231
[azure-files-csi-driver]: azure-files-csi.md
232-
[install-azure-cli]: /cli/azure/install_azure_cli
232+
[install-azure-cli]: /cli/azure/install-azure-cli

articles/aks/concepts-network.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,5 +268,5 @@ For more information on core Kubernetes and AKS concepts, see the following arti
268268
[nginx-ingress]: ingress-basic.md
269269
[ip-preservation]: https://techcommunity.microsoft.com/t5/fasttrack-for-azure/how-client-source-ip-preservation-works-for-loadbalancer/ba-p/3033722#:~:text=Enable%20Client%20source%20IP%20preservation%201%20Edit%20loadbalancer,is%20the%20same%20as%20the%20source%20IP%20%28srjumpbox%29.
270270
[nsg-traffic]: ../virtual-network/network-security-group-how-it-works.md
271-
[azure-cni-aks]: /configure-azure-cni.md
272-
[kubenet-aks]: /configure-kubenet.md
271+
[azure-cni-aks]: configure-azure-cni.md
272+
[kubenet-aks]: configure-kubenet.md

articles/aks/gpu-cluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ For information on using Azure Kubernetes Service with Azure Machine Learning, s
442442
[azureml-deploy]: ../machine-learning/how-to-deploy-managed-online-endpoints.md
443443
[azureml-triton]: ../machine-learning/how-to-deploy-with-triton.md
444444
[aks-container-insights]: monitor-aks.md#container-insights
445-
[advanced-scheduler-aks]: /aks/operator-best-practices-advanced-scheduler.md
445+
[advanced-scheduler-aks]: operator-best-practices-advanced-scheduler.md
446446
[az-provider-register]: /cli/azure/provider#az-provider-register
447447
[az-feature-register]: /cli/azure/feature#az-feature-register
448-
[az-feature-show]: /cli/azure/feature#az-feature-show
448+
[az-feature-show]: /cli/azure/feature#az-feature-show

articles/aks/operator-best-practices-advanced-scheduler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ This article focused on advanced Kubernetes scheduler features. For more informa
247247
[aks-best-practices-identity]: operator-best-practices-identity.md
248248
[use-multiple-node-pools]: use-multiple-node-pools.md
249249
[taint-node-pool]: use-multiple-node-pools.md#specify-a-taint-label-or-tag-for-a-node-pool
250-
[use-gpus-aks]: /aks/gpu-cluster.md
250+
[use-gpus-aks]: gpu-cluster.md

0 commit comments

Comments
 (0)