Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into speech-synthesis-markup

Author: paulth1

.gitignore

@@ -23,5 +23,5 @@ AzureMigration.ps1
 !/.vscode/extensions.json
 .gitignore
 **/.vscode/settings.json
-
-desktop.ini
+*.pdn
+articles/azure-cache-for-redis/media/cache-managed-identity/Screenshot 2022-01-20 092913.pdn

.openpublishing.redirection.json

@@ -22858,6 +22858,11 @@
       "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
       "redirect_document_id": ""
     },
+    {
+      "source_path_from_root": "/articles/search/cognitive-search-resources-documentation.md",
+      "redirect_url": "/azure/search/cognitive-search-concept-intro",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/search/search-blob-ai-integration.md",
       "redirect_url": "/azure/search/cognitive-search-concept-intro",
@@ -45207,6 +45212,11 @@
       "source_path_from_root": "/articles/azure/sentinel/connect-windows-virtual-desktop.md",
       "redirect_url": "/azure/sentinel/connect-azure-virtual-desktop",
       "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/azure/cognitive-services/translator/custom-translator/v2-preview/project-overview.md",
+      "redirect_url": "/azure/cognitive-services/translator/custom-translator/v2-preview/beginners-guide",
+      "redirect_document_id": true
     }
   ]
 }

articles/active-directory-b2c/localization.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 03/08/2021
+ms.date: 01/21/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -142,8 +142,8 @@ The **LocalizedString** element contains the following attributes:
 
 | Attribute | Required | Description |
 | --------- | -------- | ----------- |
-| ElementType | Yes | Possible values: [ClaimsProvider](#claimsprovider), [ClaimType](#claimtype), [ErrorMessage](#errormessage), [GetLocalizedStringsTransformationClaimType](#getlocalizedstringstransformationclaimtype), [FormatLocalizedStringTransformationClaimType](#formatlocalizedstringtransformationclaimtype), [Predicate](#predicate), [InputValidation](#inputvalidation), or [UxElement](#uxelement).   | 
-| ElementId | Yes | If **ElementType** is set to `ClaimType`, `Predicate`, or `InputValidation`, this element contains a reference to a claim type already defined in the ClaimsSchema section. |
+| ElementType | Yes | Possible values: [ClaimsProvider](#claimsprovider), [ClaimType](#claimtype), [ErrorMessage](#errormessage), [GetLocalizedStringsTransformationClaimType](#getlocalizedstringstransformationclaimtype), [FormatLocalizedStringTransformationClaimType](#formatlocalizedstringtransformationclaimtype), [Predicate](#predicate), [PredicateValidation](#predicatevalidation), or [UxElement](#uxelement).   | 
+| ElementId | Yes | If **ElementType** is set to `ClaimType`, `Predicate`, or `PredicateValidation`, this element contains a reference to a claim type already defined in the ClaimsSchema section. |
 | StringId | Yes | If **ElementType** is set to `ClaimType`, this element contains a reference to an attribute of a claim type. Possible values: `DisplayName`, `AdminHelpText`, or `PatternHelpText`. The `DisplayName` value is used to set the claim display name. The `AdminHelpText` value is used to set the help text name of the claim user. The `PatternHelpText` value is used to set the claim pattern help text. If **ElementType** is set to `UxElement`, this element contains a reference to an attribute of a user interface element. If **ElementType** is set to `ErrorMessage`, this element specifies the identifier of an error message. See [Localization string IDs](localization-string-ids.md) for a complete list of the `UxElement` identifiers.|
 
 ## ElementType
@@ -157,7 +157,7 @@ The ElementType reference to a claim type, a claim transformation, or a user int
 |Error message|`ErrorMessage`||The ID of the error message |
 |Copies localized strings into claims|`GetLocalizedStringsTra nsformationClaimType`||The name of the output claim|
 |Predicate user message|`Predicate`|The name of the predicate| The attribute of the predicate to be localized. Possible values: `HelpText`.|
-|Predicate group user message|`InputValidation`|The ID of the PredicateValidation element.|The ID of the PredicateGroup element. The predicate group must be a child of the predicate validation element as defined in the ElementId.|
+|Predicate group user message|`PredicateValidation`|The ID of the PredicateValidation element.|The ID of the PredicateGroup element. The predicate group must be a child of the predicate validation element as defined in the ElementId.|
 |User interface elements |`UxElement` | | The ID of the user interface element to be localized.|
 |[Display Control](display-controls.md) |`DisplayControl` |The ID of the display control. | The ID of the user interface element to be localized.|
 
@@ -312,9 +312,9 @@ The following example shows how to localize predicates help text.
 <LocalizedString ElementType="Predicate" ElementId="Uppercase" StringId="HelpText">an uppercase letter</LocalizedString>
 ```
 
-### InputValidation
+### PredicateValidation
 
-The InputValidation value is used to localize one of the [PredicateValidation](predicates.md) group error messages. 
+The PredicateValidation value is used to localize one of the [PredicateValidation](predicates.md) group error messages. 
 
 ```xml
 <PredicateValidations>
@@ -342,7 +342,7 @@ The InputValidation value is used to localize one of the [PredicateValidation](p
 The following example shows how to localize a predicate validation group help text.
 
 ```xml
-<LocalizedString ElementType="InputValidation" ElementId="CustomPassword" StringId="CharacterClasses">The password must have at least 3 of the following:</LocalizedString>
+<LocalizedString ElementType="PredicateValidation" ElementId="CustomPassword" StringId="CharacterClasses">The password must have at least 3 of the following:</LocalizedString>
 ```
 
 ### UxElement

articles/active-directory/conditional-access/concept-continuous-access-evaluation.md

@@ -176,8 +176,7 @@ Your identity provider and resource providers may see different IP addresses. Th
 
 Examples:
 
-- Your identity provider sees one IP address from the client.
-- Your resource provider sees a different IP address from the client after passing through a proxy.
+- Your identity provider sees one IP address from the client while your resource provider sees a different IP address from the client after passing through a proxy.
 - The IP address your identity provider sees is part of an allowed IP range in policy but the IP address from the resource provider isn't.
 
 To avoid infinite loops because of these scenarios, Azure AD issues a one hour CAE token and won't enforce client location change. In this case, security is improved compared to traditional one hour tokens since we're still evaluating the [other events](#critical-event-evaluation) besides client location change events.

articles/active-directory/hybrid/how-to-connect-fed-saml-idp.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 07/13/2017
+ms.date: 01/21/2022
 ms.subservice: hybrid
 ms.author: billmath
 ms.collection: M365-identity-device-management

articles/active-directory/hybrid/how-to-connect-fed-sha256-guidance.md

@@ -13,7 +13,7 @@ ms.subservice: hybrid
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 10/26/2018
+ms.date: 01/21/2022
 ms.author: billmath
 
 ms.collection: M365-identity-device-management

articles/active-directory/hybrid/how-to-connect-fed-single-adfs-multitenant-federation.md

@@ -1,6 +1,6 @@
 ---
 title: Federating multiple Azure AD with single AD FS - Azure
-description: In this document you will learn how to federate multiple Azure AD with a single AD FS.
+description: In this document, you will learn how to federate multiple Azure AD with a single AD FS.
 keywords: federate, ADFS, AD FS, multiple tenants, single AD FS, one ADFS, multi-tenant federation, multi-forest adfs, aad connect, federation, cross-tenant federation
 services: active-directory
 documentationcenter: ''
@@ -13,15 +13,15 @@ ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 07/17/2017
+ms.date: 01/21/2022
 ms.subservice: hybrid
 ms.author: billmath
 ms.collection: M365-identity-device-management
 ---
 
 # Federate multiple instances of Azure AD with single instance of AD FS
 
-A single high available AD FS farm can federate multiple forests if they have 2-way trust between them. These multiple forests may or may not correspond to the same Azure Active Directory. This article provides instructions on how to configure federation between a single AD FS deployment and more than one forests that sync to different Azure AD.
+A single high available AD FS farm can federate multiple forests if they have 2-way trust between them. These multiple forests may or may not correspond to the same Azure Active Directory. This article provides instructions on how to configure federation between a single AD FS deployment and multiple instances of Azure AD.
 
 ![Multi-tenant federation with single AD FS](./media/how-to-connect-fed-single-adfs-multitenant-federation/concept.png)
 
@@ -41,9 +41,9 @@ For AD FS in contoso.com to be able to authenticate users in fabrikam.com, a two
 
 ## Step 2: Modify contoso.com federation settings 
 
-The default issuer set for a single domain federated to AD FS is "http\://ADFSServiceFQDN/adfs/services/trust", for example, `http://fs.contoso.com/adfs/services/trust`. Azure Active Directory requires unique issuer for each federated domain. Since the same AD FS is going to federate two domains, the issuer value needs to be modified so that it is unique for each domain AD FS federates with Azure Active Directory. 
+The default issuer set for a single domain federated to AD FS is "http\://ADFSServiceFQDN/adfs/services/trust", for example, `http://fs.contoso.com/adfs/services/trust`. Azure Active Directory requires unique issuer for each federated domain. Because AD FS is going to federate two domains, the issuer value needs to be modified so that it is unique. 
 
-On the AD FS server, open Azure AD PowerShell (ensure that the MSOnline module is installed) and perform the following steps:
+On the AD FS server, open Azure AD PowerShell (ensure that the MSOnline module is installed) and do the following steps:
 
 Connect to the Azure Active Directory that contains the domain contoso.com
     Connect-MsolService
@@ -69,4 +69,4 @@ Convert-MsolDomainToFederated -DomainName fabrikam.com -Verbose -SupportMultiple
 The above operation will federate the domain fabrikam.com with the same AD FS. You can verify the domain settings by using Get-MsolDomainFederationSettings for both domains.
 
 ## Next steps
-[Connect Active Directory with Azure Active Directory](whatis-hybrid-identity.md)
+[Connect Active Directory with Azure Active Directory](whatis-hybrid-identity.md)

articles/active-directory/hybrid/how-to-connect-fed-ssl-update.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 07/09/2018
+ms.date: 01/21/2022
 ms.subservice: hybrid
 author: billmath
 ms.custom: seohack1
@@ -102,4 +102,4 @@ After you complete the configuration, Azure AD Connect displays the message that
 ## Next steps
 
 - [Azure AD Connect and federation](how-to-connect-fed-whatis.md)
-- [Active Directory Federation Services management and customization with Azure AD Connect](how-to-connect-fed-management.md)
+- [Active Directory Federation Services management and customization with Azure AD Connect](how-to-connect-fed-management.md)

articles/active-directory/hybrid/how-to-connect-fed-whatis.md

@@ -11,7 +11,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 10/09/2018
+ms.date: 01/21/2022
 ms.subservice: hybrid
 ms.author: billmath
 
@@ -48,4 +48,4 @@ This topic is the home for information on federation-related functionalities for
 ## Additional resources
 * [Federating two Azure AD with single AD FS](how-to-connect-fed-single-adfs-multitenant-federation.md)
 * [AD FS deployment in Azure](/windows-server/identity/ad-fs/deployment/how-to-connect-fed-azure-adfs)
-* [High-availability cross-geographic AD FS deployment in Azure with Azure Traffic Manager](/windows-server/identity/ad-fs/deployment/active-directory-adfs-in-azure-with-azure-traffic-manager)
+* [High-availability cross-geographic AD FS deployment in Azure with Azure Traffic Manager](/windows-server/identity/ad-fs/deployment/active-directory-adfs-in-azure-with-azure-traffic-manager)

articles/active-directory/hybrid/how-to-connect-fix-default-rules.md

@@ -9,7 +9,7 @@ ms.reviewer: darora10
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 03/21/2019
+ms.date: 01/21/2022
 ms.subservice: hybrid
 ms.author: billmath
 ms.collection: M365-identity-device-management
@@ -188,4 +188,4 @@ To fix your rules to change them back to default settings, delete the modified r
 ## Next steps
 - [Hardware and prerequisites](how-to-connect-install-prerequisites.md) 
 - [Express settings](how-to-connect-install-express.md)
-- [Customized settings](how-to-connect-install-custom.md)
+- [Customized settings](how-to-connect-install-custom.md)