Skip to content

Commit ec6d836

Browse files
authored
Merge pull request #110718 from msmbaldwin/ade
Revised intros
2 parents 53db5e3 + d69f6ae commit ec6d836

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

articles/virtual-machines/linux/disk-encryption-linux.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ ms.custom: seodec18
1313

1414
# Azure Disk Encryption scenarios on Linux VMs
1515

16-
Azure Disk Encryption uses the DM-Crypt feature of Linux to provide volume encryption for the OS and data disks of Azure virtual machines (VMs), and is integrated with Azure Key Vault to help you control and manage the disk encryption keys and secrets. For an overview of the service, see [Azure Disk Encryption for Linux VMs](disk-encryption-overview.md).
1716

18-
There are many disk encryption scenarios, and the steps may vary according to the scenario. The following sections cover the scenarios in greater detail for Linux VMs.
17+
Azure Disk Encryption for Linux virtual machines (VMs) uses the DM-Crypt feature of Linux to provide full disk encryption of the OS disk and data disks. Additionally, it provides encryption of the ephemeral resource disk when using the EncryptFormatAll feature.
18+
19+
Azure Disk Encryption is [integrated with Azure Key Vault](disk-encryption-key-vault.md) to help you control and manage the disk encryption keys and secrets. For an overview of the service, see [Azure Disk Encryption for Windows VMs](disk-encryption-overview.md).
1920

2021
You can only apply disk encryption to virtual machines of [supported VM sizes and operating systems](disk-encryption-overview.md#supported-vms-and-operating-systems). You must also meet the following prerequisites:
2122

articles/virtual-machines/windows/disk-encryption-windows.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ ms.custom: seodec18
1313

1414
# Azure Disk Encryption scenarios on Windows VMs
1515

16-
Azure Disk Encryption uses the BitLocker external key protector to provide volume encryption for the OS and data disks of Azure virtual machines (VMs), and is integrated with Azure Key Vault to help you control and manage the disk encryption keys and secrets. For an overview of the service, see [Azure Disk Encryption for Windows VMs](disk-encryption-overview.md).
16+
Azure Disk Encryption for Windows virtual machines (VMs) uses the Bitlocker feature of Windows to provide full disk encryption of the WindOS disk and data disk. Additionally, it provides encryption of the ephemeral resource disk when the VolumeType parameter is All.
1717

18-
There are many disk encryption scenarios, and the steps may vary according to the scenario. The following sections cover the scenarios in greater detail for Windows VMs.
18+
Azure Disk Encryption is [integrated with Azure Key Vault](disk-encryption-key-vault.md) to help you control and manage the disk encryption keys and secrets. For an overview of the service, see [Azure Disk Encryption for Windows VMs](disk-encryption-overview.md).
1919

2020
You can only apply disk encryption to virtual machines of [supported VM sizes and operating systems](disk-encryption-overview.md#supported-vms-and-operating-systems). You must also meet the following prerequisites:
2121

@@ -37,9 +37,6 @@ You can only apply disk encryption to virtual machines of [supported VM sizes an
3737
## Enable encryption on an existing or running Windows VM
3838
In this scenario, you can enable encryption by using the Resource Manager template, PowerShell cmdlets, or CLI commands. If you need schema information for the virtual machine extension, see the [Azure Disk Encryption for Windows extension](../extensions/azure-disk-enc-windows.md) article.
3939

40-
## Enable encryption on existing or running IaaS Windows VMs
41-
You can enable encryption by using a template, PowerShell cmdlets, or CLI commands. If you need schema information for the virtual machine extension, see the [Azure Disk Encryption for Windows extension](../extensions/azure-disk-enc-windows.md) article.
42-
4340
### Enable encryption on existing or running VMs with Azure PowerShell
4441
Use the [Set-AzVMDiskEncryptionExtension](/powershell/module/az.compute/set-azvmdiskencryptionextension) cmdlet to enable encryption on a running IaaS virtual machine in Azure.
4542

0 commit comments

Comments
 (0)