Merge pull request #95098 from roygara/smkUpdates

Updates for Server side encryption

Author: PRMerger10

articles/storage/common/storage-service-encryption.md

@@ -70,7 +70,7 @@ The following list explains the numbered steps in the diagram:
 
 To revoke access to customer-managed keys on the storage account, see [Azure Key Vault PowerShell](https://docs.microsoft.com/powershell/module/azurerm.keyvault/) and [Azure Key Vault CLI](https://docs.microsoft.com/cli/azure/keyvault). Revoking access effectively blocks access to all data in the storage account, as the encryption key is inaccessible by Azure Storage.
 
-Customer-managed keys are not supported for [Azure managed disks](../../virtual-machines/windows/managed-disks-overview.md).
+Customer-managed keys are also available for Azure managed disks as a public preview, customer-managed keys work a bit differently for managed disks than the rest of storage. For details, see our [article on the subject](../../virtual-machines/linux/disk-encryption.md#customer-managed-keys-public-preview).
 
 To learn how to use customer-managed keys with Azure Storage, see one of these articles:
 

articles/virtual-machines/linux/managed-disks-overview.md

@@ -1,10 +1,10 @@
 ---
 title: Azure Disk Storage managed disk overview for Linux VMs | Microsoft Docs
-description: Overview of Azure managed disks, which handles the storage accounts for you when using Linux VMs
+description: Overview of Azure managed disks, which handle the storage accounts for you when using Linux VMs
 author: roygara
 ms.service: virtual-machines-linux
 ms.topic: overview
-ms.date: 08/15/2019
+ms.date: 11/06/2019
 ms.author: rogarana
 ms.subservice: disks
 ---

includes/virtual-machines-managed-disks-overview.md

@@ -5,7 +5,7 @@
  author: roygara
  ms.service: virtual-machines
  ms.topic: include
- ms.date: 05/06/2019
+ ms.date: 11/06/2019
  ms.author: rogarana
  ms.custom: include file
 ---
@@ -28,7 +28,7 @@ Managed disks are integrated with availability sets to ensure that the disks of
 
 ### Integration with Availability Zones
 
-Managed disks supports [Availability Zones](../articles/availability-zones/az-overview.md), which is a high-availability offering that protects your applications from datacenter failures. Availability Zones are unique physical locations within an Azure region. Each zone is made up of one or more datacenters equipped with independent power, cooling, and networking. To ensure resiliency, there’s a minimum of three separate zones in all enabled regions. With Availability Zones, Azure offers industry best 99.99% VM uptime SLA.
+Managed disks support [Availability Zones](../articles/availability-zones/az-overview.md), which is a high-availability offering that protects your applications from datacenter failures. Availability Zones are unique physical locations within an Azure region. Each zone is made up of one or more datacenters equipped with independent power, cooling, and networking. To ensure resiliency, there’s a minimum of three separate zones in all enabled regions. With Availability Zones, Azure offers industry best 99.99% VM uptime SLA.
 
 ### Azure Backup support
 
@@ -50,7 +50,7 @@ Managed disks offer two different kinds of encryption. The first is Server Side
 
 ### Server-side encryption
 
-[Azure Server-side Encryption](../articles/storage/common/storage-service-encryption.md) provides encryption-at-rest and safeguards your data to meet your organizational security and compliance commitments. Server-side encryption is enabled by default for all managed disks, snapshots, and images in all the regions where managed disks are available. Visit the [Managed Disks FAQ page](../articles/virtual-machines/windows/faq-for-disks.md#managed-disks-and-storage-service-encryption) for more details.
+[Azure Server-side Encryption](../articles/virtual-machines/windows/disk-encryption.md) provides encryption-at-rest and safeguards your data to meet your organizational security and compliance commitments. Server-side encryption is enabled by default for all managed disks, snapshots, and images in all the regions where managed disks are available. You can either allow Azure to manage your keys for you, these are platform-managed keys, or you can manage the keys yourself, these are customer-managed keys (preview). Visit the [Managed Disks FAQ page](../articles/virtual-machines/windows/faq-for-disks.md#managed-disks-and-storage-service-encryption) for more details.
 
 ### Azure Disk Encryption
 
@@ -80,7 +80,7 @@ Every VM contains a temporary disk, which is not a managed disk. The temporary d
 
 A managed disk snapshot is a read-only crash-consistent full copy of a managed disk that is stored as a standard managed disk by default. With snapshots, you can back up your managed disks at any point in time. These snapshots exist independent of the source disk and can be used to create new managed disks. 
 
-Snapshots are billed based on the used size. For example, if you create a snapshot of a managed disk with provisioned capacity of 64 GiB and actual used data size of 10 GiB, that snapshot is billed only for the used data size of 10 GiB. You can see the used size of your snapshots by looking at the [Azure usage report](https://docs.microsoft.com/en-us/azure/billing/billing-understand-your-bill). For example, if the used data size of a snapshot is 10 GiB, the **daily** usage report will show 10 GiB/(31 days) = 0.3226 as the consumed quantity.
+Snapshots are billed based on the used size. For example, if you create a snapshot of a managed disk with provisioned capacity of 64 GiB and actual used data size of 10 GiB, that snapshot is billed only for the used data size of 10 GiB. You can see the used size of your snapshots by looking at the [Azure usage report](https://docs.microsoft.com/azure/billing/billing-understand-your-bill). For example, if the used data size of a snapshot is 10 GiB, the **daily** usage report will show 10 GiB/(31 days) = 0.3226 as the consumed quantity.
 
 To learn more about how to create snapshots for managed disks, see the following resources: