Merge pull request #193803 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: TimShererWithAquent

articles/active-directory/manage-apps/grant-admin-consent.md

@@ -35,8 +35,8 @@ Granting tenant-wide admin consent requires you to sign in as a user that is aut
 To grant tenant-wide admin consent, you need:
 
 - An Azure AD user account with one of the following roles:
-   - Global Administrator or Privileged Role Administrator, for granting consnet for apps requesting any permission, for any API.
-   - Cloud Application Administrator or Application Administrator, for granting consnet for apps requesting any permission for any API, _except_ Azure AD Graph or Microsoft Graph app roles (application permissions).
+   - Global Administrator or Privileged Role Administrator, for granting consent for apps requesting any permission, for any API.
+   - Cloud Application Administrator or Application Administrator, for granting consent for apps requesting any permission for any API, _except_ Azure AD Graph or Microsoft Graph app roles (application permissions).
    - A custom directory role that includes the [permission to grant permissions to applications](../roles/custom-consent-permissions.md), for the permissions required by the application.
 
 ## Grant tenant-wide admin consent in Enterprise apps

articles/azure-functions/functions-add-output-binding-cosmos-db-vs-code.md

@@ -106,7 +106,6 @@ dotnet add package Microsoft.Azure.WebJobs.Extensions.CosmosDB
 dotnet add package Microsoft.Azure.Functions.Worker.Extensions.CosmosDB
 ```
 ---
-Now, you can add the storage output binding to your project.  
 ::: zone-end
 
 ::: zone pivot="programming-language-javascript"

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

@@ -48,7 +48,7 @@ In your data center, you can connect or pair the VMware HCX Cloud Manager in Azu
 > [!IMPORTANT]
 > Although the VMware Configuration Maximum tool describes site pairs maximum to be 25 between the on-premises HCX Connector and HCX Cloud Manager, licensing limits this to three for HCX Advanced and 10 for HCX Enterprise Edition.
 
-1. Sign in to your on-premises vCenter, and under **Home**, select **HCX**.
+1. Sign in to your on-premises vCenter Server, and under **Home**, select **HCX**.
 
 1. Under **Infrastructure**, select **Site Pairing** and select the **Connect To Remote Site** option (in the middle of the screen).
 

articles/azure-vmware/deploy-azure-vmware-solution.md

@@ -15,7 +15,7 @@ The diagram shows the deployment workflow of Azure VMware Solution.
 
 :::image type="content" source="media/deploy-azure-vmware-solution-workflow.png" alt-text="Diagram showing the Azure VMware Solution deployment workflow." lightbox="media/deploy-azure-vmware-solution-workflow.png" border="false":::
 
-In this how-to, you'll':
+In this how-to, you'll:
 
 > [!div class="checklist"]
 > * Register the resource provider and create a private cloud

articles/azure-vmware/includes/azure-vmware-solutions-limits.md

@@ -14,11 +14,11 @@ The following table describes the maximum limits for Azure VMware Solution.
 
 | **Resource** | **Limit** |
 | :-- | :-- |
-| Clusters per private cloud | 12 |
-| Minimum number of hosts per cluster | 3 |
-| Maximum number of hosts per cluster | 16 |
-| hosts per private cloud | 96 |
-| vCenter per private cloud | 1  |
+| vSphere clusters per private cloud | 12 |
+| Minimum number of ESXi hosts per cluster | 3 |
+| Maximum number of ESXi hosts per cluster | 16 |
+| ESXi hosts per private cloud | 96 |
+| vCenter Servers per private cloud | 1  |
 | HCX site pairings | 25 (any edition) |
 | Azure VMware Solution ExpressRoute max linked private clouds | 4<br />The virtual network gateway used determines the actual max linked private clouds.  For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) | 
 | Azure VMware Solution ExpressRoute port speed | 10 Gbps<br />The virtual network gateway used determines the actual bandwidth. For more details, see [About ExpressRoute virtual network gateways](../../expressroute/expressroute-about-virtual-network-gateways.md) | 

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

@@ -7,11 +7,11 @@ ms.date: 03/29/2022
 
 # Install and activate VMware HCX in Azure VMware Solution
 
-VMware HCX Advanced and its associated Cloud Manager are no longer pre-deployed in Azure VMware Solution. Instead, you'll install it through the Azure portal as an add-on. You'll still download the HCX Connector OVA and deploy the virtual appliance on your on-premises vCenter. 
+VMware HCX Advanced and its associated Cloud Manager are no longer pre-deployed in Azure VMware Solution. Instead, you'll install it through the Azure portal as an add-on. You'll still download the HCX Connector OVA and deploy the virtual appliance on your on-premises vCenter Server. 
 
 Any edition of VMware HCX supports 25 site pairings (on-premises to cloud or cloud to cloud).  The default is HCX Advanced, but you can open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) to have HCX Enterprise Edition enabled. Once the service is generally available, you'll have 30 days to decide on your next steps. You can turn off or opt out of the HCX Enterprise Edition service but keep HCX Advanced as it's part of the node cost.
 
-Downgrading from HCX Enterprise Edition to HCX Advanced is possible without redeploying. First, ensure you've reverted to an HCX Advanced configuration state and not using the Enterprise features. If you plan to downgrade, ensure that no scheduled migrations, features like RAV and [HCX Mobility Optimized Networking (MON)](https://docs.vmware.com/en/VMware-HCX/4.1/hcx-user-guide/GUID-0E254D74-60A9-479C-825D-F373C41F40BC.html) aren't in use, and site pairings are three or fewer.
+Downgrading from HCX Enterprise Edition to HCX Advanced is possible without redeploying. First, ensure you've reverted to an HCX Advanced configuration state and not using the Enterprise features. If you plan to downgrade, ensure that no scheduled migrations, features like RAV and [HCX Mobility Optimized Networking (MON)](https://docs.vmware.com/en/VMware-HCX/4.1/hcx-user-guide/GUID-0E254D74-60A9-479C-825D-F373C41F40BC.html) are in use, and site pairings are three or fewer.
 
 >[!TIP]
 >You can also [uninstall HCX Advanced](#uninstall-hcx-advanced) through the portal. When you uninstall HCX Advanced, make sure you don't have any active migrations in progress. Removing HCX Advanced returns the resources to your private cloud occupied by the HCX virtual appliances.
@@ -54,15 +54,15 @@ After you're finished, follow the recommended next steps at the end to continue
 
 ## Download and deploy the VMware HCX Connector OVA 
 
-In this step, you'll download the VMware HCX Connector OVA file, and then you'll deploy the VMware HCX Connector to your on-premises vCenter.
+In this step, you'll download the VMware HCX Connector OVA file, and then you'll deploy the VMware HCX Connector to your on-premises vCenter Server.
 
 1. Open a browser window, sign in to the Azure VMware Solution HCX Manager on `https://x.x.x.9` port 443 with the **cloudadmin\@vsphere.local** user credentials
 
 1. Under **Administration** > **System Updates**, select **Request Download Link**. If the box is greyed, wait a few seconds for it to generate a link.
 
-1. Either download or receive a link for the VMware HCX Connector OVA file you deploy on your local vCenter.
+1. Either download or receive a link for the VMware HCX Connector OVA file you deploy on your local vCenter Server.
 
-1. In your on-premises vCenter, select an [OVF template](https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.vm_admin.doc/GUID-17BEDA21-43F6-41F4-8FB2-E01D275FE9B4.html) to deploy the VMware HCX Connector to your on-premises vCenter.
+1. In your on-premises vCenter Server, select an [OVF template](https://docs.vmware.com/en/VMware-vSphere/6.7/com.vmware.vsphere.vm_admin.doc/GUID-17BEDA21-43F6-41F4-8FB2-E01D275FE9B4.html) to deploy the VMware HCX Connector to your on-premises vSphere cluster.
 
 1. Navigate to and select the OVA file that you downloaded and then select **Open**.
 
@@ -111,19 +111,19 @@ After deploying the VMware HCX Connector OVA on-premises and starting the applia
 1. In **Connect your vCenter**, provide the FQDN or IP address of your vCenter server and the appropriate credentials, and then select **Continue**.
 
    >[!TIP]
-   >The vCenter server is where you deployed the VMware HCX Connector in your datacenter.
+   >The vCenter Server is where you deployed the VMware HCX Connector in your datacenter.
 
 1. In **Configure SSO/PSC**, provide your Platform Services Controller's FQDN or IP address, and select **Continue**.
 
    >[!NOTE]
-   >Typically, it's the same as your vCenter FQDN or IP address.
+   >Typically, it's the same as your vCenter Server FQDN or IP address.
 
 1. Verify that the information entered is correct and select **Restart**.
 
    >[!NOTE]
    >You'll experience a delay after restarting before being prompted for the next step.
 
-After the services restart, you'll see vCenter showing as green on the screen that appears. Both vCenter and SSO must have the appropriate configuration parameters, which should be the same as the previous screen.
+After the services restart, you'll see vCenter Server showing as green on the screen that appears. Both vCenter Server and SSO must have the appropriate configuration parameters, which should be the same as the previous screen.
 
 :::image type="content" source="media/tutorial-vmware-hcx/activation-done.png" alt-text="Screenshot of the dashboard with green vCenter status." lightbox="media/tutorial-vmware-hcx/activation-done.png":::
 
@@ -147,7 +147,7 @@ You can uninstall HCX Advanced through the portal, which removes the existing pa
 
 1. Enter **yes** to confirm the uninstall.
 
-At this point, HCX Advanced no longer has the vCenter plugin, and if needed, you can reinstall it at any time.
+At this point, HCX Advanced no longer has the vCenter Server plugin, and if needed, you can reinstall it at any time.
 
 
 ## Next steps

articles/azure-vmware/plan-private-cloud-deployment.md

@@ -10,7 +10,7 @@ ms.date: 09/27/2021
 
 Planning your Azure VMware Solution deployment is critical for a successful production-ready environment for creating virtual machines (VMs) and migration. During the planning process, you'll identify and gather what's needed for your deployment. As you plan, make sure to document the information you gather for easy reference during the deployment. A successful deployment results in a production-ready environment for creating virtual machines (VMs) and migration.
 
-In this how-to, you'll':
+In this how-to, you'll:
 
 > [!div class="checklist"]
 > * Identify the Azure subscription, resource group, region, and resource name
@@ -75,7 +75,7 @@ After the support team receives your request for a host quota, it takes up to fi
 
 ## Define the IP address segment for private cloud management
 
-Azure VMware Solution requires a /22 CIDR network, for example, `10.0.0.0/22`. This address space is carved into smaller network segments (subnets) and used for Azure VMware Solution management segments, including vCenter, VMware HCX, NSX-T, and vMotion functionality. The diagram highlights Azure VMware Solution management IP address segments.
+Azure VMware Solution requires a /22 CIDR network, for example, `10.0.0.0/22`. This address space is carved into smaller network segments (subnets) and used for Azure VMware Solution management segments, including vCenter Server, VMware HCX, NSX-T Data Center, and vMotion functionality. The diagram highlights Azure VMware Solution management IP address segments.
 
 :::image type="content" source="media/pre-deployment/management-vmotion-vsan-network-ip-diagram.png" alt-text="Diagram showing Azure VMware Solution management IP address segments." border="false":::  
 
@@ -86,7 +86,7 @@ Azure VMware Solution requires a /22 CIDR network, for example, `10.0.0.0/22`. T
 
 ## Define the IP address segment for VM workloads
 
-Like with any VMware environment, the VMs must connect to a network segment.  As the production deployment of Azure VMware Solution expands, there is often a combination of L2 extended segments from on-premises and local NSX-T network segments. 
+Like with any VMware vSphere environment, the VMs must connect to a network segment.  As the production deployment of Azure VMware Solution expands, there is often a combination of L2 extended segments from on-premises and local NSX-T network segments. 
 
 For the initial deployment, identify a single network segment (IP network), for example, `10.0.4.0/24`. This network segment is used primarily for testing purposes during the initial deployment.  The address block shouldn't overlap with any network segments on-premises or within Azure and shouldn't be within the /22 network segment already defined. 
 
@@ -104,23 +104,23 @@ Azure VMware Solution requires an Azure Virtual Network and an ExpressRoute circ
 
 ## Define VMware HCX network segments
 
-VMware HCX is an application mobility platform that simplifies application migration, workload rebalancing, and business continuity across data centers and clouds. You can migrate your VMware workloads to Azure VMware Solution and other connected sites through various migration types. 
+VMware HCX is an application mobility platform that simplifies application migration, workload rebalancing, and business continuity across data centers and clouds. You can migrate your VMware vSphere workloads to Azure VMware Solution and other connected sites through various migration types. 
 
 VMware HCX Connector deploys a subset of virtual appliances (automated) that require multiple IP segments. When you create your network profiles, you use the IP segments. Identify the following for the VMware HCX deployment, which supports a pilot or small product use case.  Depending on the needs of your migration, modify as necessary. 
 
-- **Management network:** When deploying VMware HCX on-premises, you'll need to identify a management network for VMware HCX.  Typically, it's the same management network used by your on-premises VMware cluster.  At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
+- **Management network:** When deploying VMware HCX on-premises, you'll need to identify a management network for VMware HCX.  Typically, it's the same management network used by your on-premises VMware vSphere cluster.  At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
 
   >[!NOTE]
-  >Preparing for large environments, instead of using the management network used for the on-premises VMware cluster, create a new /26 network and present that network as a port group to your on-premises VMware cluster.  You can then create up to 10 service meshes and 60 network extenders (-1 per service mesh). You can stretch **eight** networks per network extender by using Azure VMware Solution private clouds.
+  >Preparing for large environments, instead of using the management network used for the on-premises VMware vSphere cluster, create a new /26 network and present that network as a port group to your on-premises VMware vSphere cluster.  You can then create up to 10 service meshes and 60 network extenders (-1 per service mesh). You can stretch **eight** networks per network extender by using Azure VMware Solution private clouds.
 
 - **Uplink network:** When deploying VMware HCX on-premises, you'll need to identify an Uplink network for VMware HCX. Use the same network which you’ll use for the Management network. 
 
-- **vMotion network:** When deploying VMware HCX on-premises, you'll need to identify a vMotion network for VMware HCX.  Typically, it's the same network used for vMotion by your on-premises VMware cluster.  At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
+- **vMotion network:** When deploying VMware HCX on-premises, you'll need to identify a vMotion network for VMware HCX.  Typically, it's the same network used for vMotion by your on-premises VMware vSphere cluster.  At a minimum, identify **two** IPs on this network segment for VMware HCX. You might need larger numbers, depending on the scale of your deployment beyond the pilot or small use case.
 
   You must expose the vMotion network on a distributed virtual switch or vSwitch0. If it's not, modify the environment to accommodate.
 
   >[!NOTE]
-  >Many VMware environments use non-routed network segments for vMotion, which poses no problems.
+  >Many VMware vSphere environments use non-routed network segments for vMotion, which poses no problems.
   
 - **Replication network:** When deploying VMware HCX on-premises, you'll need to define a replication network. Use the same network as you are using for your Management and Uplink networks.  If the on-premises cluster hosts use a dedicated Replication VMkernel network, reserve **two** IP addresses in this network segment and use the Replication VMkernel network for the replication network.
 

articles/azure-vmware/tutorial-create-private-cloud.md

@@ -9,12 +9,12 @@ ms.date: 09/29/2021
 
 The Azure VMware Solution private gives you the ability to deploy a vSphere cluster in Azure. For each private cloud created, there's one vSAN cluster by default. You can add, delete, and scale clusters.  The minimum number of hosts per cluster is three. More hosts can be added one at a time, up to a maximum of 16 hosts per cluster. The maximum number of clusters per private cloud is four.  The initial deployment of Azure VMware Solution has three hosts. 
 
-You use vSphere and NSX-T Manager to manage most other aspects of cluster configuration or operation. All local storage of each host in a cluster is under the control of vSAN.
+You use vCenter Server and NSX-T Manager to manage most other aspects of cluster configuration or operation. All local storage of each host in a cluster is under the control of vSAN.
 
 >[!TIP]
 >You can always extend the cluster and add additional clusters later if you need to go beyond the initial deployment number.
 
-Because Azure VMware Solution doesn't allow you to manage your private cloud with your on-premises vCenter at launch, you'll need to do additional steps for the configuration.  This tutorial covers these steps and related prerequisites.
+Because Azure VMware Solution doesn't allow you to manage your private cloud with your cloud vCenter Server at launch, you'll need to do additional steps for the configuration. This tutorial covers these steps and related prerequisites.
 
 In this tutorial, you'll learn how to:
 

articles/azure-vmware/tutorial-expressroute-global-reach-private-cloud.md

@@ -26,7 +26,7 @@ After you're finished, follow the recommended next steps at the end to continue
 
 ## Prerequisites
 
-- Review the documentation on how to [enable connectivity in different Azure subscriptions](../expressroute/expressroute-howto-set-global-reach-cli.md#enable-connectivity-between-expressroute-circuits-in-different-azure-subscriptions).  
+- Review the documentation on how to [enable connectivity in different Azure subscriptions](../expressroute/expressroute-howto-set-global-reach-portal.md).  
 
 - A separate, functioning ExpressRoute circuit for connecting on-premises environments to Azure, which is _circuit 1_ for peering.