Skip to content

Commit

Permalink
Merge pull request #11 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
8/22/2024 PM Publish
  • Loading branch information
Taojunshen authored Aug 22, 2024
2 parents 845f6e7 + 6ec1475 commit 96e38df
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ms.reviewer: mimckitt
---

# Azure Disk Encryption for Virtual Machine Scale Sets

Azure Disk Encryption provides volume encryption for the OS and data disks of your virtual machines, helping protect and safeguard your data to meet organizational security and compliance commitments. To learn more, see [Azure Disk Encryption: Linux VMs](../virtual-machines/linux/disk-encryption-overview.md) and [Azure Disk Encryption: Windows VMs](../virtual-machines/windows/disk-encryption-overview.md)

Azure Disk Encryption can also be applied to Windows and Linux Virtual Machine Scale Sets, in these instances:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ The following table compares the Flexible orchestration mode, Uniform orchestrat
| List VMs in Set | Yes | Yes | Yes, list VMs in AvSet |
| Automatic Scaling (manual, metrics based, schedule based) | Yes | Yes | No |
| Auto-Remove NICs and Disks when deleting VM instances | Yes | Yes | No |
| Upgrade Policy (Virtual Machine Scale Set) | No, upgrade policy must be null or [] during create | Automatic, Rolling, Manual | N/A |
| Upgrade Policy (Virtual Machine Scale Set) | Automatic, Rolling, Manual | Automatic, Rolling, Manual | N/A |
| Automatic OS Updates (Virtual Machine Scale Set) | No | Yes | N/A |
| In Guest Security Patching | Yes, read [Auto VM Guest Patching](../virtual-machines/automatic-vm-guest-patching.md) | No | Yes |
| Terminate Notifications (Virtual Machine Scale Set) | Yes, read [Terminate Notifications documentation](../virtual-machine-scale-sets/virtual-machine-scale-sets-terminate-notification.md) | Yes, read [Terminate Notifications documentation](../virtual-machine-scale-sets/virtual-machine-scale-sets-terminate-notification.md) | N/A |
Expand Down
2 changes: 1 addition & 1 deletion articles/virtual-machines/azure-compute-gallery.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ms.reviewer: cynthn, mattmcinnes
---

# Store and share resources in an Azure Compute Gallery

**Applies to:** :heavy_check_mark: Linux VMs :heavy_check_mark: Windows VMs :heavy_check_mark: Flexible scale sets :heavy_check_mark: Uniform scale sets

An Azure Compute Gallery helps you build structure and organization around your Azure resources, like images and [applications](vm-applications.md). An Azure Compute Gallery provides:
Expand Down

0 comments on commit 96e38df

Please sign in to comment.