Merge pull request #211789 from MicrosoftDocs/main

9/19 PM Publish

Author: huypub

.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

@@ -1,23 +1,23 @@
 ---
-title: Configure upgrade preference for App Service Environment
-description: Configure the upgrade preference for the Azure App Service Environment.
+title: Configure upgrade preference for App Service Environment planned maintenance
+description: Configure the upgrade preference for the Azure App Service Environment planned maintenance.
 author: madsd
 ms.topic: tutorial
-ms.date: 01/08/2022
+ms.date: 09/19/2022
 zone_pivot_groups: app-service-cli-portal
 ---
 
-# Upgrade preference for App Service Environments
+# Upgrade preference for App Service Environment planned maintenance
 
-Azure App Service is regularly updated to provide new features, new runtime versions, performance improvements, and bug fixes. The upgrade happens automatically. The upgrades are applied progressively through the regions following [Azure Safe Deployment Practices](https://azure.microsoft.com/blog/advancing-safe-deployment-practices/). An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale. Because of the isolated nature of App Service Environment, you have an opportunity to influence the upgrade process.
+Azure App Service is regularly updated to provide new features, new runtime versions, performance improvements, and bug fixes. This is also known as planned maintenance. The upgrade happens automatically. The upgrades are applied progressively through the regions following [Azure Safe Deployment Practices](https://azure.microsoft.com/blog/advancing-safe-deployment-practices/). An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale. Because of the isolated nature of App Service Environment, you have an opportunity to influence the upgrade process.
 
 If you don't have an App Service Environment, see [How to Create an App Service Environment v3](./creation.md).
 
 > [!NOTE]
 > This article covers the features, benefits, and use cases of App Service Environment v3, which is used with App Service Isolated v2 plans.
 > 
 
-With App Service Environment v3, you can specify your preference for when and how the upgrade is applied. The upgrade can be applied automatically or manually. Even with your preference set to automatic, you have some options to influence the timing.
+With App Service Environment v3, you can specify your preference for when and how the planned maintenance is applied. The upgrade can be applied automatically or manually. Even with your preference set to automatic, you have some options to influence the timing.
 
 ## Automatic upgrade preference
 

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

@@ -41,7 +41,7 @@
     href: configure-network-settings.md
   - name: Custom domain suffix
     href: how-to-custom-domain-suffix.md
-  - name: Upgrade preference
+  - name: Upgrade preference for planned maintenance
     href: how-to-upgrade-preference.md
   - name: Migrate to App Service Environment v3
     href: migration-alternatives.md