Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/api-management/api-management-howto-entra-external-id.md

@@ -19,13 +19,9 @@ ms.custom:
 
 [Microsoft Entra External ID](/entra/external-id/external-identities-overview) is a cloud identity management solution that allows external identities to securely access your apps and resources. You can use it to manage access to your API Management developer portal by external identities. 
 
-In this article, you learn the configuration of the Microsoft Entra ID identity provider for the following scenarios that are supported by the API Management developer portal: 
+In this article, you learn the configuration of the Microsoft Entra ID identity provider for the following scenario: 
 
 * Integration with Microsoft Entra External ID in your *workforce tenant*. For example, if your workforce tenant is for the Contoso organization, you might want to configure Google or Facebook as an external identity provider so that these external users can also sign in using their accounts. 
-* Integration with Microsoft Entra External ID in a separate *external tenant*. This configuration only allows external users from that tenant to sign in to the developer portal. 
-
-> [!NOTE]
-> Currently, you can't configure more than one Microsoft Entra ID identity provider for the developer portal. 
 
 For an overview of options to secure access to the developer portal, see [Secure access to the API Management developer portal](secure-developer-portal-access.md).
 
@@ -35,14 +31,14 @@ For an overview of options to secure access to the developer portal, see [Secure
 
 ## Prerequisites
 
-* A Microsoft Entra ID tenant (workforce tenant) in which to enable external access, or a separate [external tenant](/entra/external-id/customers/how-to-create-external-tenant-portal)
+* A Microsoft Entra ID tenant (workforce tenant) in which to enable external access.
 * Permissions to create an application and configure user flows in the workforce tenant.
 * An API Management instance. If you don't already have one, [create an Azure API Management instance](get-started-create-service-instance.md).
 * If you created your instance in a v2 tier, enable the developer portal. For more information, see [Tutorial: Access and customize the developer portal](api-management-howto-developer-portal-customize.md).
 
 ## Add external identity provider to your tenant
 
-If you're using a workforce tenant, an external identity provider must be enabled in your workforce tenant. Configuring the external identity provider is outside the scope of this article. For more information, see [Identity providers for External ID in workforce tenant](/entra/external-id/identity-providers).
+An external identity provider must be enabled in your workforce tenant. Configuring the external identity provider is outside the scope of this article. For more information, see [Identity providers for External ID in workforce tenant](/entra/external-id/identity-providers).
 
 ## Create Microsoft Entra app registration
 
@@ -74,10 +70,9 @@ For external users to sign up for access to the developer portal, you must compl
 * Enable self-service sign-up for your tenant. 
 * Add your app to the self-service sign-up user flow. 
 
-For more information and detailed steps, see the following articles, depending on whether you're using a workforce or an external tenant:
+For more information and detailed steps, see the following articles:
 
 - Workforce tenant: [Add self-service sign-up user flows for B2B collaboration](/entra/external-id/self-service-sign-up-user-flow) 
-- External tenant: [Create a sign-up and sign-in user flow for an external tenant app](/entra/external-id/customers/how-to-user-flow-sign-up-sign-in-customers) and [Add an app to the user flow](/entra/external-id/customers/how-to-user-flow-add-application)
 
 ## Configure Microsoft Entra ID as an identity provider for developer portal
 

articles/app-service/app-service-java-migration.md

@@ -4,7 +4,7 @@ description: Discover Java migration resources available to Azure App Service.
 author: msangapu-msft
 
 ms.topic: concept-article
-ms.date: 03/29/2021
+ms.date: 11/17/2025
 ms.author: msangapu
 ms.devlang: java
 ms.custom: devx-track-extended-java, linux-related-content
@@ -16,23 +16,30 @@ Azure App Service provides tools to discover web apps deployed to on-premises we
 
 ## Java Tomcat migration (Linux)
 
-[Download the assistant](https://azure.microsoft.com/services/app-service/migration-assistant/) to migrate a Java app running on Apache Tomcat web server. You can also use Azure Container Registry to migrate on-premises Linux Docker containers to App Service.
+Download the [App Service Migration Assistant](https://azure.microsoft.com/services/app-service/migration-assistant/) to migrate a Java app running on Apache Tomcat web server. You can also use Azure Container Registry to migrate on-premises Linux Docker containers to App Service.
 
 | Resources |
 |-----------|
 | **How-tos** |
-| [Java App-Service-Migration-Assistant Wiki](https://github.com/Azure/App-Service-Migration-Assistant/wiki/TOMCAT-Java-Information) |
-| [Azure/App-Service-Migration-Assistant Wiki](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Linux-Notes) |
+| [Tomcat Java information](https://github.com/Azure/App-Service-Migration-Assistant/wiki/TOMCAT-Java-Information) |
+| [Install on Linux](https://github.com/Azure/App-Service-Migration-Assistant/wiki/Linux-Notes) |
 | **Videos** |
-|[Point and Migrate Java Apps to Azure App Service Using the Migration System](https://www.youtube.com/watch?v=Mpxa0KE0X9k) |
+| [Point and Migrate Java Apps to Azure App Service](https://www.youtube.com/watch?v=Mpxa0KE0X9k) |
 
-## Standalone Tomcat Web App Migration (Windows OS)
+## Standalone Tomcat web app migration (Windows)
 
-Download this [preview tool](https://azure.microsoft.com/services/app-service/migration-assistant/) to migrate a Java web app on Apache Tomcat to App Service on Windows. For more information, see the [video](/Shows/The-Launch-Space/Updates-on-Migrating-to-Azure-App-Service) and [how-to](https://github.com/Azure/App-Service-Migration-Assistant/wiki/TOMCAT-Java-Information).
+Download the [App Service migration assistant for Java on Apache Tomcat (Windows—preview)](https://azure.microsoft.com/services/app-service/migration-assistant/) to migrate a Java web app on Apache Tomcat to App Service on Windows.
 
-## Containerize standalone Tomcat Web App
+For more information, see the [Updates on Migrating to Azure App Service video](/Shows/The-Launch-Space/Updates-on-Migrating-to-Azure-App-Service) and [TOMCAT Java information](https://github.com/Azure/App-Service-Migration-Assistant/wiki/TOMCAT-Java-Information).
 
-App Containerization offers a simple approach to repackage applications as containers with minimal code changes. The tool currently supports containerizing ASP.NET and Apache Tomcat Java web applications. For more information, see the [blog](https://azure.microsoft.com/blog/accelerate-application-modernization-with-azure-migrate-app-containerization/) and [how-to](../migrate/tutorial-app-containerization-java-app-service.md).
+## Containerize a standalone Tomcat web app
+
+App containerization offers a simple approach to repackage applications as containers with minimal code changes. The tool currently supports containerizing ASP.NET and Apache Tomcat Java web applications.
+
+For more information, see the following articles:
+
+- [Accelerate application modernization with Azure Migrate: App Containerization](https://azure.microsoft.com/blog/accelerate-application-modernization-with-azure-migrate-app-containerization/)
+- [Java web app containerization and migration to Azure App Service](../migrate/tutorial-app-containerization-java-app-service.md)
 
 ## Next step
 

articles/app-service/app-service-migration-discover-net.md

@@ -4,7 +4,7 @@ description: Learn about .NET migration resources available to Azure App Service
 author: msangapu-msft
 
 ms.topic: concept-article
-ms.date: 03/29/2021
+ms.date: 11/17/2025
 ms.author: msangapu
 ms.devlang: csharp
 ms.custom: devx-track-dotnet
@@ -14,30 +14,24 @@ ms.service: azure-app-service
 ---
 # At-scale discovery of .NET web apps
 
-For ASP. Net web apps discovery you need to either install a new Azure Migrate appliance or upgrade an existing Azure Migrate appliance. 
+For ASP.NET web apps discovery, you need to either install a new [Azure Migrate appliance](../migrate/migrate-appliance.md) or upgrade an existing one.
 
-Once the appliance is configured, Azure Migrate initiates the discovery of web apps deployed on IIS web servers hosted within your on-premises VMware environment.
+Once the appliance is configured, Azure Migrate initiates the discovery of web apps deployed on Internet Information Services (IIS) web servers hosted within your on-premises VMware environment.
 
-## Key capabilities of ASP.NET web app discovery 
+## Key capabilities of ASP.NET web app discovery
 
-- Agentless discovery of up to 20,000 web apps with a single Azure Migrate appliance 
-- Provide a rich & interactive dashboard with a list of IIS web servers and underlying VM infra details. Web apps discovery surfaces information such as:
+- Agentless discovery of up to 20,000 web apps with a single Azure Migrate appliance
+- Rich and interactive dashboard that lists IIS web servers and underlying VM infra details. Web apps discovery surfaces information such as:
     - web app name
     - web server type and version
     - URLs
     - binding port
     - application pool
-- If web app discovery fails, the discovery dashboard allows easy navigation to review relevant error messages, possible causes of failure and suggested remediation actions
+- If web apps discovery fails, the discovery dashboard allows easy navigation to review relevant error messages, possible causes of failure, and suggested remediation actions
 
-For more information about web apps discovery, see: 
+## Related content
 
-- [At scale discovery and assessment for ASP.NET app migration with Azure Migrate](https://channel9.msdn.com/Shows/Inside-Azure-for-IT/At-scale-discovery-and-assessment-for-ASPNET-app-migration-with-Azure-Migrate)
+- [At scale discovery and assessment for ASP.NET app migration with Azure Migrate](/shows/inside-azure-for-it/at-scale-discovery-and-assessment-for-aspnet-app-migration-with-azure-migrate)
 - [Discover and assess ASP.NET apps at-scale with Azure Migrate](https://azure.microsoft.com/blog/discover-and-assess-aspnet-apps-atscale-with-azure-migrate/)
-- [At scale discovery and assessment for ASP.NET app migration with Azure Migrate](https://channel9.msdn.com/Shows/Inside-Azure-for-IT/At-scale-discovery-and-assessment-for-ASPNET-app-migration-with-Azure-Migrate)
-- [Discover software inventory on on-premises servers with Azure Migrate](../migrate/how-to-discover-applications.md)
-- [Discover web apps and SQL Server instances](../migrate/how-to-discover-sql-existing-project.md)
-
-
-## Related content 
-
-- [At-scale assessment of .NET web apps](/training/modules/migrate-app-service-migration-assistant/)
+- [Discover installed software inventory, web apps, and database instances](../migrate/how-to-discover-applications.md)
+- [Discover web apps and SQL Server instances in an existing project](../migrate/how-to-discover-sql-existing-project.md)