Merge pull request #296034 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)

Author: Taojunshen

articles/active-directory-b2c/openid-connect-technical-profile.md

@@ -89,7 +89,7 @@ The technical profile also returns claims that aren't returned by the identity p
 | HttpBinding | No | The expected HTTP binding to the access token and claims token endpoints. Possible values: `GET` or `POST`.  |
 | ValidTokenIssuerPrefixes | No | A key that can be used to sign in to each of the tenants when using a multi-tenant identity provider such as Microsoft Entra ID. |
 | UsePolicyInRedirectUri | No | Indicates whether to use a policy when constructing the redirect URI. When you configure your application in the identity provider, you need to specify the redirect URI. The redirect URI points to Azure AD B2C, `https://{your-tenant-name}.b2clogin.com/{your-tenant-name}.onmicrosoft.com/oauth2/authresp`.  If you specify `true`, you need to add a redirect URI for each policy you use. For example: `https://{your-tenant-name}.b2clogin.com/{your-tenant-name}.onmicrosoft.com/{policy-name}/oauth2/authresp`. |
-| MarkAsFailureOnStatusCode5xx | No | Indicates whether a request to an external service should be marked as a failure if the Http status code is in the 5xx range. The default is `false`. |
+| MarkAsFailureOnStatusCode5xx | No | Indicates whether a request to an external service should be marked as a failure if the HTTP status code is in the 5xx range. The default is `false`. |
 | DiscoverMetadataByTokenIssuer | No | Indicates whether the OIDC metadata should be discovered by using the issuer in the JWT.If you need to build the metadata endpoint URL based on Issuer, set this to `true`.|
 | IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
 |token_endpoint_auth_method| No | Specifies how Azure AD B2C sends the authentication header to the token endpoint. Possible values: `client_secret_post` (default), and `client_secret_basic`, `private_key_jwt`. For more information, see [OpenID Connect client authentication section](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). |

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

@@ -22,7 +22,7 @@ To recover from availability problems that affect your API Management service, b
 
 Backup and restore operations can also be used for replicating API Management service configuration between operational environments, for example, development and staging. Beware that runtime data such as users and subscriptions will be copied as well, which might not always be desirable.
 
-This article shows how to automate backup and restore operations of your API Management instance using an external storage account. The steps shown here use either the [Backup-AzApiManagement](/powershell/module/az.apimanagement/backup-azapimanagement) and [Restore-AzApiManagement](/powershell/module/az.apimanagement/restore-azapimanagement) Azure PowerShell cmdlets, or the [Api Management Service - Backup](/rest/api/apimanagement/current-ga/api-management-service/backup) and [Api Management Service - Restore](/rest/api/apimanagement/current-ga/api-management-service/restore) REST APIs.
+This article shows how to automate backup and restore operations of your API Management instance using an external storage account. The steps shown here use either the [Backup-AzApiManagement](/powershell/module/az.apimanagement/backup-azapimanagement) and [Restore-AzApiManagement](/powershell/module/az.apimanagement/restore-azapimanagement) Azure PowerShell cmdlets, or the [API Management Service - Backup](/rest/api/apimanagement/current-ga/api-management-service/backup) and [API Management Service - Restore](/rest/api/apimanagement/current-ga/api-management-service/restore) REST APIs.
 
 
 > [!WARNING]

articles/api-management/soft-delete.md

@@ -32,7 +32,7 @@ Recovery and other operations on a soft-deleted instance are enabled through [RE
 | [Create or Update](/rest/api/apimanagement/current-ga/api-management-service/create-or-update) | Creates or updates an API Management service.  | API Management Service | Any |
 | [Create or Update](/rest/api/apimanagement/current-ga/api-management-service/create-or-update) with `restore` property set to **true** | Recovers (undeletes) an API Management Service if it was previously soft-deleted. If `restore` is specified and set to `true` all other properties will be ignored.  | API Management Service |  2020-06-01-preview |
 | [Delete](/rest/api/apimanagement/current-ga/api-management-service/delete) | Deletes an existing API Management service. | API Management Service | 2020-06-01-preview|
-| [Get By Name](/rest/api/apimanagement/current-ga/deleted-services/get-by-name) | Get soft-deleted Api Management Service by name. | Deleted Services | 2020-06-01-preview |
+| [Get By Name](/rest/api/apimanagement/current-ga/deleted-services/get-by-name) | Get soft-deleted API Management service by name. | Deleted Services | 2020-06-01-preview |
 | [List By Subscription](/rest/api/apimanagement/current-ga/deleted-services/list-by-subscription) | Lists all soft-deleted services available for undelete for the given subscription. | Deleted Services | 2020-06-01-preview
 | [Purge](/rest/api/apimanagement/current-ga/deleted-services/purge) | Purges API Management Service (permanently deletes it with no option to undelete). | Deleted Services | 2020-06-01-preview
 

articles/app-service/deploy-ftp.md

@@ -96,7 +96,7 @@ Run the [az webapp config set](/cli/azure/webapp/deployment#az-webapp-deployment
 az webapp config set --name <app-name> --resource-group <group-name> --ftps-state FtpsOnly
 ```
 
-Possible values for `--ftps-state` are `AllAllowed` (FTP and FTPS enabled), `Disabled` (FTP and FTPs disabled), and `FtpsOnly` (FTPS only).
+Possible values for `--ftps-state` are `AllAllowed` (FTP and FTPS enabled), `Disabled` (FTP and FTPS disabled), and `FtpsOnly` (FTPS only).
 
 # [Azure PowerShell](#tab/powershell)
 
@@ -106,7 +106,7 @@ Run the [Set-AzWebApp](/powershell/module/az.websites/set-azwebapp) command with
 Set-AzWebApp -Name <app-name> -ResourceGroupName <group-name> -FtpsState FtpsOnly
 ```
 
-Possible values for `--ftps-state` are `AllAllowed` (FTP and FTPS enabled), `Disabled` (FTP and FTPs disabled), and `FtpsOnly` (FTPS only).
+Possible values for `--ftps-state` are `AllAllowed` (FTP and FTPS enabled), `Disabled` (FTP and FTPS disabled), and `FtpsOnly` (FTPS only).
 
 -----
 

articles/azure-vmware/configure-site-to-site-vpn-gateway.md

@@ -86,7 +86,7 @@ A virtual hub is a virtual network that is created and used by Azure Virtual WAN
 
    :::image type="content" source="../virtual-wan/media/virtual-wan-custom-ipsec-portal/contextmenu.png" alt-text="Screenshot showing the context menu for an existing VPN site." lightbox="../virtual-wan/media/virtual-wan-custom-ipsec-portal/contextmenu.png":::
 
-   - Internet Protocol Security (IPSec), select **Custom**.
+   - Internet Protocol Security (IPsec), select **Custom**.
 
    - Use policy-based traffic selector, select **Enable**
 

articles/azure-vmware/configure-vmware-hcx.md

@@ -78,7 +78,7 @@ VMware HCX Connector deploys a subset of virtual appliances (automated) that req
    - Uplink
 
    > [!NOTE]
-   > * For Azure VMware Solution connected via VPN, set Uplink Network Profile MTU's to 1350 to account for IPSec overhead.
+   > * For Azure VMware Solution connected via VPN, set Uplink Network Profile MTU's to 1350 to account for IPsec overhead.
    > * Azure VMware Solution defaults to 1500 MTU, which is sufficient for most ExpressRoute implementations.
    >   * If your ExpressRoute provider does not support jumbo frames, you may need to lower the MTU in ExpressRoute setups as well.
    >   * Adjust MTU settings on both HCX Connector (on-premises) and HCX Cloud Manager (Azure VMware Solution) network profiles.

articles/azure-vmware/configure-vsan.md

@@ -29,6 +29,7 @@ In this article, learn how to:
 > * Enable or Disable vSAN TRIM/UNMAP
 > * Enable vSAN Compression Only
 > * Disable vSAN Deduplication and Compression
+> * Enable or Disable vSAN Data-In-Transit Encryption
 
 ## Set VMware vSAN TRIM/UNMAP
 
@@ -92,6 +93,30 @@ Run the `Set-vSANCompressDedupe` cmdlet to set preferred space efficiency model.
 
 1. Check **Notifications** to see the progress.
 
+
+## Set VMware vSAN Data-In-Transit Encryption
+
+Run the `Set-vSANDataInTransitEncryption` cmdlet to enable or disable data-in-transit encryption for all clusters or specified clusters of a SDDC.
+
+   >[!NOTE]
+   >Changing this setting will cause a performance impact. See [VMware KB](https://blogs.vmware.com/virtualblocks/2021/08/12/storageminute-vsan-data-encryption-performance/).
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+
+1. Select **Run command** > **Packages** > **Set-vSANDataInTransitEncryption**.
+
+1. Provide the required values or change the default values, and then select **Run**.
+
+   | **Field** | **Value** |
+   | --- | --- |
+   | **ClusterName**  | Name of the cluster. Leave blank if required to enable for whole SDDC else enter comma separated list of names. |
+   | **Enable**  |  Specify True/False to Enable/Disable the feature.
+
+1. Check **Notifications** to see the progress.
+
+>[!NOTE]
+>You can also use the `Get-vSANDataInTransitEncryptionStatus` command to check for the current status or status after performing the `Set-vSANDataInTransitEncryptionStatus` operation and verify the cluster's current encryption state.
+
 ## Next steps
 
 Now that you learned how to configure VMware vSAN, learn more about:

articles/baremetal-infrastructure/workloads/nc2-on-azure/architecture.md

@@ -42,7 +42,7 @@ Each NC2 on Azure architectural component has the following function:
 - Nutanix Cost Governance: Provides multi-cloud optimization to reduce cost & enhance cloud security.
 - Azure Virtual Network (VNet): Private network used to connect AHV hosts, Azure services and resources together.
 - Azure Route Server: Enables network appliances to exchange dynamic route information with Azure networks.
-- Azure Virtual Network Gateway: Cross premises gateway for connecting Azure services and resources to other private networks using IPSec VPN, ExpressRoute, and VNet to VNet.
+- Azure Virtual Network Gateway: Cross premises gateway for connecting Azure services and resources to other private networks using IPsec VPN, ExpressRoute, and VNet to VNet.
 - Azure ExpressRoute: Provides high-speed private connections between Azure data centers and on-premises or colocation infrastructure.
 - Azure Virtual WAN (vWAN): Aggregates networking, security, and routing functions together into a single unified Wide Area Network (WAN).
 

articles/expressroute/cross-network-connectivity.md

@@ -6,7 +6,6 @@ ms.service: azure-expressroute
 ms.topic: concept-article
 ms.date: 06/30/2023
 ms.author: duau
-
 ---
 
 # Cross-network connectivity
@@ -17,7 +16,7 @@ Fabrikam Inc. acquires Contoso Ltd. Following the merger, Fabrikam wants to inte
 
 ![The Application scenario](./media/cross-network-connectivity/premergerscenario.png)
 
-The dashed arrows in the middle of the above figure indicate the desired network interconnections. Specifically, there are three types cross connections desired: 
+The dashed arrows in the middle of the figure above indicate the desired network interconnections. Specifically, there are three types cross connections desired: 
 
 1. Fabrikam and Contoso virtual network cross connect
 1. Cross regional on-premises and virtual network cross connects. That is, connecting Fabrikam on-premises network to Contoso virtual network and connecting Contoso on-premises network to Fabrikam virtual network.
@@ -49,7 +48,7 @@ In this article, let's go through step by step and discuss how to achieve the de
 
 Virtual network peering (VNet peering) provides the most optimal and the best network performance when connecting two virtual networks. VNet peering supports peering two VNets both within the same Azure region (commonly called VNet peering) and in two different Azure regions (commonly called Global VNet peering). 
 
-Let's configure Global VNet peering between the VNets in Contoso and Fabrikam Azure subscriptions. For how to create the virtual network peering between two the virtual networks, see [Create a virtual network peering][Configure VNet peering] article.
+Let's configure Global VNet peering between the VNets in Contoso and Fabrikam Azure subscriptions. For how to create the virtual network peering between two virtual networks, see [Create a virtual network peering][Configure VNet peering] article.
 
 The following picture shows the network architecture after configuring Global VNet peering.
 
@@ -91,9 +90,8 @@ The following table shows the routes known to the Fabrikam subscription VM. Pay
 
 ![Fabrikam VM routes after cross connecting ExR and VNets](./media/cross-network-connectivity/fabrikamvm-routes-xconnect.png)
 
->[!NOTE]
->In either the Fabrikam and/or Contoso subscriptions you can also have spoke VNets to the respective hub VNet (a hub and spoke design is not illustrated in the architecture diagrams in this article). The cross connections between the hub VNet gateways to ExpressRoute will also allow communication between East and West hubs and spokes.
->
+> [!NOTE]
+> In either the Fabrikam and/or Contoso subscriptions you can also have spoke VNets to the respective hub VNet (a hub and spoke design is not illustrated in the architecture diagrams in this article). The cross connections between the hub VNet gateways to ExpressRoute will also allow communication between East and West hubs and spokes.
 
 ## Cross connecting on-premises networks
 

articles/load-balancer/upgrade-basic-standard-with-powershell.md

@@ -117,7 +117,7 @@ Install-Module -Name AzureBasicLoadBalancerUpgrade -Scope CurrentUser -Repositor
 Validate that a Basic Load Balancer is supported for upgrade
 
 ```powershell
-Start-AzBasicLoadBalancerUpgrade -ResourceGroupName <loadBalancerRGName> -BasicLoadBalancerName <basicLBName> -validateScenarioOnly
+Start-AzBasicLoadBalancerUpgrade -ResourceGroupName <loadBalancerRGName> -BasicLoadBalancerName <basicLBName> -validateScenarioOnly:$true
 ```
 
 ### Example: upgrade by name
@@ -315,4 +315,4 @@ If your failed migration was targeting multiple load balancers at the same time,
 ## Next steps
 
 - [If skipped, migrate from using NAT Pools to NAT Rules for Virtual Machine Scale Sets](load-balancer-nat-pool-migration.md)
-- [Learn about Azure Load Balancer](load-balancer-overview.md)
+- [Learn about Azure Load Balancer](load-balancer-overview.md)