Merge pull request #190310 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/authentication/concept-registration-mfa-sspr-combined.md

@@ -21,7 +21,7 @@ Before combined registration, users registered authentication methods for Azure
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. 
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the sepperate legacy registration workflows for MFA and SSPR.
+> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the separate legacy registration workflows for MFA and SSPR.
 
 This article outlines what combined security registration is. To get started with combined security registration, see the following article:
 

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

@@ -21,7 +21,7 @@ Before combined registration, users registered authentication methods for Azure
 
 > [!NOTE]
 > Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
-> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the sepperate legacy registration workflows for MFA and SSPR.
+> After Sept. 30th, 2022, all existing Azure AD tenants will be automatically enabled for combined registration. After this date tenants will be unable to utilize the separate legacy registration workflows for MFA and SSPR.
 
 To make sure you understand the functionality and effects before you enable the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
 

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-all-reports.md

@@ -28,12 +28,12 @@ This article provides you with a list and description of the system reports avai
 
 ## Download a system report
 
-1. In the CloudKnox home page, select the **Reports** tab, and then select the **Systems reports** subtab.
+1. In the CloudKnox home page, select the **Reports** tab, and then select the **Systems Reports** subtab.
 1. In the **Report Name** column, find the report you want, and then select the down arrow to the right of the report name to download the report.
 
     Or, from the ellipses **(...)** menu, select **Download**.
 
-    The following message displays: **Successfully started to generate on demand report.**
+    The following message displays: **Successfully Started To Generate On Demand Report.**
 
 
 ## Summary of available system reports

articles/active-directory/external-identities/reset-redemption-status.md

@@ -60,15 +60,18 @@ If a user wants to sign in using a different email:
 >
 ### Use PowerShell to reset redemption status
 
-Install the latest AzureADPreview PowerShell module and create a new invitation with `InvitedUserEmailAddress` set to the new email address, and `ResetRedemption` set to `true`.
-
-```powershell  
-Uninstall-Module AzureADPreview 
-Install-Module AzureADPreview 
-Connect-AzureAD 
-$ADGraphUser = Get-AzureADUser -objectID "UPN of User to Reset"  
-$msGraphUser = New-Object Microsoft.Open.MSGraph.Model.User -ArgumentList $ADGraphUser.ObjectId 
-New-AzureADMSInvitation -InvitedUserEmailAddress <<external email>> -SendInvitationMessage $True -InviteRedirectUrl "http://myapps.microsoft.com" -InvitedUser $msGraphUser -ResetRedemption $True 
+```powershell
+Install-Module Microsoft.Graph
+Select-MgProfile -Name beta
+Connect-MgGraph
+
+$user = Get-MgUser -Filter "startsWith(mail, '[email protected]')"
+New-MgInvitation `
+    -InvitedUserEmailAddress $user.Mail `
+    -InviteRedirectUrl "http://myapps.microsoft.com" `
+    -ResetRedemption `
+    -SendInvitationMessage `
+    -InvitedUser $user
 ```
 
 ### Use Microsoft Graph API to reset redemption status

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

@@ -57,7 +57,7 @@ As of now, following versions of Confluence are supported:
 
 - Confluence: 5.0 to 5.10
 - Confluence: 6.0.1 to 6.15.9
-- Confluence: 7.0.1 to 7.15.0
+- Confluence: 7.0.1 to 7.16.2
 
 > [!NOTE]
 > Please note that our Confluence Plugin also works on Ubuntu Version 16.04

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

@@ -30,7 +30,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
 To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
 
 - An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
-- JIRA Core and Software 6.4 to 8.21 or JIRA Service Desk 3.0 to 4.21.0 should installed and configured on Windows 64-bit version
+- JIRA Core and Software 6.4 to 8.22.0 or JIRA Service Desk 3.0 to 4.22.0 should installed and configured on Windows 64-bit version
 - JIRA server is HTTPS enabled
 - Note the supported versions for JIRA Plugin are mentioned in below section.
 - JIRA server is reachable on the Internet particularly to the Azure AD login page for authentication and should able to receive the token from Azure AD
@@ -51,8 +51,8 @@ To get started, you need the following items:
 
 ## Supported versions of JIRA
 
-* JIRA Core and Software: 6.4 to 8.21
-* JIRA Service Desk 3.0 to 4.21.0
+* JIRA Core and Software: 6.4 to 8.22.0
+* JIRA Service Desk 3.0 to 4.22.0
 * JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
 
 > [!NOTE]

articles/azure-monitor/app/azure-ad-authentication.md

@@ -107,7 +107,7 @@ import { DefaultAzureCredential } from "@azure/identity";
 
 const credential = new DefaultAzureCredential();
 appInsights.setup("InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://xxxx.applicationinsights.azure.com/").start();
-appInsights.defaultClient.aadTokenCredential = credential;
+appInsights.defaultClient.config.aadTokenCredential = credential;
 
 ```
 
@@ -123,7 +123,7 @@ const credential = new ClientSecretCredential(
     "<YOUR_CLIENT_SECRET>"
   );
 appInsights.setup("InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://xxxx.applicationinsights.azure.com/").start();
-appInsights.defaultClient.aadTokenCredential = credential;
+appInsights.defaultClient.config.aadTokenCredential = credential;
 
 ```
 

articles/communication-services/quickstarts/ui-library/includes/get-started-call/ios.md

@@ -48,6 +48,7 @@ end
 
 3. Run `pod install --repo-update`.
 4. Open the generated `.xcworkspace` with Xcode.
+5. (Optional) For Mackbook Pro M1, install and enable [Rosetta](https://support.apple.com/en-us/HT211861) in Xcode.
 
 ### Request access to the microphone, camera, etc.
 
@@ -73,7 +74,7 @@ Set `Enable Bitcode` option to `No` in the project `Build Settings`. To find the
 
 ## Initialize composite
 
-Go to 'ViewController'. Here we'll drop the following code to initialize our Composite Components for Call. Replace `<GROUP_CALL_ID>` with either your call group ID or `UUID()` to generate one. Also replace `<DISPLAY_NAME>` with your name, and `<USER_ACCESS_TOKEN>` with your token.
+Go to 'ViewController'. Here we'll drop the following code to initialize our Composite Components for Call. Replace `<GROUP_CALL_ID>` with either your call group ID or `UUID()` to generate one. Also replace `<DISPLAY_NAME>` with your name, and `<USER_ACCESS_TOKEN>` with your token. The limit for string length of `<DISPLAY_NAME>` is 256.
 
 ```swift
 import UIKit

articles/purview/catalog-permissions.md

@@ -26,7 +26,7 @@ Azure Purview uses a set of predefined roles to control who can access what with
 - **Collection administrator** - a role for users that will need to assign roles to other users in Azure Purview or manage collections. Collection admins can add users to roles on collections where they're admins. They can also edit collections, their details, and add subcollections.
 - **Data curators** - a role that provides access to the data catalog to manage assets, configure custom classifications, set up glossary terms, and view insights. Data curators can create, read, modify, move, and delete assets. They can also apply annotations to assets.
 - **Data readers** - a role that provides read-only access to data assets, classifications, classification rules, collections and glossary terms.
-- **Data source administrators** - a role that allows a user to manage data sources and scans. If a user is granted only to **Data source admin** role on a given data source, they can run new scans using an existing scan rule. To create new scan rules, the user must be also granted as either **Data reader** or **Data curator** roles.
+- **Data source administrator** - a role that allows a user to manage data sources and scans. If a user is granted only to **Data source admin** role on a given data source, they can run new scans using an existing scan rule. To create new scan rules, the user must be also granted as either **Data reader** or **Data curator** roles.
 - **Policy author (Preview)** - a role that allows a user to view, update, and delete Azure Purview policies through the policy management app within Azure Purview.
 
 > [!NOTE] 

articles/purview/concept-best-practices-glossary.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Purview glossary best practices
 description: This article provides examples of Azure Purview glossary best practices.
-author: zeinam
+author: zeinab-mk
 ms.author: zeinam
 ms.service: purview
 ms.subservice: purview-data-catalog
@@ -30,7 +30,7 @@ The adoption by your organization of the business glossary will depend on you pr
 
 ## Why is a common business glossary needed?
 Without a common business glossary an organization's performance, culture, operations, and strategy often will adversely hinder the business. You will observe, in this hindrance, a condition in which cultural differences arise grounded in an inconsistent business language. These inconsistencies about the business language are communicated between team members and prevents them from leveraging their relevant data assets as a competitive advantage.
-You will also observe when there are language barriers, in which, most organizations will spend more time pursuing non-productive and non-collaborative activates as they need to rely on more detailed interactions to reach the same meaning and understanding for their data assets. 
+You will also observe when there are language barriers, in which, most organizations will spend more time pursuing non-productive and non-collaborative activities as they need to rely on more detailed interactions to reach the same meaning and understanding for their data assets. 
 
 ## Recommendations for implementing new glossary terms
 
@@ -71,7 +71,7 @@ When building new term templates in Azure Purview, review the following consider
 - When importing terms from a .CSV file, be sure that terms already existing in Azure Purview are intended to be updated. When using the import feature, Azure Purview will overwrite existing terms.
 - Before importing terms, test the import in a lab environment to ensure that no unexpected results occur, such as duplicate terms. 
 - The email address for Stewards and Experts should be the primary address of the user from the Azure Active Directory group. Alternate email, user principal name and non-Azure Active Directory emails are not yet supported.
-- Glossary terms provide fours status: draft, approved, expire, alert. Draft is not officially implemented, approved is official/stand/approved for production, expired means should no longer be used, alert need to pay more attention.
+- Glossary terms provide fours status: Draft, Approved, Expired, Alert. Draft is not officially implemented, Approved is official/stand/approved for production, Expired means should no longer be used, Alert need to pay more attention.
 For more information, see [Create, import, and export glossary terms](./how-to-create-import-export-glossary.md)
 
 ## Recommendations for exporting glossary terms 
@@ -88,8 +88,8 @@ Exporting terms may be useful in Azure Purview account to account, Backup, or Di
   - Manually, using Azure Purview Studio.
   - Using Bulk Edit mode to update up to 25 assets, using Azure Purview Studio.
   - Curated Code using the Atlas API.
-- Use Bulk Edit Mode when assigning terms manually. This feature allows a curator to assign glossary terms, stewards, experts, and classifications in bulk based on selected items from a search result. Multiple searches can be chained by selecting objects in the results. The Bulk Edit will apply to all selected objects. Be sure to clear the selections after the bulk edit has been performed. 
-- Other bulk edit operations can be performed by using the Atlas API. An example would be using the API to add descriptions or other custom properties to assets in bulk programmatically
+- Use Bulk Edit Mode when assigning terms manually. This feature allows a curator to assign glossary terms, owners, experts, classifications and certified in bulk based on selected items from a search result. Multiple searches can be chained by selecting objects in the results. The Bulk Edit will apply to all selected objects. Be sure to clear the selections after the bulk edit has been performed. 
+- Other bulk edit operations can be performed by using the Atlas API. An example would be using the API to add descriptions or other custom properties to assets in bulk programmatically.
 
 ## Next steps
 -  [Create, import, and export glossary terms](./how-to-create-import-export-glossary.md)