Merge pull request #111786 from msmbaldwin/akv

Fixed redirect

Author: Jak-MS

.openpublishing.redirection.json

@@ -3639,7 +3639,7 @@
     },
    {
       "source_path": "articles/key-vault/about-keys-secrets-and-certificates.md",
-      "redirect_url": "/azure/key-vault/index.yml",
+      "redirect_url": "/azure/key-vault",
       "redirect_document_id": false
     },
    {

articles/key-vault/general/best-practices.md

@@ -40,4 +40,4 @@ Make sure you take regular back ups of your [vault](https://blogs.technet.micros
 ## Turn on recovery options
 
 1. Turn on [Soft Delete](overview-soft-delete.md)).
-2. Turn on purge protection if you want to guard against force deletion of the secret / vault even after soft delete is turned on.
+2. Turn on purge protection if you want to guard against force deletion of the secret / vault even after soft-delete is turned on.

articles/key-vault/general/customer-data.md

@@ -36,7 +36,7 @@ The following information identifies customer data within Azure Key Vault:
 
 The same REST APIs, Portal experience, and SDKs used to create vaults, keys, secrets, certificates, and managed storage accounts, are also able to update and delete these objects.
 
-Soft delete allows you to recover deleted data for 90 days after deletion. When using soft delete, the data may be permanently deleted prior to the 90 days retention period expires by performing a purge operation. If the vault or subscription has been configured to block purge operations, it is not possible to permanently delete data until the scheduled retention period has passed.
+Soft-delete allows you to recover deleted data for 90 days after deletion. When using soft-delete, the data may be permanently deleted prior to the 90 days retention period expires by performing a purge operation. If the vault or subscription has been configured to block purge operations, it is not possible to permanently delete data until the scheduled retention period has passed.
 
 ## Exporting customer data
 

articles/key-vault/general/overview-soft-delete.md

@@ -1,5 +1,5 @@
 ---
-title: Azure Key Vault soft delete | Microsoft Docs
+title: Azure Key Vault soft-delete | Microsoft Docs
 description: Soft-delete in Azure Key Vault allows you to recover deleted key vaults and key vault objects, such as keys, secrets, and certificates.
 ms.service: key-vault
 ms.subservice: general
@@ -12,7 +12,7 @@ ms.date: 03/19/2019
 
 # Azure Key Vault soft-delete overview
 
-Key Vault's soft delete feature allows recovery of the deleted vaults and vault objects, known as soft-delete. Specifically, we address the following scenarios:
+Key Vault's soft-delete feature allows recovery of the deleted vaults and vault objects, known as soft-delete. Specifically, we address the following scenarios:
 
 - Support for recoverable deletion of a key vault
 - Support for recoverable deletion of key vault objects (ex. keys, secrets, certificates)
@@ -33,15 +33,15 @@ Azure Key Vaults are tracked resources, managed by Azure Resource Manager. Azure
 
 When soft-delete is enabled, resources marked as deleted resources are retained for a specified period (90 days by default). The service further provides a mechanism for recovering the deleted object, essentially undoing the deletion.
 
-When creating a new key vault, soft-delete is on by default. You can create a key vault without soft-delete through the [Azure CLI](soft-delete-cli.md) or [Azure Powershell](soft-delete-powershell.md). Once soft-delete is enabled on a key vault it cannot be disabled
+When creating a new key vault, soft-delete is on by default. You can create a key vault without soft-delete through the [Azure CLI](soft-delete-cli.md) or [Azure PowerShell](soft-delete-powershell.md). Once soft-delete is enabled on a key vault it cannot be disabled
 
 The default retention period is 90 days but, during key vault creation, it is possible to set the retention policy interval to a value from 7 to 90 days through the Azure portal. The purge protection retention policy uses the same interval. Once set, the retention policy interval cannot be changed.
 
 You cannot reuse the name of a key vault that has been soft-deleted until the retention period has passed.
 
 ### Purge protection 
 
-Purge protection is an optional Key Vault behavior and is **not enabled by default**. It can be turned on via [CLI](soft-delete-cli.md#enabling-purge-protection) or [Powershell](soft-delete-powershell.md#enabling-purge-protection).
+Purge protection is an optional Key Vault behavior and is **not enabled by default**. It can be turned on via [CLI](soft-delete-cli.md#enabling-purge-protection) or [PowerShell](soft-delete-powershell.md#enabling-purge-protection).
 
 When purge protection is on, a vault or an object in the deleted state cannot be purged until the retention period has passed. Soft-deleted vaults and objects can still be recovered, ensuring that the retention policy will be followed. 
 
@@ -53,7 +53,7 @@ Permanently deleting, purging, a key vault is possible via a POST operation on t
 
 Exceptions are:
 - When the Azure subscription has been marked as *undeletable*. In this case, only the service may then perform the actual deletion, and does so as a scheduled process. 
-- When the --enable-purge-protection flag is enabled on the vault itself. In this case, Key Vault will wait for 90 days from when the original secret object was marked for deletion to permanently delete the object.
+- When the `--enable-purge-protection flag` is enabled on the vault itself. In this case, Key Vault will wait for 90 days from when the original secret object was marked for deletion to permanently delete the object.
 
 ### Key vault recovery
 
@@ -67,7 +67,7 @@ At the same time, Key Vault will schedule the deletion of the underlying data co
 
 ### Soft-delete retention period
 
-Soft deleted resources are retained for a set period of time, 90 days. During the soft-delete retention interval, the following apply:
+Soft-deleted resources are retained for a set period of time, 90 days. During the soft-delete retention interval, the following apply:
 
 - You may list all of the key vaults and key vault objects in the soft-delete state for your subscription as well as access deletion and recovery information about them.
     - Only users with special permissions can list deleted vaults. We recommend that our users create a custom role with these special permissions for handling deleted vaults.

articles/key-vault/general/security-baseline.md

@@ -1000,7 +1000,7 @@ https://docs.microsoft.com/azure/security-center/security-center-remediate-recom
 
 ### 7.11: Manage Azure secrets securely
 
-**Guidance**: Use Managed Service Identity in conjunction with Azure Key Vault to simplify and secure secret management for your cloud applications. Ensure that Azure Key Vault soft delete is enabled.
+**Guidance**: Use Managed Service Identity in conjunction with Azure Key Vault to simplify and secure secret management for your cloud applications. Ensure that Azure Key Vault soft-delete is enabled.
 
 How to integrate with Azure Managed Identities:
 
@@ -1176,7 +1176,7 @@ How to restore Key Vault Secrets: https://docs.microsoft.com/powershell/module/a
 
 ### 9.4: Ensure protection of backups and customer managed keys
 
-**Guidance**: Ensure that soft delete is enabled for Azure Key Vault. Soft delete allows recovery of deleted key vaults and vault objects such as keys, secrets, and certificates. 
+**Guidance**: Ensure that soft-delete is enabled for Azure Key Vault. Soft-delete allows recovery of deleted key vaults and vault objects such as keys, secrets, and certificates. 
 
 How to use Azure Key Vault's Soft Delete: 
 

articles/key-vault/general/security-recommendations.md

@@ -26,7 +26,7 @@ Some of the recommendations included in this article can be automatically monito
 
 | Recommendation | Comments | Security Center |
 |-|----|--|
-|Enable soft delete | [Soft delete](overview-soft-delete.md)) allows you to recover deleted vaults and vault objects |  - |
+|Enable soft-delete | [Soft-delete](overview-soft-delete.md)) allows you to recover deleted vaults and vault objects |  - |
 | Limit access to vault data  | Follow the principle of least privilege and limit which members of your organization have access to vault data |  - |
 
 ## Identity and access management

articles/key-vault/general/soft-delete-cli.md

@@ -1,5 +1,5 @@
 ---
-title: Azure Key Vault - How to use soft delete with CLI
+title: Azure Key Vault - How to use soft-delete with CLI
 description: Use case examples of soft-delete with CLI code snips
 services: key-vault
 author: msmbaldwin
@@ -13,7 +13,7 @@ ms.author: mbaldwin
 ---
 # How to use Key Vault soft-delete with CLI
 
-Azure Key Vault's soft delete feature allows recovery of deleted vaults and vault objects. Specifically, soft-delete addresses the following scenarios:
+Azure Key Vault's soft-delete feature allows recovery of deleted vaults and vault objects. Specifically, soft-delete addresses the following scenarios:
 
 - Support for recoverable deletion of a key vault
 - Support for recoverable deletion of key vault objects; keys, secrets, and, certificates
@@ -41,7 +41,7 @@ For more information on permissions and access control, see [Secure your key vau
 You enable "soft-delete" to allow recovery of a deleted key vault, or objects stored in a key vault.
 
 > [!IMPORTANT]
-> Enabling 'soft delete' on a key vault is an irreversible action. Once the soft-delete property has been set to "true", it cannot be changed or removed.  
+> Enabling 'soft-delete' on a key vault is an irreversible action. Once the soft-delete property has been set to "true", it cannot be changed or removed.  
 
 ### Existing key vault
 
@@ -226,13 +226,13 @@ When purge protection is turned on, a vault or an object in deleted state cannot
 
 You can enable purge protection only if soft-delete is also enabled. 
 
-To turn on both soft delete and purge protection when creating a vault, use the [az keyvault create](/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-create) command:
+To turn on both soft-delete and purge protection when creating a vault, use the [az keyvault create](/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-create) command:
 
 ```azurecli
 az keyvault create --name ContosoVault --resource-group ContosoRG --location westus --enable-soft-delete true --enable-purge-protection true
 ```
 
-To add purge protection to an existing vault (that already has soft delete enabled), use the [az keyvault update](/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-update) command:
+To add purge protection to an existing vault (that already has soft-delete enabled), use the [az keyvault update](/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-update) command:
 
 ```azurecli
 az keyvault update --name ContosoVault --resource-group ContosoRG --enable-purge-protection true

articles/key-vault/general/soft-delete-powershell.md

@@ -14,7 +14,7 @@ ms.author: mbaldwin
 
 # How to use Key Vault soft-delete with PowerShell
 
-Azure Key Vault's soft delete feature allows recovery of deleted vaults and vault objects. Specifically, soft-delete addresses the following scenarios:
+Azure Key Vault's soft-delete feature allows recovery of deleted vaults and vault objects. Specifically, soft-delete addresses the following scenarios:
 
 - Support for recoverable deletion of a key vault
 - Support for recoverable deletion of key vault objects; keys, secrets, and, certificates
@@ -50,7 +50,7 @@ For more information on permissions and access control, see [Secure your key vau
 You enable "soft-delete" to allow recovery of a deleted key vault, or objects stored in a key vault.
 
 > [!IMPORTANT]
-> Enabling 'soft delete' on a key vault is an irreversible action. Once the soft-delete property has been set to "true", it cannot be changed or removed.  
+> Enabling 'soft-delete' on a key vault is an irreversible action. Once the soft-delete property has been set to "true", it cannot be changed or removed.  
 
 ### Existing key vault
 
@@ -266,13 +266,13 @@ When purge protection is turned on, a vault or an object in deleted state cannot
 
 You can enable purge protection only if soft-delete is also enabled. 
 
-To turn on both soft delete and purge protection when creating a vault, use the [New-AzKeyVault](/powershell/module/az.keyvault/new-azkeyvault?view=azps-1.5.0) cmdlet:
+To turn on both soft-delete and purge protection when creating a vault, use the [New-AzKeyVault](/powershell/module/az.keyvault/new-azkeyvault?view=azps-1.5.0) cmdlet:
 
 ```powershell
 New-AzKeyVault -Name ContosoVault -ResourceGroupName ContosoRG -Location westus -EnableSoftDelete -EnablePurgeProtection
 ```
 
-To add purge protection to an existing vault (that already has soft delete enabled), use the [Get-AzKeyVault](/powershell/module/az.keyvault/Get-AzKeyVault?view=azps-1.5.0), [Get-AzResource](/powershell/module/az.resources/get-azresource?view=azps-1.5.0), and [Set-AzResource](/powershell/module/az.resources/set-azresource?view=azps-1.5.0) cmdlets:
+To add purge protection to an existing vault (that already has soft-delete enabled), use the [Get-AzKeyVault](/powershell/module/az.keyvault/Get-AzKeyVault?view=azps-1.5.0), [Get-AzResource](/powershell/module/az.resources/get-azresource?view=azps-1.5.0), and [Set-AzResource](/powershell/module/az.resources/set-azresource?view=azps-1.5.0) cmdlets:
 
 ```
 ($resource = Get-AzResource -ResourceId (Get-AzKeyVault -VaultName "ContosoVault").ResourceId).Properties | Add-Member -MemberType "NoteProperty" -Name "enablePurgeProtection" -Value "true"