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

Author: halkazwini

articles/azure-vmware/ecosystem-os-vms.md

@@ -3,15 +3,19 @@ title: Operating system support for Azure VMware Solution virtual machines
 description: Learn about operating system support for your Azure VMware Solution virtual machines.
 ms.topic: how-to
 ms.service: azure-vmware
-ms.date: 12/12/2023
-ms.custom: engagement-fy23
+ms.date: 03/05/2025
+ms.custom: engagement-fy25
 ---
 
 # Operating system support for Azure VMware Solution virtual machines
 
-Azure VMware Solution supports a wide range of operating systems to be used in the guest virtual machines. Being based on VMware vSphere, currently 7.0 version, all operating systems currently supported by vSphere can be used by any Azure VMware Solution customer for their workloads.
+Azure VMware Solution supports a wide range of operating systems to be used in the guest virtual machines. Being based on VMware vSphere, all operating systems currently supported by vSphere can be used by any Azure VMware Solution customer for their workloads.
 
-Check the list of operating systems and configurations supported in the [VMware Compatibility Guide](https://www.vmware.com/resources/compatibility/search.php?deviceCategory=software), create a query for ESXi 7.0 Update 3 and select all operating systems and vendors.
+## VMware software versions
+
+[!INCLUDE [vmware-software-versions](includes/vmware-software-versions.md)]
+
+Check the list of operating systems and configurations supported in the [Broadcom Compatibility Guide](https://compatibilityguide.broadcom.com/search?program=software&persona=live&column=osVendors&order=asc), create a query for above listed ESXi version and select all operating systems and vendors.
 
 Additionally to the supported operating systems by VMware for vSphere, we worked with Red Hat, SUSE and Canonical to extend the support model currently in place for Azure Virtual Machines to the workloads running on Azure VMware Solution, given that it's a first-party Azure service. You can check the following sites of vendors for more information about the benefits of running their operating system on Azure.
 

articles/frontdoor/private-link.md

@@ -36,8 +36,8 @@ Origin support for direct private endpoint connectivity is currently limited to:
 * Web App
 * Internal load balancers, or any services that expose internal load balancers such as Azure Kubernetes Service, Azure Container Apps or Azure Red Hat OpenShift
 * Storage Static Website
+* API Management
 * Application Gateway (Public Preview. Don't use in production environments)
-* API Management (Public Preview. Don't use in production environments)
 * Azure Container Apps (Public Preview. Don't use in production environments)
 
 > [!NOTE]

articles/iot-hub/.openpublishing.redirection.iot-hub.json

@@ -162,7 +162,7 @@
     },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-security-architecture.md",
-      "redirect_url": "/azure/iot/iot-security-architecture",
+      "redirect_url": "/azure/well-architected/service-guides/azure-iot-hub#security",
       "redirect_document_id": false
     },
     {
@@ -177,7 +177,7 @@
     },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-security-ground-up.md",
-      "redirect_url": "/azure/iot/iot-security-architecture",
+      "redirect_url": "/azure/well-architected/service-guides/azure-iot-hub#security",
       "redirect_document_id": false
     },
     {

articles/iot-hub/TOC.yml

@@ -209,8 +209,6 @@
           href: ./security-controls-policy.md
         - name: IoT security best practices
           href: ../iot/iot-overview-security.md?context=%2fazure%2fiot-hub%2frc%2frc
-        - name: IoT security architecture
-          href: ../iot/iot-security-architecture.md?context=%2fazure%2fiot-hub%2frc%2frc
 - name: How-to guides
   items:
     - name: Manage

articles/iot/.openpublishing.redirection.iot.json

@@ -7,7 +7,7 @@
     },
     {
       "source_path_from_root": "/articles/iot-fundamentals/iot-security-ground-up.md",
-      "redirect_url": "/azure/iot/iot-security-architecture",
+      "redirect_url": "/azure/well-architected/service-guides/azure-iot-hub#security",
       "redirect_document_id": false
     },
     {
@@ -52,8 +52,13 @@
     },
     {
       "source_path_from_root": "/articles/iot-fundamentals/iot-security-architecture.md",
-      "redirect_url": "/azure/iot/iot-security-architecture",
-      "redirect_document_id": true
+      "redirect_url": "/azure/well-architected/service-guides/azure-iot-hub#security",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot/iot-security-architecture.md",
+      "redirect_url": "/azure/well-architected/service-guides/azure-iot-hub#security",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/iot-fundamentals/iot-security-best-practices.md",

articles/iot/TOC.yml

@@ -79,8 +79,6 @@ items:
 
   - name: Concepts
     items:
-      - name: Security architecture
-        href: iot-security-architecture.md
       - name: IoT device development
         items:
         - name: What is IoT device development

articles/iot/iot-overview-device-connectivity.md

@@ -78,7 +78,7 @@ Azure IoT devices can use either shared access signature (SAS) tokens or X.509 c
 
 All data exchanged between a device and an IoT hub is encrypted.
 
-To learn more about security in your IoT solution, see [Security architecture for IoT solutions](iot-security-architecture.md).
+To learn more about security in your IoT solution, see [Security architecture for IoT solutions](/azure/well-architected/service-guides/azure-iot-hub#security).
 
 ## Protocols