Merge pull request #178336 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to master

Author: TimShererWithAquent

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

@@ -118,27 +118,27 @@ $domain = "contoso.corp.com"
    Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred -DomainCredential $domainCred
    ```
 
-> [!NOTE]
-> If you're working on a domain-joined machine with an account that has domain administrator privileges, you can skip the "-DomainCredential" parameter. If the "-DomainCredential" parameter isn't provided, the current Windows login credential is used to access your on-premises Active Directory Domain Controller.
+   > [!NOTE]
+   > If you're working on a domain-joined machine with an account that has domain administrator privileges, you can skip the "-DomainCredential" parameter. If the "-DomainCredential" parameter isn't provided, the current Windows login credential is used to access your on-premises Active Directory Domain Controller.
 
-```powershell
-# Specify the on-premises Active Directory domain. A new Azure AD
-# Kerberos Server object will be created in this Active Directory domain.
-$domain = "contoso.corp.com"
+   ```powershell
+   # Specify the on-premises Active Directory domain. A new Azure AD
+   # Kerberos Server object will be created in this Active Directory domain.
+   $domain = "contoso.corp.com"
 
-# Enter an Azure Active Directory global administrator username and password.
-$cloudCred = Get-Credential
+   # Enter an Azure Active Directory global administrator username and password.
+   $cloudCred = Get-Credential
 
-# Create the new Azure AD Kerberos Server object in Active Directory
-# and then publish it to Azure Active Directory.
-# Use the current windows login credential to access the on-prem AD.
-Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred
-```
+   # Create the new Azure AD Kerberos Server object in Active Directory
+   # and then publish it to Azure Active Directory.
+   # Use the current windows login credential to access the on-prem AD.
+   Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred
+   ```
 
-> [!NOTE]
-> If your organization protects password-based sign-in and enforces modern authentication methods such as MFA, FIDO2, or Smart Card, you must use the "-UserPrincipalName" parameter with the User Principal Name of a Global administrator.
->    - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
->    - Replace `[email protected]` in the following example with the User Principal Name of a Global administrator.
+   > [!NOTE]
+   > If your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator.
+   >    - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
+   >    - Replace `[email protected]` in the following example with the UPN of a global administrator.
 
 ```powershell
 # Specify the on-premises Active Directory domain. A new Azure AD
@@ -151,11 +151,11 @@ $domain = "contoso.corp.com"
    # Enter a domain administrator username and password.
    $domainCred = Get-Credential
 
-# Create the new Azure AD Kerberos Server object in Active Directory
-# and then publish it to Azure Active Directory.
-# Open an interactive sign-in prompt with given username to access the Azure AD.
-Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
-```
+   # Create the new Azure AD Kerberos Server object in Active Directory
+   # and then publish it to Azure Active Directory.
+   # Open an interactive sign-in prompt with given username to access the Azure AD.
+   Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
+   ```
 
 ### View and verify the Azure AD Kerberos Server
 

articles/active-directory/authentication/troubleshoot-sspr.md

@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
 
 Azure Active Directory (Azure AD) self-service password reset (SSPR) lets users reset their passwords in the cloud.
 
-If you have problems with SSPR, the following troubleshooting steps and common errors may help. You can also watch this short video on the [How ot resolve the six most common SSPR end-user error messages](https://www.youtube.com/watch?v=9RPrNVLzT8I&list=PL3ZTgFEc7LyuS8615yo39LtXR7j1GCerW&index=1).
+If you have problems with SSPR, the following troubleshooting steps and common errors may help. You can also watch this short video on the [How to resolve the six most common SSPR end-user error messages](https://www.youtube.com/watch?v=9RPrNVLzT8I&list=PL3ZTgFEc7LyuS8615yo39LtXR7j1GCerW&index=1).
 
 If you can't find the answer to your problem, [our support teams are always available](#contact-microsoft-support) to assist you further.
 
@@ -156,4 +156,4 @@ To properly assist you, we ask that you provide as much detail as possible when
 
 ## Next steps
 
-To learn more about SSPR, see [How it works: Azure AD self-service password reset](concept-sspr-howitworks.md) or [How does self-service password reset writeback work in Azure AD?](concept-sspr-writeback.md).
+To learn more about SSPR, see [How it works: Azure AD self-service password reset](concept-sspr-howitworks.md) or [How does self-service password reset writeback work in Azure AD?](concept-sspr-writeback.md).

articles/media-services/latest/includes/warning-rest-api-retry-policy.md

@@ -8,4 +8,4 @@ ms.custom: sdk
 ---
 
 > [!WARNING]
-> It is not advised to attempt to wrap the REST API for Media Services directly into your own library code, as doing so properly for production purposes would require you to implement the full Azure Resource Management retry logic and understand how to manage long running operations in Azure Resource Management APIs. This is handled by the client SDKs for various language - .NET, Java, Typescript, Python, Ruby, etc. - for you automatically and reduces the chances of you having issues with rety logic or failed API calls. The client SDKs all handle this for you already. The Postman collection is provided more as a teaching tool, and to show you what the client SDKs are actually doing on the wire during your development with the various client SDKs.
+> It is not advised to attempt to wrap the REST API for Media Services directly into your own library code, as doing so properly for production purposes would require you to implement the full Azure Resource Management retry logic and understand how to manage long running operations in Azure Resource Management APIs. This is handled by the client SDKs for various language - .NET, Java, TypeScript, Python, Ruby, etc. - for you automatically and reduces the chances of you having issues with rety logic or failed API calls. The client SDKs all handle this for you already. The Postman collection is provided more as a teaching tool, and to show you what the client SDKs are actually doing on the wire during your development with the various client SDKs.

articles/media-services/latest/samples-overview.md

@@ -14,7 +14,7 @@ ms.author: inhenkel
 
 [!INCLUDE [media services api v3 logo](./includes/v3-hr.md)]
 
-This article contains a list of all the samples available for Media Services organized by method and SDK.  Samples include .NET, Node.JS (Typescript), Python and Java as well as REST with Postman.
+This article contains a list of all the samples available for Media Services organized by method and SDK.  Samples include .NET, Node.js (TypeScript), Python and Java as well as REST with Postman.
 
 ## Samples by SDK
 

articles/search/search-modeling-multitenant-saas-applications.md

@@ -100,7 +100,7 @@ Azure Cognitive Search allows for the scale of both the individual indexes and t
 
 If the total number of indexes grows too large for a single service, another service has to be provisioned to accommodate the new tenants. If indexes have to be moved between search services as new services are added, the data from the index has to be manually copied from one index to the other as Azure Cognitive Search does not allow for an index to be moved.
 
-## Model 2: Once service per tenant
+## Model 2: One service per tenant
 
 :::image type="content" source="media/search-modeling-multitenant-saas-applications/azure-search-service-per-tenant.png" alt-text="A portrayal of the service-per-tenant model" border="false":::
 
@@ -140,4 +140,4 @@ This method can be used to achieve functionality of separate user accounts, sepa
 
 ## Next steps
 
-Azure Cognitive Search is a compelling choice for many applications. When evaluating the various design patterns for multitenant applications, consider the [various pricing tiers](https://azure.microsoft.com/pricing/details/search/) and the respective [service limits](search-limits-quotas-capacity.md) to best tailor Azure Cognitive Search to fit application workloads and architectures of all sizes.
+Azure Cognitive Search is a compelling choice for many applications. When evaluating the various design patterns for multitenant applications, consider the [various pricing tiers](https://azure.microsoft.com/pricing/details/search/) and the respective [service limits](search-limits-quotas-capacity.md) to best tailor Azure Cognitive Search to fit application workloads and architectures of all sizes.