fix merge conflicts

Author: RoseHJM

articles/app-service/configure-authentication-provider-aad.md

@@ -3,7 +3,7 @@ title: Configure Microsoft Entra authentication
 description: Learn how to configure Microsoft Entra authentication as an identity provider for your App Service or Azure Functions app.
 ms.assetid: 6ec6a46c-bce4-47aa-b8a3-e133baef22eb
 ms.topic: article
-ms.date: 05/16/2023
+ms.date: 05/16/2024
 ms.custom: fasttrack-edit, AppServiceIdentity
 author: cephalin
 ms.author: cephalin

articles/app-service/deploy-staging-slots.md

@@ -3,7 +3,7 @@ title: Set up staging environments
 description: Learn how to deploy apps to a nonproduction slot and autoswap into production. Increase the reliability and eliminate app downtime from deployments.
 ms.assetid: e224fc4f-800d-469a-8d6a-72bcde612450
 ms.topic: article
-ms.date: 07/30/2023
+ms.date: 07/30/2024
 author: cephalin
 ms.author: cephalin
 ms.custom: fasttrack-edit, devx-track-azurepowershell, devx-track-azurecli, ai-video-demo

articles/app-service/includes/tutorial-set-up-app-service-authentication/after.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 
 ms.service: azure-app-service
 ms.topic: include
-ms.date: 05/16/2024
+ms.date: 11/29/2024
 ms.author: ryanwi
 ms.reviewer: stsoneff
 ms.custom: azureday1
@@ -57,6 +57,8 @@ Now that you have a web app running on App Service, enable authentication and au
 
 1. Enter a display **Name** for your application. Users of your application might see the display name when they use the app, for example during sign-in.
 
+1. For **Client secret expiration**, select **Recommended: 180 days**.
+
 1. For **App registration** > **Supported account types**, select **Current tenant-single tenant** so only users in your organization can sign in to the web app.
 
 1. In the **Additional checks** section, select: