Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ersku

Author: duongau

.openpublishing.redirection.active-directory.json

@@ -10880,6 +10880,11 @@
       "source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
       "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
       "redirect_document_id": false
+    },
+{   
+      "source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
+      "redirect_url": "/azure/active-directory/fundamentals/cloud-infrastructure-entitlement-management",
+      "redirect_document_id": false
     }
 
   ]

articles/active-directory-b2c/self-asserted-technical-profile.md

@@ -174,7 +174,7 @@ The following example demonstrates the use of a self-asserted technical profile
 
 ### Output claims sign-up or sign-in page
 
-In a combined sign-up and sign-in page, note the following when using a content definition [DataUri](contentdefinitions.md#datauri) element the specifies a `unifiedssp` or `unifiedssd` page type:
+In a combined sign-up and sign-in page, note the following when using a content definition [DataUri](contentdefinitions.md#datauri) element that specifies a `unifiedssp` or `unifiedssd` page type:
 
 - Only the username and password claims are rendered.
 - The first two output claims must be the username and the password (in this order). 

articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md

@@ -159,9 +159,13 @@ const msalInstance = new PublicClientApplication(msalConfig);
 
 You can test your application by signing in a user and then using the Azure portal to revoke the user's session. The next time the app calls the CAE-enabled API, the user will be asked to reauthenticate.
 
+## Code samples
+
+- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
+- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
+
 ## Next steps
 
 - [Continuous access evaluation](../conditional-access/concept-continuous-access-evaluation.md) conceptual overview
 - [Claims challenges, claims requests, and client capabilities](claims-challenge.md)
-- [React single-page application using MSAL React to sign-in users against Azure Active Directory](https://github.com/Azure-Samples/ms-identity-javascript-react-tutorial/tree/main/2-Authorization-I/1-call-graph)
-- [Enable your ASP.NET Core web app to sign in users and call Microsoft Graph with the Microsoft identity platform](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-1-Call-MSGraph)
+

articles/active-directory/develop/app-resilience-continuous-access-evaluation.md

@@ -24,9 +24,6 @@ Making an Azure Logic app compatible to run with the **Custom Task Extension** r
 - Enable system assigned managed identity.
 - Configure AuthZ policies.
 
-> [!NOTE]
-> For our public preview we will provide a UI and a deployment script that will automate the following steps.
-
 To configure those you'll follow these steps:
 
 1. Open the Azure Logic App you want to use with Lifecycle Workflow. Logic Apps may greet you with an introduction screen, which you can close with the X in the upper right corner.
@@ -211,19 +208,21 @@ To configure those you'll follow these steps:
 
 1. Create two authorization policies based on the tables below:
 
+    Policy name: AzureADLifecycleWorkflowsAuthPolicy   
+    
     |Claim  |Value  |
     |---------|---------|
     |Issuer     |  https://sts.windows.net/(Tenant ID)/       |
     |Audience     | Application ID of your Logic Apps Managed Identity       |
-    |appID     |  ce79fdc4-cd1d-4ea5-8139-e74d7dbe0bb7   |
+    |appid     |  ce79fdc4-cd1d-4ea5-8139-e74d7dbe0bb7   |
 
     Policy name: AzureADLifecycleWorkflowsAuthPolicyV2App   
  
     |Claim  |Value  |
     |---------|---------|
     |Issuer     |  https://login.microsoftonline.com/(Tenant ID)/v2.0       |
     |Audience     | Application ID of your Logic Apps Managed Identity       |
-    |appID     |  ce79fdc4-cd1d-4ea5-8139-e74d7dbe0bb7   |
+    |azp     |  ce79fdc4-cd1d-4ea5-8139-e74d7dbe0bb7   |
 
 1. Save the Authorization policy.
 > [!NOTE]

articles/active-directory/governance/configure-logic-app-lifecycle-workflows.md

@@ -36,7 +36,7 @@ If you are using the Azure portal to create a workflow, you can customize existi
 1. select **Workflows (Preview)** 
 
 1. On the workflows screen, select the workflow template that you want to use. 
- :::image type="content" source="media/create-lifecycle-workflow/template-list.png" alt-text="Screenshot of a list of lifecycle workflows templates.":::
+ :::image type="content" source="media/create-lifecycle-workflow/template-list.png" alt-text="Screenshot of a list of lifecycle workflows templates." lightbox="media/create-lifecycle-workflow/template-list.png":::
 1. Enter a unique display name and description for the workflow and select **Next**.
  :::image type="content" source="media/create-lifecycle-workflow/template-basics.png" alt-text="Screenshot of workflow template basic information.":::
 

articles/active-directory/governance/create-lifecycle-workflow.md

@@ -345,8 +345,6 @@ There are no functional changes in this release.
 
 This release addresses a vulnerability as documented in [this CVE](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-36949). For more information about this vulnerability, see the CVE.
 
-To download the latest version of Azure AD Connect 1.6, see the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=103336).
-
 ### Release status
 
 8/10/2021: Released for download only, not available for auto-upgrade

articles/active-directory/governance/media/create-lifecycle-workflow/template-list.png

@@ -18,10 +18,11 @@ recommendations: false
 
 With composed models, you can assign multiple custom models to a composed model called with a single model ID. It's useful when you've trained several models and want to group them to analyze similar form types. For example, your composed model might include custom models trained to analyze your supply, equipment, and furniture purchase orders. Instead of manually trying to select the appropriate model, you can use a composed model to determine the appropriate custom model for each analysis and extraction.
 
-* ```Custom form```and ```Custom document``` models can be composed together into a single composed model when they're trained with the same API version or an API version later than ```2022-08-31```. For more information on composing custom template and custom neural models, see [compose model limits](#compose-model-limits).
-* With the model compose operation, you can assign up to 100 trained custom models to a single composed model. To analyze a document with a composed model, Form Recognizer first classifies the submitted form, chooses the best-matching assigned model, and returns results.
+* ```Custom form``` and ```Custom template``` models can be composed together into a single composed model.
+* With the model compose operation, you can assign up to 200 trained custom models to a single composed model. To analyze a document with a composed model, Form Recognizer first classifies the submitted form, chooses the best-matching assigned model, and returns results.
 * For **_custom template models_**, the composed model can be created using variations of a custom template or different form types. This operation is useful when incoming forms may belong to one of several templates.
 * The response will include a ```docType``` property to indicate which of the composed models was used to analyze the document.
+* For ```Custom neural``` models the best practice is to add all the different variations of a single document type into a single training dataset and train on custom neural model. Model compose is best suited for scenarios when you have documents of different types being submitted for analysis.
 
 ## Compose model limits
 

articles/active-directory/hybrid/reference-connect-version-history.md

@@ -327,12 +327,14 @@ sections:
       - question: |
           How many custom models can I compose into a single custom model?
         answer: |
-           With the [Model Compose](compose-custom-models-v2-1.md#create-a-composed-model) operation, you can assign up to 100 models to a single model ID.
+           With the [Model Compose](compose-custom-models-v2-1.md#create-a-composed-model) operation, you can assign up to 200 models to a single model ID.
 
            - When you make the Analyze request with a composed modelID, Form Recognizer classifies the submitted form, chooses the best model, and returns the results.
 
            - Model Compose is currently available only for custom models trained with labels.
 
+           - Analyzing a document with composed models is identical to analyzing a document with a single model, the analyze result returns a ```docType``` property indicating which of the component models was selected for analyzing the document. There is no change in pricing for analyzing a document with an individual custom model or a composed custom model.
+
            Learn more about [composed models](concept-custom.md).
 
       - question: |