Merge pull request #108342 from simonesavi/adeextensionfix

Fixed Typos in Azure Disk Encryption Extension

Author: v-shils

articles/security/fundamentals/azure-disk-encryption-vms-vmss.md

@@ -25,7 +25,7 @@ The following articles provide guidance for encrypting Linux virtual machines.
 - [Create and encrypt a Linux VM with Azure CLI](../../virtual-machines/linux/disk-encryption-cli-quickstart.md)
 - [Create and encrypt a Linux VM with Azure PowerShell](../../virtual-machines/linux/disk-encryption-powershell-quickstart.md)
 - [Create and encrypt a Linux VM with the Azure portal](../../virtual-machines/linux/disk-encryption-portal-quickstart.md)
-- [Azure Disk Encryption Extension Schemata for Linux](../../virtual-machines/extensions/azure-disk-enc-linux.md)
+- [Azure Disk Encryption Extension Schema for Linux](../../virtual-machines/extensions/azure-disk-enc-linux.md)
 - [Creating and configuring a key vault for Azure Disk Encryption](../../virtual-machines/linux/disk-encryption-key-vault.md)
 - [Azure Disk Encryption sample scripts](../../virtual-machines/linux/disk-encryption-sample-scripts.md)
 - [Azure Disk Encryption troubleshooting](../../virtual-machines/linux/disk-encryption-troubleshooting.md)
@@ -48,7 +48,7 @@ The following articles provide guidance for encrypting Windows virtual machines.
 - [Create and encrypt a Windows VM with Azure CLI](../../virtual-machines/windows/disk-encryption-cli-quickstart.md)
 - [Create and encrypt a Windows VM with Azure PowerShell](../../virtual-machines/windows/disk-encryption-powershell-quickstart.md)
 - [Create and encrypt a Windows VM with the Azure portal](../../virtual-machines/windows/disk-encryption-portal-quickstart.md)
-- [Azure Disk Encryption Extension Schemata for Windows](../../virtual-machines/extensions/azure-disk-enc-windows.md)
+- [Azure Disk Encryption Extension Schema for Windows](../../virtual-machines/extensions/azure-disk-enc-windows.md)
 - [Creating and configuring a key vault for Azure Disk Encryption](../../virtual-machines/windows/disk-encryption-key-vault.md)
 - [Azure Disk Encryption sample scripts](../../virtual-machines/windows/disk-encryption-sample-scripts.md)
 - [Azure Disk Encryption troubleshooting](../../virtual-machines/windows/disk-encryption-troubleshooting.md)

articles/virtual-machines/extensions/azure-disk-enc-linux.md

@@ -31,7 +31,7 @@ For a full list of prerequisites, see [Azure Disk Encryption for Linux VMs](../l
 - [Networking requirements](../linux/disk-encryption-overview.md#networking-requirements)
 - [Encryption key storage requirements](../linux/disk-encryption-overview.md#encryption-key-storage-requirements)
 
-## Extension schemata
+## Extension Schema
 
 There are two versions of extension schema for Azure Disk Encryption (ADE):
 - v1.1 - A newer recommended schema that does not use Azure Active Directory (AAD) properties.
@@ -51,18 +51,18 @@ The v1.1 schema is recommended and does not require Azure Active Directory (AAD)
   "location": "[location]",
   "properties": {
         "publisher": "Microsoft.Azure.Security",
-	"type": "AzureDiskEncryptionForLinux",
-        "typeHandlerVersion": "[extensionVersion]",
-	"autoUpgradeMinorVersion": true,
+        "type": "AzureDiskEncryptionForLinux",
+        "typeHandlerVersion": "1.1",
+        "autoUpgradeMinorVersion": true,
         "settings": {
           "DiskFormatQuery": "[diskFormatQuery]",
           "EncryptionOperation": "[encryptionOperation]",
-	  "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
-	  "KeyVaultURL": "[keyVaultURL]",
-	  "KeyVaultResourceId": "[KeyVaultResourceId]",
-	  "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
-	  "KekVaultResourceId": "[KekVaultResourceId",
-	  "SequenceVersion": "sequenceVersion]",
+          "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
+          "KeyVaultURL": "[keyVaultURL]",
+          "KeyVaultResourceId": "[KeyVaultResourceId]",
+          "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
+          "KekVaultResourceId": "[KekVaultResourceId",
+          "SequenceVersion": "sequenceVersion]",
           "VolumeType": "[volumeType]"
         }
   }
@@ -83,23 +83,23 @@ Using `AADClientSecret`:
   "apiVersion": "2019-07-01",
   "location": "[location]",
   "properties": {
-	"protectedSettings": {
-	  "AADClientSecret": "[aadClientSecret]",
-	  "Passphrase": "[passphrase]"
-	},
-	"publisher": "Microsoft.Azure.Security",
-	"type": "AzureDiskEncryptionForLinux",
-	"typeHandlerVersion": "[extensionVersion]",
-	"settings": {
-	  "AADClientID": "[aadClientID]",
-	  "DiskFormatQuery": "[diskFormatQuery]",
-	  "EncryptionOperation": "[encryptionOperation]",
-	  "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
-	  "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
-	  "KeyVaultURL": "[keyVaultURL]",
-	  "SequenceVersion": "sequenceVersion]",
-	  "VolumeType": "[volumeType]"
-	}
+    "protectedSettings": {
+      "AADClientSecret": "[aadClientSecret]",
+      "Passphrase": "[passphrase]"
+    },
+    "publisher": "Microsoft.Azure.Security",
+    "type": "AzureDiskEncryptionForLinux",
+    "typeHandlerVersion": "0.1",
+    "settings": {
+      "AADClientID": "[aadClientID]",
+      "DiskFormatQuery": "[diskFormatQuery]",
+      "EncryptionOperation": "[encryptionOperation]",
+      "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
+      "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
+      "KeyVaultURL": "[keyVaultURL]",
+      "SequenceVersion": "sequenceVersion]",
+      "VolumeType": "[volumeType]"
+    }
   }
 }
 ```
@@ -113,23 +113,23 @@ Using `AADClientCertificate`:
   "apiVersion": "2019-07-01",
   "location": "[location]",
   "properties": {
-	"protectedSettings": {
-	  "AADClientCertificate": "[aadClientCertificate]",
-	  "Passphrase": "[passphrase]"
-	},
-	"publisher": "Microsoft.Azure.Security",
-	"type": "AzureDiskEncryptionForLinux",
-	"typeHandlerVersion": "[extensionVersion]",
-	"settings": {
-	  "AADClientID": "[aadClientID]",
-	  "DiskFormatQuery": "[diskFormatQuery]",
-	  "EncryptionOperation": "[encryptionOperation]",
-	  "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
-	  "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
-	  "KeyVaultURL": "[keyVaultURL]",
-	  "SequenceVersion": "sequenceVersion]",
-	  "VolumeType": "[volumeType]"
-	}
+    "protectedSettings": {
+      "AADClientCertificate": "[aadClientCertificate]",
+      "Passphrase": "[passphrase]"
+    },
+    "publisher": "Microsoft.Azure.Security",
+    "type": "AzureDiskEncryptionForLinux",
+    "typeHandlerVersion": "0.1",
+    "settings": {
+      "AADClientID": "[aadClientID]",
+      "DiskFormatQuery": "[diskFormatQuery]",
+      "EncryptionOperation": "[encryptionOperation]",
+      "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
+      "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
+      "KeyVaultURL": "[keyVaultURL]",
+      "SequenceVersion": "sequenceVersion]",
+      "VolumeType": "[volumeType]"
+    }
   }
 }
 ```
@@ -142,7 +142,7 @@ Using `AADClientCertificate`:
 | apiVersion | 2019-07-01 | date |
 | publisher | Microsoft.Azure.Security | string |
 | type | AzureDiskEncryptionForLinux | string |
-| typeHandlerVersion | 0.1, 1.1 | int |
+| typeHandlerVersion | 1.1, 0.1 | int |
 | (0.1 schema) AADClientID | xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | guid | 
 | (0.1 schema) AADClientSecret | password | string |
 | (0.1 schema) AADClientCertificate | thumbprint | string |
@@ -169,7 +169,7 @@ For an example of template deployment based on schema v0.1, see the Azure Quicks
 > - Disabling encryption on Linux VMs is only supported for data volumes. It is not supported on data or OS volumes if the OS volume has been encrypted. 
 
 >[!NOTE]
-> Also if `VolumeType` parameter is set to Data or All, data disks will be encrypted only if they are properly mounted.
+> Also if `VolumeType` parameter is set to All, data disks will be encrypted only if they are properly mounted.
 
 ## Troubleshoot and support
 

articles/virtual-machines/extensions/azure-disk-enc-windows.md

@@ -30,7 +30,7 @@ For a full list of prerequisites, see [Azure Disk Encryption for Windows VMs](..
 - [Networking requirements](../windows/disk-encryption-overview.md#networking-requirements)
 - [Group Policy requirements](../windows/disk-encryption-overview.md#group-policy-requirements)
 
-## Extension schemata
+## Extension Schema
 
 There are two versions of extension schema for Azure Disk Encryption (ADE):
 - v2.2 - A newer recommended schema that does not use Azure Active Directory (AAD) properties.
@@ -49,20 +49,20 @@ The v2.2 schema is recommended for all new VMs and does not require Azure Active
   "apiVersion": "2019-07-01",
   "location": "[location]",
   "properties": {
-		"publisher": "Microsoft.Azure.Security",
-		"type": "AzureDiskEncryption",
-		"typeHandlerVersion": "[extensionVersion]",
-		"autoUpgradeMinorVersion": true,
-		"settings": {
-		  "EncryptionOperation": "[encryptionOperation]",
-		  "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
-		  "KeyVaultURL": "[keyVaultURL]",
-		  "KekVaultResourceId": "[keyVaultResourceID]",
-		  "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
-		  "KeyVaultResourceId": "[keyVaultResourceID]",
-		  "SequenceVersion": "sequenceVersion]",
-		  "VolumeType": "[volumeType]"
-		}
+        "publisher": "Microsoft.Azure.Security",
+        "type": "AzureDiskEncryption",
+        "typeHandlerVersion": "2.2",
+        "autoUpgradeMinorVersion": true,
+        "settings": {
+          "EncryptionOperation": "[encryptionOperation]",
+          "KeyEncryptionAlgorithm": "[keyEncryptionAlgorithm]",
+          "KeyVaultURL": "[keyVaultURL]",
+          "KekVaultResourceId": "[keyVaultResourceID]",
+          "KeyEncryptionKeyURL": "[keyEncryptionKeyURL]",
+          "KeyVaultResourceId": "[keyVaultResourceID]",
+          "SequenceVersion": "sequenceVersion]",
+          "VolumeType": "[volumeType]"
+        }
   }
 }
 ```
@@ -86,7 +86,7 @@ Using `aadClientSecret`:
     },    
     "publisher": "Microsoft.Azure.Security",
     "type": "AzureDiskEncryption",
-    "typeHandlerVersion": "[extensionVersion]",
+    "typeHandlerVersion": "1.1",
     "settings": {
       "AADClientID": "[aadClientID]",
       "EncryptionOperation": "[encryptionOperation]",
@@ -116,7 +116,7 @@ Using `AADClientCertificate`:
     },    
     "publisher": "Microsoft.Azure.Security",
     "type": "AzureDiskEncryption",
-    "typeHandlerVersion": "[extensionVersion]",
+    "typeHandlerVersion": "1.1",
     "settings": {
       "AADClientID": "[aadClientID]",
       "EncryptionOperation": "[encryptionOperation]",