Merge branch 'main' into patch-300727

Author: JackStromberg

articles/app-service/media/routine-maintenance/routine-maintenance-first-page.png

@@ -24,7 +24,7 @@ Like personal computers, mobile phones, and other devices, machines in the cloud
 
 Because a typical cloud solution consists of multiple applications, databases, storage accounts, functions, and other resources, parts of your solutions can undergo maintenance at different times. Some of this coordination is related to geography, region, datacenters, and availability zones. It can also be due to the cloud, where not everything is touched simultaneously. For more information, see [Safe deployment practices](/devops/operate/safe-deployment-practices).
 
-The following screenshot shows an example of a maintenance event.
+The following screenshot shows an example of a maintenance event:
 
 :::image type="content" source="./media/routine-maintenance/routine-maintenance.png" alt-text="Screenshot of a maintenance event in the Azure portal.":::
 
@@ -34,6 +34,23 @@ In order from top to bottom, the example shows:
 - Affected regions and subscriptions.
 - The expected maintenance window.
 
+The following screenshots show additional information available through the Impacted Resources dropdown:
+
+:::image type="content" source="./media/routine-maintenance/routine-maintenance-first-page.png" alt-text="Screenshot of the Impacted Resources blade in the Azure portal.":::
+
+In order from left to right, the example shows:
+
+- Selecting the "Impacted Resources" dropdown.
+- The "More info" option.
+
+:::image type="content" source="./media/routine-maintenance/routine-maintenance-more.png" alt-text="Screenshot of more info for a maintenance event in the Azure portal.":::
+
+This example shows:
+
+- The state of the maintenance, which can be pending, started, or completed.
+- Once maintenance starts, timestamps can be viewed under "More info."
+
+
 ## Frequently asked questions
 
 ### Why is the maintenance taking so long?

articles/app-service/media/routine-maintenance/routine-maintenance-more.png

@@ -437,7 +437,7 @@ Now we're ready to send some traffic to our sample application, via the hostname
 curl https://contoso.com/ -v 2>&1 | grep issuer
 ```
 
-Upon result, you should see
+You should see the following output:
 
 `*  issuer: C=US; O=Let's Encrypt; CN=R10`
 

articles/app-service/routine-maintenance.md

@@ -6,7 +6,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
 ms.topic: how-to
-ms.date: 02/26/2024
+ms.date: 03/21/2025
 ms.author: greglin
 ---
 
@@ -177,7 +177,7 @@ First, create a SQL Server virtual machine (VM) using the Azure portal.
     - Configured the SQL server to accept SQL authentication
     - Created an admin account on the SQL server
 
-2. On a client device with [SQL Server Management Studio](/sql/ssms/download-sql-server-management-studio-ssms) installed, connect to the public IP address of the Azure virtual machine.
+2. On a client device with [SQL Server Management Studio](/sql/ssms/download-sql-server-management-studio-ssms) installed, connect to the public IP address of the Azure Application Gateway frontend.
 
     <br><img src="./media/how-to-tcp-tls-proxy/sql-connect.png" alt="Screenshot displaying the connection to a SQL server." width="60%">
 

articles/application-gateway/for-containers/how-to-cert-manager-lets-encrypt-gateway-api.md

@@ -585,21 +585,6 @@
           href: ../operational-excellence/relocation-functions.md?toc=/azure/azure-functions/toc.json
         - name: Work with legacy Functions Proxies
           href: legacy-proxies.md
-    - name: Migrate
-      items:
-        - name: Migrate .NET apps to the isolated model
-          href: migrate-dotnet-to-isolated-model.md
-        - name: Migrate v3.x to v4.x
-          href: migrate-version-3-version-4.md
-        - name: Migrate v1.x to v4.x
-          href: migrate-version-1-version-4.md
-        - name: Node.js
-          items:
-            - name: Migrate to model v4.x
-              href: functions-node-upgrade-v4.md
-        - name: Update language versions
-          href: update-language-versions.md
-          displayName: upgrade, migrate, language stack
     - name: Monitor
       items:
         - name: Monitor Azure Functions
@@ -747,6 +732,36 @@
               href: python-scale-performance-reference.md
             - name: Memory profiling
               href: python-memory-profiler-reference.md
+- name: Migration guides
+  items:
+    - name: Migrate from AWS Lambda
+      items:
+        - name: Overview
+          href: migration/lambda-functions-migration-overview.md
+          displayName: AWS Lambda, migration
+        - name: Discover
+          href: migration/lambda-functions-migration-discover.md
+          displayName: AWS Lambda, migration
+        - name: Assess
+          href: migration/lambda-functions-migration-assess.md
+          displayName: AWS Lambda, migration
+        - name: Migrate
+          href: migration/lambda-functions-migration-migrate.md
+          displayName: AWS Lambda, migration   
+    - name: Upgrade runtime versions
+      items:
+        - name: Migrate v3.x to v4.x
+          href: migrate-version-3-version-4.md
+        - name: Migrate v1.x to v4.x
+          href: migrate-version-1-version-4.md
+    - name: Language version updates
+      items: 
+        - name: Update language versions
+          href: update-language-versions.md
+          displayName: upgrade, migrate, language stack
+        - name: Migrate Node.js to model v4.x
+          href: functions-node-upgrade-v4.md
+
 - name: Reference
   items:
     - name: API references