Sync release-hotfixes with main

Sync release-hotfixes with main

Author: sethmanheim

.openpublishing.redirection.json

@@ -195,6 +195,11 @@
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
       "redirect_document_id":false
     },    
+    { 
+      "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-six.md", 
+      "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 
+      "redirect_document_id":false
+    },    
     { 
       "source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-four.md", 
       "redirect_url":"/azure-stack/operator/app-service-release-notes-2302", 

AKS-Hybrid/aks-edge-howto-setup-nested-environment.md

@@ -1,10 +1,10 @@
 ---
 title: Nested virtualization environment for AKS Edge Essentials
 description: Learn how to prepare your nested virtualization environment for AKS Edge Essentials clusters. 
-author: fcabrera23
-ms.author: fcabrera
+author: sethmanheim
+ms.author: sethm
 ms.topic: how-to
-ms.date: 11/28/2023
+ms.date: 09/10/2024
 ms.custom: template-how-to
 ---
 
@@ -13,8 +13,8 @@ ms.custom: template-how-to
 This article describes how to set up a nested virtualization environment to deploy an Azure Kubernetes Service (AKS) Edge Essentials cluster.
 
 > [!NOTE]
-> Deploying AKS Edge Essentials on top of a nested virtualization environment on VMware ESXi is supported per [VMware KB2009916](https://kb.vmware.com/s/article/2009916).
-> Other nested virutalization deployments are not supported for production scenarios and are limited to developer purposes. This guide assumes you're using the Hyper-V hypervisor. We do not support using a non-Microsoft hypervisor, such as KVM.
+> Deploying AKS Edge Essentials on top of a nested virtualization environment on VMware ESXi is supported.
+> Other nested virtualization deployments are not supported for production scenarios and are limited to developer purposes. This guide assumes you're using the Hyper-V hypervisor. We do not support using a non-Microsoft hypervisor, such as KVM.
 
 ## Prerequisites
 
@@ -23,7 +23,7 @@ This article describes how to set up a nested virtualization environment to depl
 
 ## Deployment on Windows VM on VMware ESXi
 
-VMware ESXi [7.0](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vsphere-esxi-vcenter-server-70-release-notes.html) and [8.0](https://docs.vmware.com/en/VMware-vSphere/8.0/rn/vmware-vsphere-80-release-notes/index.html) versions can host AKS Edge Essentials on top of a Windows virtual machine. See [VMware KB2009916](https://kb.vmware.com/s/article/2009916) for more information about VMware ESXi nested virtualization support.
+VMware ESXi [7.0](https://docs.vmware.com/en/VMware-vSphere/7.0/rn/vsphere-esxi-vcenter-server-70-release-notes.html) and [8.0](https://docs.vmware.com/en/VMware-vSphere/8.0/rn/vmware-vsphere-80-release-notes/index.html) versions can host AKS Edge Essentials on top of a Windows virtual machine.
 
 To set up AKS Edge Essentials on a VMware ESXi Windows virtual machine, use the following steps:
 
@@ -268,7 +268,7 @@ The following guide is an example of IP address allocation. You can use your own
    kubectl get nodes
    ```
 
-   If everything was correctly set up, you should see both Linux nodes running in your cluster
+   If everything was correctly set up, you should see both Linux nodes running in your cluster:
 
    ```output
    PS C:\> kubectl get nodes
@@ -277,6 +277,9 @@ The following guide is an example of IP address allocation. You can use your own
    windows-vm2-ledge        Ready    control-plane,etcd,master  10m25s   v1.24.3+k3s-
    ```
 
+   > [!NOTE]
+   > For a list of currently supported Kubernetes versions on both K3s and K8s, see the table in [Download AKS Edge Essentials](aks-edge-howto-setup-machine.md#download-aks-edge-essentials).
+
 ## Next steps
 
 - Add workloads by [deploying applications](aks-edge-howto-deploy-app.md)

AKS-Hybrid/aks-edge-howto-update.md

@@ -4,7 +4,7 @@ description: Learn how to update AKS Edge Essentials clusters.
 author: rcheeran
 ms.author: rcheeran
 ms.topic: how-to
-ms.date: 07/12/2024
+ms.date: 09/10/2024
 ms.custom: template-how-to
 ---
 
@@ -72,7 +72,7 @@ On-premises updates using WSUS is supported for AKS Edge Essentials updates. For
 
 ## Upgrade to newer versions
 
-AKS Edge Essentials currently supports Kubernetes version 1.24.3 on both K3s and K8s. As we continue to add support to newer versions, you can use over-the-air updates to the newer versions. To upgrade your clusters to newer versions, set the `Set-AksEdgeUpgrade` command to `true`:
+For a list of currently supported Kubernetes versions on both K3s and K8s, see the table in [Download AKS Edge Essentials](aks-edge-howto-setup-machine.md#download-aks-edge-essentials). As we continue to add support to newer versions, you can use over-the-air updates to the newer versions. To upgrade your clusters to newer versions, set the `Set-AksEdgeUpgrade` command to `true`:
 
 ```powershell
 Set-AksEdgeUpgrade – AcceptUpgrade $true

AKS-Hybrid/aks-edge-system-requirements.md

@@ -4,7 +4,7 @@ description: Requirements and supported versions for AKS Edge Essentials.
 author: rcheeran
 ms.author: rcheeran
 ms.topic: conceptual
-ms.date: 07/08/2024
+ms.date: 09/10/2024
 ms.custom: template-concept
 ---
 
@@ -50,10 +50,10 @@ Install Windows 10/11 IoT Enterprise/Enterprise/Pro on your machine and activate
 
 ## GA feature support matrix
 
-- **Kubernetes Distribution supported**: Kubernetes (K8S) - Version: 1.24.3 and on Kubernetes (K3S) - Version: 1.24.3
-- **Deployment options**: Single-machine clusters and full Kubernetes deployment on single machines only. Full deployment across multiple machines isn't supported in GA.
-- **Workloads**: Only Linux worker nodes.
-- **Network plugins**: Calico on K8S.
+- **Supported Kubernetes distribution**: currently supported Kubernetes versions on both K3s and K8s [are described in this table](aks-edge-howto-setup-machine.md#download-aks-edge-essentials).
+- **Deployment options**: single-machine clusters and full Kubernetes deployment on single machines only. Full deployment across multiple machines isn't supported in GA.
+- **Workloads**: only Linux worker nodes.
+- **Network plugins**: Calico on K8s.
 
 ## Experimental or prerelease features