Merge pull request #231796 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: huypub

articles/active-directory/app-provisioning/provision-on-demand.md

@@ -173,6 +173,7 @@ There are currently a few known limitations to on-demand provisioning. Post your
 * Restoring a previously soft-deleted user in the target tenant with on-demand provisioning isn't supported. If you try to soft delete a user with on-demand provisioning and then restore the user, it can result in duplicate users.
 * On-demand provisioning of roles isn't supported.
 * On-demand provisioning supports disabling users that have been unassigned from the application. However, it doesn't support disabling or deleting users that have been disabled or deleted from Azure AD. Those users won't appear when you search for a user.
+* On-demand provisioning does not support nested groups that are not directly assigned to the application.
 
 ## Next steps
 

articles/active-directory/develop/troubleshoot-required-resource-access-limits.md

@@ -14,7 +14,7 @@ ms.reviewer: phsignor, jawoods
 
 # Troubleshooting the configured permissions limits
 
-The `RequiredResourceAccess` collection (RRA) on an application object contains all the configured API permissions that an app requires for its default consent request. This collection has various limits depending on which types of identities the app supports, For more information on the limits for supported account types, see [Validation differences by supported account types](supported-accounts-validation.md).
+The `RequiredResourceAccess` collection (RRA) on an application object contains all the configured API permissions that an app requires for its default consent request. This collection has various limits depending on which types of identities the app supports. For more information on the limits for supported account types, see [Validation differences by supported account types](supported-accounts-validation.md).
 
 The limits on maximum permissions were updated in May 2022, so some apps may have more permissions in their RRA than are now allowed. In addition, apps that change their supported account types after configuring permissions may exceed the limits of the new setting. When apps exceed the configured permissions limit, no new permissions may be added until the number of permissions in the `RequiredResourceAccess` collection is brought back under the limits.
 
@@ -35,7 +35,6 @@ If you still need the application or are unsure, the following steps will help y
 1. **Remove duplicate permissions.** In some cases, the same permission is listed multiple times. Review the required permissions and remove permissions that are listed two or more times. See the related PowerShell script on the [additional resources](#additional-resources) section of this article.
 2. **Remove unused permissions.** Review the permissions required by the application and compare them to what the application or service does. Remove permissions that are configured in the app registration, but which the application or service doesn’t require. For more information on how to review permissions, see [Review application permissions](../manage-apps/manage-application-permissions.md)
 3. **Remove redundant permissions.** In many APIs, including Microsoft Graph, some permissions aren't necessary when other more privileged permissions are included. For example, the Microsoft Graph permission User.Read.All (read all users) isn't needed when an application also has User.ReadWrite.All (read, create and update all users). To learn more about Microsoft Graph permissions, see [Microsoft Graph permissions reference](/graph/permissions-reference). 
-4. **Use multiple app registrations.** If a single app or service requires more than 400 permissions in the required permissions list, the app will need to be configured to use two (or more) different app registrations, each one with 400 or fewer permissions configured on the app registration. 
 
 ## Frequently asked questions (FAQ)
 
@@ -147,4 +146,4 @@ process {
 
 - Learn about API permissions and the Microsoft identity platform: [Overview of permissions and consent in the Microsoft identity platform](permissions-consent-overview.md)
 - Understand the permissions available for Microsoft Graph: [Microsoft Graph permissions reference](/graph/permissions-reference)
-- Review the limitations to application configurations: [Validation differences by supported account types](supported-accounts-validation.md)
+- Review the limitations to application configurations: [Validation differences by supported account types](supported-accounts-validation.md)

articles/active-directory/manage-apps/manage-application-permissions.md

@@ -58,7 +58,7 @@ Each option generates PowerShell scripts that enable you to control user access
 Use the following Azure AD PowerShell script to revoke all permissions granted to an application.
 
 ```powershell
-Connect-AzureAD -Scopes "Application.ReadWrite.All", "Directory.ReadWrite.All", "DelegatedPermissionGrant.ReadWrite.All" "AppRoleAssignment.ReadWrite.All", 
+Connect-AzureAD 
 
 # Get Service Principal using objectId
 $sp = Get-AzureADServicePrincipal -ObjectId "<ServicePrincipal objectID>"
@@ -85,7 +85,7 @@ $spApplicationPermissions | ForEach-Object {
 Remove appRoleAssignments for users or groups to the application using the following scripts.
 
 ```powershell
-Connect-AzureAD -Scopes "Application.ReadWrite.All", "Directory.ReadWrite.All", "AppRoleAssignment.ReadWrite.All"
+Connect-AzureAD
 
 # Get Service Principal using objectId
 $sp = Get-AzureADServicePrincipal -ObjectId "<ServicePrincipal objectID>"

articles/azure-government/documentation-government-aad-auth-qs.md

@@ -55,7 +55,7 @@ The only variation when setting up Azure AD Authorization on the Azure Governmen
 
     ```cs
     //ClientId: Azure AD->  App registrations -> Application ID
-    //Domain: <tenantname>.onmicrosoft.com
+    //Domain: <tenantname>.onmicrosoft.us
     //TenantId: Azure AD -> Properties -> Directory ID
 
     "Authentication": {
@@ -71,7 +71,7 @@ The only variation when setting up Azure AD Authorization on the Azure Governmen
     ```
 4. Fill out the `ClientId` property with the Client ID for your app from the Azure Government portal. You can find the Client ID by navigating to Azure AD -> App Registrations -> Your Application -> Application ID. 
 5. Fill out the `TenantId` property with the Tenant ID for your app from the Azure Government portal. You can find the Tenant ID by navigating to Azure AD -> Properties -> Directory ID. 
-6. Fill out the `Domain` property with `<tenantname>.onmicrosoft.com`.
+6. Fill out the `Domain` property with `<tenantname>.onmicrosoft.us`.
 7. Open the `startup.cs` file.
 8. In your `ConfigureServices` method, add the following code:
 

articles/azure-maps/glossary.md

@@ -281,7 +281,7 @@ The following list describes common words used with the Azure Maps services.
 
 <a name="postal-code"></a> **Postal code**: A series of letters or numbers, or both, in a specific format. The postal-code is used by the postal service of a country/region to divide geographic areas into zones in order to simplify delivery of mail.
 
-<a name="primary-key"></a> **Primary key**: The first of two subscriptions keys provided for Azure Maps shared key authentication. See [Shared key authentication](#shared-key-authentication).
+<a name="primary-key"></a> **Primary key**: The first of two subscription keys provided for Azure Maps shared key authentication. See [Shared key authentication](#shared-key-authentication).
 
 <a name="prime-meridian"></a> **Prime meridian**: A line of longitude that represents 0-degrees longitude. Generally, longitude values decrease when traveling in a westerly direction until 180 degrees and increase when traveling in easterly directions to -180-degrees. 
 

articles/azure-maps/how-to-use-spatial-io-module.md

@@ -219,7 +219,7 @@ You can load the Azure Maps spatial IO module using one of the two options:
     </html>
     ```
 
-5. Remember to replace `<Your Azure Maps Key>` with your primary key. Open your HTML file, and you'll see results similar to the following image:
+5. Remember to replace `<Your Azure Maps Key>` with your subscription key. Open your HTML file, and you'll see results similar to the following image:
 
     <center>
 

articles/azure-maps/quick-android-map.md

@@ -49,16 +49,16 @@ Create a new Azure Maps account using the following steps:
 
     :::image type="content" source="./media/shared/create-account.png" alt-text="A screenshot that shows the Create Maps account pane in the Azure portal.":::
 
-## Get the primary key for your account
+## Get the subscription key for your account
 
-Once your Azure Maps account is successfully created, retrieve the primary key that enables you to query the Maps APIs.
+Once your Azure Maps account is successfully created, retrieve the subscription key that enables you to query the Maps APIs.
 
 1. Open your Azure Maps account in the portal.
 2. In the left pane, select **Authentication**.
 3. Copy the **Primary Key** and save it locally to use later in this tutorial.
 
 >[!NOTE]
-> If you use the Azure subscription key instead of the Azure Maps primary key, your map won't render properly. Also, for security purposes, it is recommended that you rotate between your primary and secondary keys. To rotate keys, update your app to use the secondary key, deploy, then press the cycle/refresh button beside the primary key to generate a new primary key. The old primary key will be disabled. For more information on key rotation, see [Set up Azure Key Vault with key rotation and auditing](../key-vault/secrets/tutorial-rotation-dual.md)
+> For security purposes, it is recommended that you rotate between your primary and secondary keys. To rotate keys, update your app to use the secondary key, deploy, then press the cycle/refresh button beside the primary key to generate a new primary key. The old primary key will be disabled. For more information on key rotation, see [Set up Azure Key Vault with key rotation and auditing](../key-vault/secrets/tutorial-rotation-dual.md)
 
 :::image type="content" source="./media/quick-android-map/get-key.png" alt-text="A screenshot showing the Azure Maps Primary key in the Azure portal.":::
 

articles/azure-maps/quick-demo-map-app.md

@@ -1,7 +1,7 @@
 ---
 title: 'Quickstart: Interactive map search with Azure Maps'
 titeSuffix: Microsoft Azure Maps
-description: 'Quickstart: Learn how to create interactive, searchable maps. See how to create an Azure Maps account, get a primary key, and use the Web SDK to set up map applications'
+description: 'Quickstart: Learn how to create interactive, searchable maps. See how to create an Azure Maps account, get the subscription key, and use the Web SDK to set up map applications'
 author: eriklindeman
 ms.author: eriklind
 ms.date: 12/23/2021
@@ -16,7 +16,7 @@ ms.custom: mvc, mode-other
 In this quickstart, you will learn how to use Azure Maps to create a map that gives users an interactive search experience. It walks you through these basic steps:
 
 * Create your own Azure Maps account.
-* Get your primary key to use in the demo web application.
+* Get your Azure Maps subscription key to use in the demo web application.
 * Download and open the demo map application.
 
 This quickstart uses the Azure Maps Web SDK, however the Azure Maps service can be used with any map control, such as these popular [open-source map controls](open-source-projects.md#third-part-map-control-plugins) that the Azure Maps team has created plugin's for.
@@ -49,13 +49,13 @@ Create a new Azure Maps account with the following steps:
 
 ## Get the subscription key for your account
 
-Once your Azure Maps account is successfully created, retrieve the primary key that enables you to query the Maps APIs.
+Once your Azure Maps account is successfully created, retrieve the subscription key that enables you to query the Maps APIs.
 
 1. Open your Maps account in the portal.
 2. In the settings section, select **Authentication**.
 3. Copy the **Primary Key** and save it locally to use later in this tutorial.
 
-:::image type="content" source="./media/quick-demo-map-app/get-key.png" alt-text="Screenshot showing your Azure Maps Primary Key in the Azure portal" lightbox="./media/quick-demo-map-app/get-key.png":::
+:::image type="content" source="./media/quick-demo-map-app/get-key.png" alt-text="Screenshot showing your Azure Maps subscription key in the Azure portal" lightbox="./media/quick-demo-map-app/get-key.png":::
 
 >[!NOTE]
 > This quickstart uses the [Shared Key](azure-maps-authentication.md#shared-key-authentication) authentication approach for demonstration purposes, but the preferred approach for any production environment is to use [Azure Active Directory](azure-maps-authentication.md#azure-ad-authentication) authentication.
@@ -67,7 +67,7 @@ Once your Azure Maps account is successfully created, retrieve the primary key t
 3. Add the **Primary Key** value you got in the preceding section
     1. Comment out all of the code in the `authOptions` function, this code is used for Azure Active Directory authentication.
     1. Uncomment the last two lines in the `authOptions` function, this code is used for Shared Key authentication, the approach being used in this quickstart.
-    1. Replace `<Your Azure Maps Key>` with the **Primary Key** value from the preceding section.
+    1. Replace `<Your Azure Maps Key>` with the subscription key value from the preceding section.
 
 ## Open the demo application
 

articles/azure-maps/quick-ios-app.md

@@ -52,7 +52,7 @@ Create a new Azure Maps account with the following steps:
 
     ![Create an Azure maps account.](./media/shared/create-account.png)
 
-## Get the primary key for your account
+## Get the subscription key for your account
 
 Once your Maps account is successfully created, retrieve the primary key that enables you to query the Maps APIs.
 

articles/azure-vmware/includes/vmware-software-versions.md

@@ -19,7 +19,7 @@ The VMware solution software versions used in new deployments of Azure VMware So
 | VMware ESXi                  |    [7.0 U3c](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vsphere-esxi-70u3c-release-notes.html)   |
 | VMware vSAN                  |    [7.0 U3c](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vmware-vsan-703-release-notes.html)   |
 | VMware vSAN on-disk format   |    [10](https://kb.vmware.com/s/article/2148493)        |
-| VMware HCX                   |    [4.4.2](https://docs.vmware.com/en/VMware-HCX/4.4.2/rn/vmware-hcx-442-release-notes/index.html)     |
+| VMware HCX                   |    [4.5.0](https://docs.vmware.com/en/VMware-HCX/4.5/rn/vmware-hcx-45-release-notes/index.html)     |
 | VMware NSX-T Data Center <br />**NOTE:** VMware NSX-T Data Center is the only supported version of NSX Data Center.                     |    [!INCLUDE [nsxt-version](nsxt-version.md)]   |
 
 The current running software version is applied to new clusters added to an existing private cloud.