Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sanAKS

Author: roygara

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure-graph.md

@@ -7,7 +7,7 @@ manager: amycolannino
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/27/2023
+ms.date: 03/08/2023
 ms.author: rolyon
 ms.custom: it-pro
 
@@ -28,17 +28,17 @@ This article describes the key steps to configure cross-tenant synchronization u
 
 ![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
 
-- Azure AD Premium P1 or P2 license
-- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings
-- [Hybrid Identity Administrator](../roles/permissions-reference.md#hybrid-identity-administrator) role to configure cross-tenant synchronization
-- [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator) or [Application Administrator](../roles/permissions-reference.md#application-administrator) role to assign users to a configuration and to delete a configuration
-- [Global Administrator](../roles/permissions-reference.md#global-administrator) role to consent to required permissions
+- Azure AD Premium P1 or P2 license. For more information, see [License requirements](cross-tenant-synchronization-overview.md#license-requirements).
+- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings.
+- [Hybrid Identity Administrator](../roles/permissions-reference.md#hybrid-identity-administrator) role to configure cross-tenant synchronization.
+- [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator) or [Application Administrator](../roles/permissions-reference.md#application-administrator) role to assign users to a configuration and to delete a configuration.
+- [Global Administrator](../roles/permissions-reference.md#global-administrator) role to consent to required permissions.
 
 ![Icon for the target tenant.](./media/common/icon-tenant-target.png)<br/>**Target tenant**
 
-- Azure AD Premium P1 or P2 license
-- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings
-- [Global Administrator](../roles/permissions-reference.md#global-administrator) role to consent to required permissions
+- Azure AD Premium P1 or P2 license. For more information, see [License requirements](cross-tenant-synchronization-overview.md#license-requirements).
+- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings.
+- [Global Administrator](../roles/permissions-reference.md#global-administrator) role to consent to required permissions.
 
 ## Step 1: Sign in to tenants and consent to permissions
 

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure.md

@@ -7,7 +7,7 @@ manager: amycolannino
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 02/06/2023
+ms.date: 03/08/2023
 ms.author: rolyon
 ms.custom: it-pro
 
@@ -36,15 +36,15 @@ By the end of this article, you'll be able to:
 
 ![Icon for the source tenant.](./media/common/icon-tenant-source.png)<br/>**Source tenant**
 
-- Azure AD Premium P1 or P2 license
-- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings
-- [Hybrid Identity Administrator](../roles/permissions-reference.md#hybrid-identity-administrator) role to configure cross-tenant synchronization
-- [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator) or [Application Administrator](../roles/permissions-reference.md#application-administrator) role to assign users to a configuration and to delete a configuration
+- Azure AD Premium P1 or P2 license. For more information, see [License requirements](cross-tenant-synchronization-overview.md#license-requirements).
+- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings.
+- [Hybrid Identity Administrator](../roles/permissions-reference.md#hybrid-identity-administrator) role to configure cross-tenant synchronization.
+- [Cloud Application Administrator](../roles/permissions-reference.md#cloud-application-administrator) or [Application Administrator](../roles/permissions-reference.md#application-administrator) role to assign users to a configuration and to delete a configuration.
 
 ![Icon for the target tenant.](./media/common/icon-tenant-target.png)<br/>**Target tenant**
 
-- Azure AD Premium P1 or P2 license
-- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings
+- Azure AD Premium P1 or P2 license. For more information, see [License requirements](cross-tenant-synchronization-overview.md#license-requirements).
+- [Security Administrator](../roles/permissions-reference.md#security-administrator) role to configure cross-tenant access settings.
 
 ## Step 1: Plan your provisioning deployment
 

articles/aks/azure-cni-overlay.md

@@ -59,7 +59,7 @@ The following are additional factors to consider when planning pods IP address s
 
 ## Network security groups
 
-Pod to pod traffic with Azure CNI Overlay is not encapsulated and subnet [network security group][nsgs] rules are applied. If the subnet NSG contains deny rules that would impact the pod CIDR traffic, make sure the following rules are in place to ensure proper cluster functionality (in addition to all [AKS egress requirements][aks-egress]):
+Pod to pod traffic with Azure CNI Overlay is not encapsulated and subnet [network security group][nsg] rules are applied. If the subnet NSG contains deny rules that would impact the pod CIDR traffic, make sure the following rules are in place to ensure proper cluster functionality (in addition to all [AKS egress requirements][aks-egress]):
 
 * Traffic from the node CIDR to the node CIDR on all ports and protocols
 * Traffic from the node CIDR to the pod CIDR on all ports and protocols (required for service traffic routing)
@@ -172,4 +172,4 @@ To learn how to utilize AKS with your own Container Network Interface (CNI) plug
 [az-feature-show]: /cli/azure/feature#az-feature-show
 [aks-egress]: limit-egress-traffic.md
 [aks-network-policies]: use-network-policies.md
-[nsg]: /azure/virtual-network/network-security-groups-overview
+[nsg]: ../virtual-network/network-security-groups-overview.md

articles/aks/azure-disk-csi.md

@@ -413,6 +413,7 @@ The output of the command resembles the following example:
 - To learn how to use CSI driver for Azure Files, see [Use Azure Files with CSI driver][azure-files-csi].
 - To learn how to use CSI driver for Azure Blob storage, see [Use Azure Blob storage with CSI driver][azure-blob-csi].
 - For more information about storage best practices, see [Best practices for storage and backups in Azure Kubernetes Service][operator-best-practices-storage].
+- For more information about disk-based storage solutions, see [Disk-based solutions in AKS][disk-based-solutions].
 
 <!-- LINKS - external -->
 [access-modes]: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes
@@ -451,3 +452,4 @@ The output of the command resembles the following example:
 [enable-on-demand-bursting]: ../virtual-machines/disks-enable-bursting.md?tabs=azure-cli
 [az-premium-ssd]: ../virtual-machines/disks-types.md#premium-ssds
 [general-purpose-machine-sizes]: ../virtual-machines/sizes-general.md
+[disk-based-solutions]: /azure/cloud-adoption-framework/scenarios/app-platform/aks/storage#disk-based-solutions