Merge pull request #211288 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-b2c/add-api-connector-token-enrichment.md

@@ -144,7 +144,7 @@ Content-type: application/json
 | -------------------------------------------------- | ----------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | version     | String | Yes      | The version of your API.                                                    |
 | action                                             | String            | Yes      | Value must be `Continue`.                                                                                                                                                                                                                                                              |
-| \<builtInUserAttribute>                            | \<attribute-type> | No       | They can returned in the token if selected as an **Application claim**.                                        |
+| \<builtInUserAttribute>                            | \<attribute-type> | No       | They can be returned in the token if selected as an **Application claim**.                                        |
 | \<extension\_{extensions-app-id}\_CustomAttribute> | \<attribute-type> | No       | The claim does not need to contain `_<extensions-app-id>_`, it is *optional*. They can returned in the token if selected as an **Application claim**.  |
 
 ::: zone-end

articles/active-directory/managed-identities-azure-resources/how-to-view-associated-resources-for-an-identity.md

@@ -64,7 +64,7 @@ https://management.azure.com/subscriptions/{resourceID of user-assigned identity
 
 | Parameter   | Example  |Description  |
 |---|---|---|
-| $filter  |  ```'type' eq 'microsoft.cognitiveservices/account' and contains(name, 'test')``` |  An OData expression that allows you to filter any of the available fields: name, type, resourceGroup, subscriptionId, subscriptionDisplayName<br/><br/>The following operations are supported: ```and```, ```or```, ```eq``` and ```contains``` |
+| $filter  |  ```type eq 'microsoft.cognitiveservices/account' and contains(name, 'test')``` |  An OData expression that allows you to filter any of the available fields: name, type, resourceGroup, subscriptionId, subscriptionDisplayName<br/><br/>The following operations are supported: ```and```, ```or```, ```eq``` and ```contains``` |
 |  $orderby |  ```name asc``` |  An OData expression that allows you to order by any of the available fields |
 |  $skip |  50 |  The number of items you want to skip while paging through the results. |
 | $top  |  10 | The number of resources to return. 0 will return only a count of the resources.  |

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

@@ -118,6 +118,37 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
 
 	![The Certificate download link](common/copy-metadataurl.png)
 
+
+
+
+1. The Name ID attribute in Azure AD can be mapped to any desired user attribute by editing the Attributes & Claims section.
+
+   > [!div class="mx-imgBorder"]
+   > ![Screenshot showing how to edit Attributes and Claims.](common/edit-attribute.png)
+	
+    a. After clicking on Edit, any desired user attribute can be mapped by clicking on Unique User Identifier (Name ID).
+    
+   > [!div class="mx-imgBorder"]
+   > ![Screenshot showing the NameID in Attributes and Claims.](common/attribute-nameID.png)
+	
+    b. On the next screen, the desired attribute name like user.userprincipalname can be selected as an option from the Source Attribute dropdown menu.
+    
+   > [!div class="mx-imgBorder"]
+   > ![Screenshot showing how to select Attributes and Claims.](common/attribute-select.png)
+	
+    c. The selection can then be saved by clicking on the Save button at the top.
+    
+   > [!div class="mx-imgBorder"]
+   > ![Screenshot showing how to save Attributes and Claims.](common/attribute-save.png)
+	
+    d. Now, the user.userprincipalname attribute source in Azure AD is mapped to the Name ID attribute name in Azure AD which will be compared with the username attribute in Atlassian by the SSO plugin.
+    
+   > [!div class="mx-imgBorder"]
+   > ![Screenshot showing how to review Attributes and Claims.](common/attribute-review.png)
+	
+	> [!NOTE]
+	> The SSO service provided by Microsoft Azure supports SAML authentication which is able to perform user identification using different attributes such as givenname (first name), surname (last name), email (email address), and user principal name (username). We recommend not to use email as an authentication attribute as email addresses are not always verified by Azure AD. The plugin compares the values of Atlassian username attribute with the NameID attribute in Azure AD in order to determine the valid user authentication.
+
 ### Create an Azure AD test user
 
 In this section, you'll create a test user in the Azure portal called B.Simon.

articles/education-hub/azure-dev-tools-teaching/program-faq.yml

@@ -200,15 +200,15 @@ sections:
         answer: |
           :::row:::
              :::column span="":::
-                Microsoft Access<br>
+                Access<br>
           Advanced Threat Analytics<br>
           Agents for Visual Studio<br>
           BizTalk Server<br>
           SQL Server Mobile Report Publisher (formerly Datazen Enterprize)<br>
           Host Integration Server<br>
           Machine Learning Server (formerly R Server)<br>
           Hyper-V Server<br>
-          Microsoft Project<br>
+          Project Professional<br>
           Remote Tools for Visual Studio<br>
           SharePoint Server<br>
           Skype for Business Server<br>
@@ -220,7 +220,7 @@ sections:
           SQL Server Web<br>
           System Center<br>
           Azure DevOps Server (formerly Visual Studio Team Foundation Server)<br>
-          Microsoft Visio<br>
+          Visio Professional<br>
           Visual Studio Code<br>
           Visual Studio Community<br>
           Visual Studio Enterprise<br>

articles/event-hubs/apache-kafka-configurations.md

@@ -53,7 +53,7 @@ Property | Recommended Values | Permitted Range | Notes
 
 Property | Recommended Values | Permitted Range | Notes
 ---|---:|-----:|---
-`retries` | > 0 | | Default is 2. We recommend that you keep this value. 
+`retries` | 2 | | Default is 2147483647. 
 `request.timeout.ms` | 30000 .. 60000 | > 20000| Event Hubs will internally default to a minimum of 20,000 ms.  `librdkafka` default value is 5000, which can be problematic. *While requests with lower timeout values are accepted, client behavior isn't guaranteed.*
 `partitioner` | `consistent_random` | See librdkafka documentation | `consistent_random` is default and best.  Empty and null keys are handled ideally for most cases.
 `compression.codec` | `none` || Compression currently not supported.