- Update Tables: Userdata now supported

fitzgeraldsteele · web-flow · commit 38db2332906b · 2022-05-16T21:46:40.000-07:00
- Update Tables: Batch Delete now supported
- Update Tables: SSE+CMK Supported
- Update CMK pages: Applies to Flex VMSS and Uniform VMSS
diff --git a/articles/virtual-machine-scale-sets/orchestration-modes-api-comparison.md b/articles/virtual-machine-scale-sets/orchestration-modes-api-comparison.md
@@ -27,7 +27,7 @@ This article compares the API differences between Uniform and [Flexible orchestr
 | Uniform API | Flexible alternative |
 |-|-|
 | [Deallocate](/rest/api/compute/virtualmachinescalesetvms/deallocate)  | [Invoke Single VM API - Deallocate](/rest/api/compute/virtualmachines/deallocate)   |
-| [Delete](/rest/api/compute/virtualmachinescalesetvms/delete)  | [Invoke Single VM API -Delete](/rest/api/compute/virtualmachines/delete)  |
+| [Delete](/rest/api/compute/virtualmachinescalesetvms/delete)  | VMSS Batch delete API supported by VMSS in Flexible Orchestration Mode |
 | [Get Instance View](/rest/api/compute/virtualmachinescalesetvms/getinstanceview)  | [Invoke Single VM API - Instance View](/rest/api/compute/virtualmachines/instanceview)  |
 | [Perform Maintenance](/rest/api/compute/virtualmachinescalesetvms/performmaintenance)  | [Invoke Single VM API - Perform Maintenance](/rest/api/compute/virtualmachines/performmaintenance)  |
 | [Power Off](/rest/api/compute/virtualmachinescalesetvms/poweroff)  | [Invoke Single VM API - Power Off](/rest/api/compute/virtualmachines/poweroff)  |
diff --git a/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md b/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md
@@ -104,14 +104,15 @@ The following table compares the Flexible orchestration mode, Uniform orchestrat
 | Spot instances and pricing   | Yes, you can have both Spot and Regular priority instances  | Yes, instances must either be all Spot or all Regular  | No, Regular priority instances only |
 | Mix operating systems  | Yes, Linux and Windows can reside in the same Flexible scale set  | No, instances are the same operating system  | Yes, Linux and Windows can reside in the same availability set |
 | Disk Types  | Managed disks only, all storage types  | Managed and unmanaged disks, all storage types  | Managed and unmanaged disks, Ultradisk not supported |
+| Disk Server Side Encryption with Customer Managed Keys | Yes | Yes | Yes |
 | Write Accelerator   | No  | Yes  | Yes |
 | Proximity Placement Groups   | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) | Yes |
 | Azure Dedicated Hosts   | No  | Yes  | Yes |
 | Managed Identity  | User Assigned Identity Only  | System Assigned or User Assigned  | N/A (can specify Managed Identity on individual instances) |
 | Add/remove existing VM to the group  | No  | No  | No |
 | Service Fabric  | No  | Yes  | No |
 | Azure Kubernetes Service (AKS) / AKE  | No  | Yes  | No |
-| UserData  | Partial, UserData can be specified for individual VMs | Yes  | UserData can be specified for individual VMs |
+| UserData  | Yes | Yes  | UserData can be specified for individual VMs |
 
 
 ### Autoscaling and instance orchestration
@@ -129,7 +130,7 @@ The following table compares the Flexible orchestration mode, Uniform orchestrat
 | Instance Protection | No, use [Azure resource lock](../azure-resource-manager/management/lock-resources.md) | Yes | No |
 | Scale In Policy | No | Yes | No |
 | VMSS Get Instance View | No | Yes | N/A |
-| VM Batch Operations (Start all, Stop all, delete subset, etc.) | No (can trigger operations on each instance using VM API) | Yes | No |
+| VM Batch Operations (Start all, Stop all, delete subset, etc.) | Partial, Batch delete is supported. Other operations can be triggered on each instance using VM API) | Yes | No |
 
 ### High availability 
 
diff --git a/articles/virtual-machines/flexible-virtual-machine-scale-sets.md b/articles/virtual-machines/flexible-virtual-machine-scale-sets.md
@@ -113,14 +113,15 @@ The following tables list the Flexible orchestration mode features and links to
 | Spot instances and pricing   | Yes, you can have both Spot and Regular priority instances  |
 | Mix operating systems  | Yes, Linux and Windows can reside in the same Flexible scale set  |
 | Disk Types  | Managed disks only, all storage types  |
+| Disk Server Side Encryption with Customer Managed Keys | Yes |
 | Write Accelerator   | No  |
 | Proximity Placement Groups   | Yes, read [Proximity Placement Groups documentation](../virtual-machine-scale-sets/proximity-placement-groups.md) |
 | Azure Dedicated Hosts   | No  |
 | Managed Identity  | User Assigned Identity Only  |
 | Add/remove existing VM to the group  | No  |
 | Service Fabric  | No  |
 | Azure Kubernetes Service (AKS) / AKE  | No  |
-| UserData  | Partial, UserData can be specified for individual VMs |
+| UserData  | Yes |
 
 
 ### Autoscaling and instance orchestration
@@ -139,7 +140,7 @@ The following tables list the Flexible orchestration mode features and links to
 | Instance Protection | No, use [Azure resource lock](../azure-resource-manager/management/lock-resources.md) |
 | Scale In Policy | No |
 | VMSS Get Instance View | No |
-| VM Batch Operations (Start all, Stop all, delete subset, etc.) | No (can trigger operations on each instance using VM API) |
+| VM Batch Operations (Start all, Stop all, delete subset, etc.) | Partial, Batch delete is supported. Other operations can be triggered on each instance using VM API) |
 
 ### High availability 
 
diff --git a/articles/virtual-machines/linux/disks-enable-customer-managed-keys-cli.md b/articles/virtual-machines/linux/disks-enable-customer-managed-keys-cli.md
@@ -12,7 +12,7 @@ ms.subservice: disks
 
 # Use the Azure CLI to enable server-side encryption with customer-managed keys for managed disks
 
-**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Flexible scale sets 
+**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Windows VMs :heavy_check_mark: Flexible scale sets :heavy_check_mark: Uniform scale sets 
 
 Azure Disk Storage allows you to manage your own keys when using server-side encryption (SSE) for managed disks, if you choose. For conceptual information on SSE with customer managed keys, as well as other managed disk encryption types, see the [Customer-managed keys](../disk-encryption.md#customer-managed-keys) section of our disk encryption article.
 
diff --git a/articles/virtual-machines/windows/disks-enable-customer-managed-keys-powershell.md b/articles/virtual-machines/windows/disks-enable-customer-managed-keys-powershell.md
@@ -12,7 +12,7 @@ ms.custom: devx-track-azurepowershell, ignite-fall-2021
 
 # Azure PowerShell - Enable customer-managed keys with server-side encryption - managed disks
 
-**Applies to:** :heavy_check_mark: Windows VMs 
+**Applies to:** :heavy_check_mark: Windows VMs :heavy_check_mark: Flexible scale sets
 
 Azure Disk Storage allows you to manage your own keys when using server-side encryption (SSE) for managed disks, if you choose. For conceptual information on SSE with customer-managed keys, and other managed disk encryption types, see the [Customer-managed keys](../disk-encryption.md#customer-managed-keys) section of our disk encryption article.
 
