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

Author: duongau

articles/api-management/TOC.yml

@@ -78,6 +78,8 @@
               href: /security/benchmark/azure/baselines/api-management-security-baseline?toc=/azure/api-management/&bc=/azure/api-management/breadcrumb/toc.json
       - name: Observability
         href: observability.md
+      - name: DevOps and CI/CD
+        href: devops-api-development-templates.md  
       - name: APIs
         items:
             - name: API design ebook
@@ -145,8 +147,6 @@
               items:
               - name: Landing zone accelerator
                 href: /azure/cloud-adoption-framework/scenarios/app-platform/api-management/landing-zone-accelerator?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
-              - name: CI/CD using ARM templates
-                href: devops-api-development-templates.md
               - name: Manage using automation
                 href: automation-manage-api-management.md
               - name: Configure using Git

articles/azure-fluid-relay/how-tos/container-deletion.md

@@ -1,8 +1,8 @@
 ---
-author: trngo
+author: hickeys
 description: Learn how to delete individual containers using az-cli
 title: Delete Fluid containers
-ms.author: trngo
+ms.author: hickeys
 ms.date: 09/28/2021
 ms.service: azure-fluid
 ms.topic: reference

articles/azure-monitor/app/asp-net-exceptions.md

@@ -1,40 +1,41 @@
 ---
-title: Monitor Azure app services performance | Microsoft Docs
-description: Application performance monitoring for Azure app services. Chart load and response time, dependency information, and set alerts on performance.
+title: Monitor Azure App Service performance | Microsoft Docs
+description: Application performance monitoring for Azure App Service. Chart load and response time, dependency information, and set alerts on performance.
 ms.topic: conceptual
 ms.date: 08/05/2021
 ms.custom: "devx-track-js, devx-track-dotnet"
 ---
 
-# Application Monitoring for Azure App Service Overview
+# Application monitoring for Azure App Service overview
 
-Enabling monitoring on your ASP.NET, ASP.NET Core, Java, and Node.js based web applications running on [Azure App Services](../../app-service/index.yml) is now easier than ever. Whereas previously you needed to manually instrument your app, the latest extension/agent is now built into the App Service image by default. 
+It's now easier than ever to enable monitoring on your web applications based on ASP.NET, ASP.NET Core, Java, and Node.js running on [Azure App Service](../../app-service/index.yml). Previously, you needed to manually instrument your app, but the latest extension/agent is now built into the App Service image by default.
 
 ## Enable Application Insights
 
-There are two ways to enable application monitoring for Azure App Services hosted applications:
+There are two ways to enable monitoring for applications hosted on App Service:
 
-- **Auto-instrumentation application monitoring** (ApplicationInsightsAgent). 
- 
-    - This method is the easiest to enable, and no code change or advanced configurations are required. It is often referred to as "runtime" monitoring. For Azure App Services we recommend at a minimum enabling this level of monitoring, and then based on your specific scenario you can evaluate whether more advanced monitoring through manual instrumentation is needed.
+- **Auto-instrumentation application monitoring** (ApplicationInsightsAgent).
+
+  This method is the easiest to enable, and no code change or advanced configurations are required. It's often referred to as "runtime" monitoring. For App Service, we recommend that at a minimum you enable this level of monitoring. Based on your specific scenario, you can evaluate whether more advanced monitoring through manual instrumentation is needed.
+
+  The following platforms are supported for auto-instrumentation monitoring:
+
+  - [.NET Core](./azure-web-apps-net-core.md)
+  - [.NET](./azure-web-apps-net.md)
+  - [Java](./azure-web-apps-java.md)
+  - [Node.js](./azure-web-apps-nodejs.md)
 
-    - The following are supported for auto-instrumentation monitoring:
-        - [.NET Core](./azure-web-apps-net-core.md)
-        - [.NET](./azure-web-apps-net.md)
-        - [Java](./azure-web-apps-java.md)
-        - [Nodejs](./azure-web-apps-nodejs.md)
-    
 * **Manually instrumenting the application through code** by installing the Application Insights SDK.
 
-    * This approach is much more customizable, but it requires the following approaches: SDK for [.NET Core](./asp-net-core.md), [.NET](./asp-net.md), [Node.js](./nodejs.md), [Python](./opencensus-python.md), and a standalone agent for [Java](./java-in-process-agent.md). This method, also means you have to manage the updates to the latest version of the packages yourself.
+  This approach is much more customizable, but it requires the following approaches: SDK for [.NET Core](./asp-net-core.md), [.NET](./asp-net.md), [Node.js](./nodejs.md), [Python](./opencensus-python.md), and a standalone agent for [Java](./java-in-process-agent.md). This method also means you must manage the updates to the latest version of the packages yourself.
+  
+  If you need to make custom API calls to track events/dependencies not captured by default with auto-instrumentation monitoring, you'll need to use this method. To learn more, see [Application Insights API for custom events and metrics](./api-custom-events-metrics.md).
 
-    * If you need to make custom API calls to track events/dependencies not captured by default with auto-instrumentation monitoring, you would need to use this method. Check out the [API for custom events and metrics article](./api-custom-events-metrics.md) to learn more. 
+If both auto-instrumentation monitoring and manual SDK-based instrumentation are detected, in .NET only the manual instrumentation settings will be honored, while in Java only the auto-instrumentation will be emitting the telemetry. This practice is to prevent duplicate data from being sent.
 
 > [!NOTE]
-> If both auto-instrumentation monitoring and manual SDK-based instrumentation are detected, in .NET only the manual instrumentation settings will be honored, while in Java only the auto-instrumentation will be emitting the telemetry. This is to prevent duplicate data from being sent.
+> Snapshot Debugger and Profiler are only available in .NET and .NET Core.
 
-> [!NOTE]
-> Snapshot debugger and profiler are only available in .NET and .NET Core
+## Next steps
 
-## Next Steps
-- Learn how to enable auto-instrumentation application monitoring for your [.NET Core](./azure-web-apps-net-core.md), [.NET](./azure-web-apps-net.md), [Java](./azure-web-apps-java.md) or [Nodejs](./azure-web-apps-nodejs.md) application running on App Service. 
+Learn how to enable auto-instrumentation application monitoring for your [.NET Core](./azure-web-apps-net-core.md), [.NET](./azure-web-apps-net.md), [Java](./azure-web-apps-java.md), or [Nodejs](./azure-web-apps-nodejs.md) application running on App Service.