Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ot-software-release-notes

Author: batamig

articles/active-directory/hybrid/migrate-from-federation-to-cloud-authentication.md

@@ -10,7 +10,7 @@ ms.date: 08/26/2022
 
 ms.author: jricketts
 author: janicericketts
-manager: amycolannino
+manager: martinco
 
 ms.collection: M365-identity-device-management
 ---

articles/app-service/configure-language-dotnet-framework.md

@@ -12,7 +12,7 @@ ms.date: 06/02/2020
 # Configure an ASP.NET app for Azure App Service
 
 > [!NOTE]
-> For ASP.NET Core, see [Configure an ASP.NET Core app for Azure App Service](configure-language-dotnetcore.md)
+> For ASP.NET Core, see [Configure an ASP.NET Core app for Azure App Service](configure-language-dotnetcore.md). If your ASP.NET app runs in a custom Windows or Linux container, see [Configure a custom container for Azure App Service](configure-custom-container.md).
 
 ASP.NET apps must be deployed to Azure App Service as compiled binaries. The Visual Studio publishing tool builds the solution and then deploys the compiled binaries directly, whereas the App Service deployment engine deploys the code repository first and then compiles the binaries.
 

articles/app-service/configure-language-dotnetcore.md

@@ -13,7 +13,7 @@ zone_pivot_groups: app-service-platform-windows-linux
 # Configure an ASP.NET Core app for Azure App Service
 
 > [!NOTE]
-> For ASP.NET in .NET Framework, see [Configure an ASP.NET app for Azure App Service](configure-language-dotnet-framework.md)
+> For ASP.NET in .NET Framework, see [Configure an ASP.NET app for Azure App Service](configure-language-dotnet-framework.md). If your ASP.NET Core app runs in a custom Windows or Linux container, see [Configure a custom container for Azure App Service](configure-custom-container.md).
 
 ASP.NET Core apps must be deployed to Azure App Service as compiled binaries. The Visual Studio publishing tool builds the solution and then deploys the compiled binaries directly, whereas the App Service deployment engine deploys the code repository first and then compiles the binaries.
 

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

@@ -9,10 +9,6 @@ ms.author: cephalin
 
 [Azure App Service](../../overview.md) provides pre-defined application stacks on Windows like ASP.NET or Node.js, running on IIS. However, the pre-configured application stacks [lock down the operating system and prevent low-level access](../../operating-system-functionality.md). Custom Windows containers don't have these restrictions, and let developers fully customize the containers and give containerized applications full access to Windows functionality. 
 
-> [!NOTE]
-> For information regarding running containerized applications in a serverless environment, please see [Container Apps](../../../container-apps/overview.md).
->
-
 This quickstart shows you how to deploy an ASP.NET app in a Windows image from Azure Container Registry to Azure App Service. 
 
 To complete this quickstart, you need:

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-cli-pivot.md

@@ -9,10 +9,6 @@ ms.author: msangapu
 
 [Azure App Service](../../overview.md) provides pre-defined application stacks on Windows like ASP.NET or Node.js, running on IIS. However, the pre-configured application stacks [lock down the operating system and prevent low-level access](../../operating-system-functionality.md). Custom Windows containers don't have these restrictions, and let developers fully customize the containers and give containerized applications full access to Windows functionality. 
 
-> [!NOTE]
-> For information regarding running containerized applications in a serverless environment, please see [Container Apps](../../../container-apps/overview.md).
->
-
 This quickstart shows you how to deploy an ASP.NET app in a Windows image from [Microsoft Artifact Registry](https://mcr.microsoft.com/) to Azure App Service.
 
 To complete this quickstart, you need:

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-powershell-pivot.md

@@ -9,10 +9,6 @@ ms.author: msangapu
 
 [Azure App Service](../../overview.md) provides pre-defined application stacks on Windows like ASP.NET or Node.js, running on IIS. However, the pre-configured application stacks [lock down the operating system and prevent low-level access](../../operating-system-functionality.md). Custom Windows containers don't have these restrictions, and let developers fully customize the containers and give containerized applications full access to Windows functionality. 
 
-> [!NOTE]
-> For information regarding running containerized applications in a serverless environment, please see [Container Apps](../../../container-apps/overview.md).
->
-
 This quickstart shows you how to deploy an ASP.NET app in a Windows image from [Microsoft Artifact Registry](https://mcr.microsoft.com/) to Azure App Service. 
 
 To complete this quickstart, you need:

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-visual-studio-pivot.md

@@ -11,10 +11,6 @@ ms.author: cephalin
 
 This quickstart shows how to deploy an ASP.NET app, in a Windows image, to [Azure Container Registry](../../../container-registry/container-registry-intro.md) from Visual Studio. You run the app in a custom container in Azure App Service.
 
-> [!NOTE]
-> For information regarding running containerized applications in a serverless environment, please see [Container Apps](../../../container-apps/overview.md).
->
-
 To complete this quickstart, you need:
 
 - [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)

articles/app-service/quickstart-dotnetcore.md

@@ -33,6 +33,8 @@ target cross-platform with .NET 6.0.
 
 In this quickstart, you'll learn how to create and deploy your first ASP.NET web app to [Azure App Service](overview.md). App Service supports various versions of .NET apps, and provides a highly scalable, self-patching web hosting service. ASP.NET web apps are cross-platform and can be hosted on Linux or Windows. When you're finished, you'll have an Azure resource group consisting of an App Service hosting plan and an App Service with a deployed web application.
 
+Alternatively, you can deploy an ASP.NET web app as part of a [Windows or Linux container in App Service](quickstart-custom-container.md).
+
 ## Prerequisites
 
 :::zone target="docs" pivot="development-environment-vs"

articles/azure-monitor/agents/log-analytics-agent.md

@@ -70,7 +70,7 @@ This section explains how to install the Log Analytics agent on different types
 ### Linux virtual machine on-premises or in another cloud
 
 - Use [Azure Arc-enabled servers](../../azure-arc/servers/overview.md) to deploy and manage the Log Analytics VM extension. Review the [deployment options](../../azure-arc/servers/concept-log-analytics-extension-deployment.md) to understand the different deployment methods available for the extension on machines registered with Azure Arc-enabled servers.
-- [Manually install](../vm/monitor-virtual-machine.md) the agent calling a wrapper-script hosted on GitHub.
+- [Manually install](../agents/agent-linux.md#install-the-agent) the agent calling a wrapper-script hosted on GitHub.
 - Integrate [System Center Operations Manager](./om-agents.md) with Azure Monitor to forward collected data from Windows computers reporting to a management group.
 
 ## Data collected

articles/azure-monitor/alerts/alerts-manage-alerts-previous-version.md

@@ -65,8 +65,6 @@ ms.reviewer: harelbr
 ## Manage log alerts using PowerShell
 
 [!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
-> [!NOTE]
-> PowerShell is not currently supported in API version `2021-08-01`.
 
 Use the PowerShell cmdlets listed below to manage rules with the [Scheduled Query Rules API](/rest/api/monitor/scheduledqueryrule-2018-04-16/scheduled-query-rules).
 
@@ -118,4 +116,4 @@ New-AzResourceGroupDeployment -Name AlertDeployment -ResourceGroupName ResourceG
 * Learn about [log alerts](./alerts-unified-log.md).
 * Create log alerts using [Azure Resource Manager Templates](./alerts-log-create-templates.md).
 * Understand [webhook actions for log alerts](./alerts-log-webhook.md).
-* Learn more about [log queries](../logs/log-query-overview.md).
+* Learn more about [log queries](../logs/log-query-overview.md).