Merge pull request #110244 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to master

Author: tfosmark

articles/active-directory-b2c/secure-rest-api.md

@@ -268,7 +268,7 @@ To support bearer token authentication in your custom policy, modify the REST AP
 1. Ensure you add the claim used above as an input claim:
 
     ```xml
-    <InputClaim ClaimTyeReferenceId="bearerToken"/>
+    <InputClaim ClaimTypeReferenceId="bearerToken"/>
     ```    
 
 After you add the above snippets, your technical profile should look like the following XML code:
@@ -288,7 +288,7 @@ After you add the above snippets, your technical profile should look like the fo
         <Item Key="AllowInsecureAuthInProduction">false</Item>
       </Metadata>
       <InputClaims>
-        <InputClaim ClaimTyeReferenceId="bearerToken"/>
+        <InputClaim ClaimTypeReferenceId="bearerToken"/>
       </InputClaims>
       ...
     </TechnicalProfile>

articles/active-directory/authentication/concept-authentication-passwordless.md

@@ -159,7 +159,7 @@ Use the following table to choose which method will support your requirements an
 
 ## Next steps
 
-[Enable FIDO2 security key passwordlesss options in your organization](howto-authentication-passwordless-security-key.md)
+[Enable FIDO2 security key passwordless options in your organization](howto-authentication-passwordless-security-key.md)
 
 [Enable phone-based passwordless options in your organization](howto-authentication-passwordless-phone.md)
 

articles/active-directory/hybrid/howto-troubleshoot-upn-changes.md

@@ -55,11 +55,11 @@ You can change a UPN by changing the prefix, suffix, or both.
 
    * [email protected] to [email protected] <br>
      Or<br>
-    *   [email protected] to [email protected] 
+    * [email protected] to [email protected] 
 
 Change the user's UPN every time the primary email address for a user is updated. No matter the reason for the email change, the UPN must always be updated to match.
 
-During the initial synchronization from Active Directory to Azure AD, ensure the users' emails  are identical to their UPNs
+During the initial synchronization from Active Directory to Azure AD, ensure the users' emails  are identical to their UPNs.
 
 ### UPNs in Active Directory
 
@@ -97,15 +97,15 @@ If the value of the userPrincipalName attribute doesn't correspond to a verified
 
 ### Roll-out bulk UPN changes
 
-Follow the[best practices for a pilot](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-deployment-plans) for bulk UPN changes. Also have a tested rollback plan for reverting UPNs if you find issues that can't be quickly resolved. Once your pilot is running, you can start targeting small sets of users with various organizational roles and their specific sets of apps or devices.
+Follow the [best practices for a pilot](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-deployment-plans) for bulk UPN changes. Also have a tested rollback plan for reverting UPNs if you find issues that can't be quickly resolved. Once your pilot is running, you can start targeting small sets of users with various organizational roles and their specific sets of apps or devices.
 
 Going through this first subset of users will give you a good idea of what users should expect as part of the change. Include this information on your user communications.
 
 Create a defined procedure for changing UPNs on individual users as part of normal operations. We recommend having a tested procedure that includes documentation about known issues and workarounds.
 
 The following sections detail potential known issues and workarounds when UPNs are changed.
 
-## user provisioning known issues and workarounds
+## Apps known issues and workarounds
 
 [Software as a service (SaaS)](https://azure.microsoft.com/overview/what-is-saas/) and Line of Business (LoB) applications often rely on UPNs to find users and store user profile information, including roles. Applications that use [Just in Time provisioning](https://docs.microsoft.com/azure/active-directory/app-provisioning/user-provisioning) to create a user profile when users sign in to the app for the first time can be affected by UPN changes.
 
@@ -114,6 +114,7 @@ Changing a user's UPN could break the relationship between the Azure AD user and
 
 **Workaround**<br>
 [Azure AD Automated User Provisioning](https://docs.microsoft.com/azure/active-directory/manage-apps/user-provisioning) lets you automatically create, maintain, and remove your user identities in supported cloud applications. Configuring automated user provisioning on your applications automatically updates UPNs on the applications. Test the applications as part of the progressive rollout to validate that they are not impacted by UPN changes.
+If you are a developer, consider [adding SCIM support to your application](https://docs.microsoft.com/azure/active-directory/app-provisioning/use-scim-to-provision-users-and-groups) to enable automatic user provisioning from Azure Active Directory. 
 
 ## Managed devices known issues and workarounds
 
@@ -127,7 +128,7 @@ By [bringing your devices to Azure AD](https://docs.microsoft.com/azure/active-d
 Users may experience single sign-on issues with applications that depend on Azure AD for authentication.
 
 **Workaround** <br>
-Allow enough time for the UPN change to sync to Azure AD. Once you verify that the new UPN is reflected on the Azure AD Portal, ask the user to select the "Other user" tile to sign in with their new UPN. you can also verify through [PowerShell](https://docs.microsoft.com/powershell/module/azuread/get-azureaduser?view=azureadps-2.0). After signing in with their new UPN, references to the old UPN might still appear on "Access work or school" Windows setting.
+Allow enough time for the UPN change to sync to Azure AD. Once you verify that the new UPN is reflected on the Azure AD Portal, ask the user to select the "Other user" tile to sign in with their new UPN. You can also verify through [PowerShell](https://docs.microsoft.com/powershell/module/azuread/get-azureaduser?view=azureadps-2.0). After signing in with their new UPN, references to the old UPN might still appear on the "Access work or school" Windows setting.
 
 ![Screenshot of verified domains](./media/howto-troubleshoot-upn-changes/other-user.png)
 
@@ -152,7 +153,8 @@ To unjoin a device from Azure AD, run the following command at a command prompt:
 
 **dsregcmd /leave**
 
-The user will need to [re-enroll](https://docs.microsoft.com/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision) for Windows Hello for Business if it's being used. Windows 7 and 8.1 devices are not affected by this issue after UPN changes.
+The user will need to [re-enroll](https://docs.microsoft.com/windows/security/identity-protection/hello-for-business/hello-hybrid-cert-whfb-provision) for Windows Hello for Business if it's being used. 
+Windows 7 and 8.1 devices are not affected by this issue after UPN changes.
 
 ## Microsoft Authenticator known issues and workarounds
 
@@ -164,23 +166,21 @@ The [Microsoft Authenticator app](https://docs.microsoft.com/azure/active-direct
 
 * Act as an Authentication Broker on iOS and Android devices to provide single sign-on for applications that use [Brokered authentication](https://docs.microsoft.com/azure/active-directory/develop/brokered-auth)
 
-* Device registration (also known as Workplace Joined) to Azure AD, which is a requirement for other features like Intune App Protection and Device Enrolment/Management,
+* Device registration (also known as Workplace Join) to Azure AD, which is a requirement for other features like Intune App Protection and Device Enrolment/Management,
 
 * Phone sign in, which requires MFA and device registration.
 
 ### Multi-Factor Authentication with Android devices
 
 The Microsoft Authenticator app offers an out-of-band verification option. Instead of placing an automated phone call or SMS to the user during sign-in, [Multi-Factor Authentication (MFA)](https://docs.microsoft.com/azure/active-directory/authentication/concept-mfa-howitworks) pushes a notification to the Microsoft Authenticator app on the user's smartphone or tablet. The user simply taps Approve (or enters a PIN or biometric and taps "Authenticate") in the app to complete their sign-in.
 
-When you change a user's UPN, mobile devices can experience the following issues:
-
 **Known issues** 
 
-The old UPN still displays on the user account and a notification might not be received. [Verification codes](https://docs.microsoft.com/azure/active-directory/user-help/user-help-auth-app-faq) continue to work.
+When you change a user's UPN, the old UPN still displays on the user account and a notification might not be received. [Verification codes](https://docs.microsoft.com/azure/active-directory/user-help/user-help-auth-app-faq) continue to work.
 
 **Workaround**
 
-If a notification is received, instruct the user to dismiss the notification, open the Authenticator app, tap the "Check for notifications" option and approve the MFA prompt. After this, the UPN displayed on the account will be updated. Note the updated UPN might be displayed as a new account, this is due to other Authenticator functionality being used. For more information additional known issues in this article.
+If a notification is received, instruct the user to dismiss the notification, open the Authenticator app, tap the "Check for notifications" option and approve the MFA prompt. After this, the UPN displayed on the account will be updated. Note the updated UPN might be displayed as a new account, this is due to other Authenticator functionality being used. For more information refer to the additional known issues in this article.
 
 ### Brokered authentication
 

articles/azure-resource-manager/templates/template-functions-resource.md

@@ -438,12 +438,12 @@ Returns an object representing a resource's runtime state.
 | Parameter | Required | Type | Description |
 |:--- |:--- |:--- |:--- |
 | resourceName or resourceIdentifier |Yes |string |Name or unique identifier of a resource. When referencing a resource in the current template, provide only the resource name as a parameter. When referencing a previously deployed resource or when the name of the resource is ambiguous, provide the resource ID. |
-| apiVersion |No |string |API version of the specified resource. Include this parameter when the resource isn't provisioned within same template. Typically, in the format, **yyyy-mm-dd**. For valid API versions for your resource, see [template reference](/azure/templates/). |
+| apiVersion |No |string |API version of the specified resource. **This parameter is required when the resource isn't provisioned within same template.** Typically, in the format, **yyyy-mm-dd**. For valid API versions for your resource, see [template reference](/azure/templates/). |
 | 'Full' |No |string |Value that specifies whether to return the full resource object. If you don't specify `'Full'`, only the properties object of the resource is returned. The full object includes values such as the resource ID and location. |
 
 ### Return value
 
-Every resource type returns different properties for the reference function. The function doesn't return a single, predefined format. Also, the returned value differs based on whether you specified the full object. To see the properties for a resource type, return the object in the outputs section as shown in the example.
+Every resource type returns different properties for the reference function. The function doesn't return a single, predefined format. Also, the returned value differs based on the value of the `'Full'` argument. To see the properties for a resource type, return the object in the outputs section as shown in the example.
 
 ### Remarks
 
@@ -508,7 +508,7 @@ When referencing a resource that is deployed in the same template, provide the n
 "value": "[reference(parameters('storageAccountName'))]"
 ```
 
-When referencing a resource that isn't deployed in the same template, provide the resource ID.
+When referencing a resource that isn't deployed in the same template, provide the resource ID and `apiVersion`.
 
 ```json
 "value": "[reference(resourceId(parameters('storageResourceGroup'), 'Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2018-07-01')]"

articles/azure-resource-manager/templates/template-tutorial-add-outputs.md

@@ -72,7 +72,7 @@ az deployment group create \
 
 ---
 
-In the output for the deployment command, you'll see an object similar to:
+In the output for the deployment command, you'll see an object similar to the following example only if the output is in JSON format:
 
 ```json
 {

articles/cdn/cdn-features.md

@@ -56,6 +56,7 @@ The following table compares the features available with each product.
 | [Token authentication](cdn-token-auth.md)  |  |  |  |**✓**| 
 | [DDOS protection](https://www.us-cert.gov/ncas/tips/ST04-015)  | **✓** |**✓** |**✓** |**✓** |
 | [Bring your own certificate](cdn-custom-ssl.md?tabs=option-2-enable-https-with-your-own-certificate#ssl-certificates) |**✓** |  | **✓** | **✓** |
+| Supported TLS Versions | TLS 1.2, TLS 1.0/1.1 - [Configurable](https://docs.microsoft.com/rest/api/cdn/customdomains/enablecustomhttps#usermanagedhttpsparameters) | TLS 1.2 | TLS 1.2 | TLS 1.2 |
 ||||
 | **Analytics and reporting** | **Standard Microsoft** | **Standard Akamai** | **Standard Verizon** | **Premium Verizon** | 
 | [Azure diagnostic logs](cdn-azure-diagnostic-logs.md)  | **✓** | **✓** |**✓** |**✓** |

articles/cognitive-services/LUIS/luis-language-support.md

@@ -30,18 +30,25 @@ LUIS understands utterances in the following languages:
 | American English |`en-US` | ✔ | ✔  |✔|✔|
 | Arabic (preview - modern standard Arabic) |`ar-AR`|-|-|-|-|
 | *[Chinese](#chinese-support-notes) |`zh-CN` | ✔ | ✔ |✔|-|
-| Dutch |`nl-NL` |✔|  -   |-|✔|
+| Dutch |`nl-NL` |✔|-|-|✔|
 | French (France) |`fr-FR` |✔| ✔ |✔ |✔|
-| French (Canada) |`fr-CA` |-|   -   |-|✔|
+| French (Canada) |`fr-CA` |-|-|-|✔|
 | German |`de-DE` |✔| ✔ |✔ |✔|
-| Hindi | `hi-IN`|-|-|-|-|
+| Gujarati | `gu-IN`|-|-|-|-|
+| Hindi | `hi-IN`|-|✔|-|-|
 | Italian |`it-IT` |✔| ✔ |✔|✔|
 | *[Japanese](#japanese-support-notes) |`ja-JP` |✔| ✔ |✔|Key phrase only|
-| Korean |`ko-KR` |✔|   -   |-|Key phrase only|
+| Korean |`ko-KR` |✔|-|-|Key phrase only|
+| Marathi | `mr-IN`|-|-|-|-|
 | Portuguese (Brazil) |`pt-BR` |✔| ✔ |✔ |not all sub-cultures|
 | Spanish (Spain) |`es-ES` |✔| ✔ |✔|✔|
-| Spanish (Mexico)|`es-MX` |-|  -   |✔|✔|
-| Turkish | `tr-TR` |✔|-|-|Sentiment only|
+| Spanish (Mexico)|`es-MX` |-|-|✔|✔|
+| Tamil | `ta-IN`|-|-|-|-|
+| Telugu | `te-IN`|-|-|-|-|
+| Turkish | `tr-TR` |✔|✔|-|Sentiment only|
+
+
+
 
 Language support varies for [prebuilt entities](luis-reference-prebuilt-entities.md) and [prebuilt domains](luis-reference-prebuilt-domains.md).
 
@@ -72,22 +79,28 @@ Hybrid languages combine words from two cultures such as English and Chinese. Th
 ## Tokenization
 To perform machine learning, LUIS breaks an utterance into [tokens](luis-glossary.md#token) based on culture.
 
-|Language|  every space or special character | character level|compound words|[tokenized entity returned](luis-concept-data-extraction.md#tokenized-entity-returned)
-|--|:--:|:--:|:--:|:--:|
-|Arabic|||||
-|Chinese||✔||✔|
-|Dutch|||✔|✔|
-|English (en-us)|✔ ||||
-|French (fr-FR)|✔||||
-|French (fr-CA)|✔||||
-|German|||✔|✔|
-| Hindi |✔|-|-|-|-|
-|Italian|✔||||
-|Japanese||||✔|
-|Korean||✔||✔|
-|Portuguese (Brazil)|✔||||
-|Spanish (es-ES)|✔||||
-|Spanish (es-MX)|✔||||
+|Language|  every space or special character | character level|compound words
+|--|:--:|:--:|:--:|
+|Arabic|✔|||
+|Chinese||✔||
+|Dutch|✔||✔|
+|English (en-us)|✔ |||
+|French (fr-FR)|✔|||
+|French (fr-CA)|✔|||
+|German|✔||✔|
+|Gujarati|✔|||
+|Hindi|✔|||
+|Italian|✔|||
+|Japanese|||✔
+|Korean||✔||
+|Marathi|✔|||
+|Portuguese (Brazil)|✔|||
+|Spanish (es-ES)|✔|||
+|Spanish (es-MX)|✔|||
+|Tamil|✔|||
+|Telugu|✔|||
+|Turkish|✔|||
+
 
 ### Custom tokenizer versions
 
@@ -96,7 +109,10 @@ The following cultures have custom tokenizer versions:
 |Culture|Version|Purpose|
 |--|--|--|
 |German<br>`de-de`|1.0.0|Tokenizes words by splitting them using a machine learning-based tokenizer that tries to break down composite words into their single components.<br>If a user enters `Ich fahre einen krankenwagen` as an utterance, it is turned to `Ich fahre einen kranken wagen`. Allowing the marking of `kranken` and `wagen` independently as different entities.|
-|German<br>`de-de`|1.0.2|Tokenizes words by splitting them on spaces.<br> if a user enters `Ich fahre einen krankenwagen` as an utterance, it remains a single token. Thus `krankenwagen` is marked as a single entity. |
+|German<br>`de-de`|1.0.2|Tokenizes words by splitting them on spaces.<br> If a user enters `Ich fahre einen krankenwagen` as an utterance, it remains a single token. Thus `krankenwagen` is marked as a single entity. |
+|Dutch<br>`de-de`|1.0.0|Tokenizes words by splitting them using a machine learning-based tokenizer that tries to break down composite words into their single components.<br>If a user enters `Ik ga naar de kleuterschool` as an utterance, it is turned to `Ik ga naar de kleuter school`. Allowing the marking of `kleuter` and `school` independently as different entities.|
+|Dutch<br>`de-de`|1.0.1|Tokenizes words by splitting them on spaces.<br> If a user enters `Ik ga naar de kleuterschool` as an utterance, it remains a single token. Thus `kleuterschool` is marked as a single entity. |
+
 
 ### Migrating between tokenizer versions
 <!--

articles/private-link/private-endpoint-overview.md

@@ -140,7 +140,7 @@ For Azure services, use the recommended zone names as described in the following
 |Azure Relay (Microsoft.Relay/namespaces) | namespace |privatelink.servicebus.windows.net|
 |Azure Event Grid (Microsoft.EventGrid/topics)	 | topic | topic.{region}.privatelink.eventgrid.azure.net|
 |Azure Event Grid (Microsoft.EventGrid/domains) | domain | domain.{region}.privatelink.eventgrid.azure.net |
-|Azure WebApps(Microsoft.Web/sites)	| site | privatelink.azurewebsites.net |
+|Azure WebApps (Microsoft.Web/sites)	| site | privatelink.azurewebsites.net |
 |Azure Machine Learning(Microsoft.MachineLearningServices/workspaces)	| workspace | privatelink.api.azureml.ms |
 
 Azure will create a canonical name DNS record (CNAME) on the public DNS to redirect the resolution to the suggested domain names. You'll be able to override the resolution with the private IP address of your private endpoints. 

articles/storage/blobs/storage-blob-event-quickstart.md

@@ -88,7 +88,7 @@ storageid=$(az storage account show --name <storage_account_name> --resource-gro
 endpoint=https://$sitename.azurewebsites.net/api/updates
 
 az eventgrid event-subscription create \
-  --resource-id $storageid \
+  --source-resource-id $storageid \
   --name <event_subscription_name> \
   --endpoint $endpoint
 ```

articles/stream-analytics/stream-analytics-window-functions.md

@@ -29,7 +29,7 @@ Hopping window functions hop forward in time by a fixed period. It may be easy t
 ![Stream Analytics hopping window](media/stream-analytics-window-functions/stream-analytics-window-functions-hopping-intro.png)
 
 ## Sliding window
-Sliding window functions, unlike Tumbling or Hopping windows, produce an output **only**  when an event occurs. Every window will have at least one event and the window continuously moves forward by an € (epsilon). Like hopping windows, events can belong to more than one sliding window.
+Sliding window functions, unlike Tumbling or Hopping windows, produce an output **only**  when an event occurs. Every window will have at least one event and the window continuously moves forward by an ε (epsilon). Like hopping windows, events can belong to more than one sliding window.
 
 ![Stream Analytics sliding window](media/stream-analytics-window-functions/stream-analytics-window-functions-sliding-intro.png)