Updated SSL to TLS

Author: msmbaldwin

articles/key-vault/key-vault-ovw-soft-delete.md

@@ -8,54 +8,38 @@ manager: rkarlin
 ms.date: 03/19/2019
 ---
 
-# Azure Key Vault soft-delete and purge protection overview
+# Azure Key Vault soft-delete overview
 
-Key Vault's soft delete feature enables the recovery of deleted vaults and vault objects. 
+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:
 
-Azure Key Vaults are tracked resources, managed by Azure Resource Manager. Azure Resource Manager also specifies a well-defined behavior for deletion, which requires that a successful DELETE operation must result in that resource not being accessible anymore. The soft-delete feature addresses the recovery of the deleted object, whether the deletion was accidental or intentional
+- Support for recoverable deletion of a key vault
+- Support for recoverable deletion of key vault objects (ex. keys, secrets, certificates)
 
-In the typical scenario, a user may have inadvertently deleted a key vault or a key vault object; if that key vault or key vault object were to be recoverable for a predetermined period, the user may undo the deletion and recover their data.
+## Supporting interfaces
 
-In a different scenario, a rogue user may attempt to delete a key vault or a key vault object, such as a key inside a vault, to cause a business disruption. Separating the deletion of the key vault or key vault object from the actual deletion of the underlying data can be used as a safety measure by, for instance, restricting permissions on data deletion to a different, trusted role. This approach effectively requires quorum for an operation which might otherwise result in an immediate data loss.
+The soft-delete feature is initially available through the [REST](/rest/api/keyvault/), [CLI](key-vault-soft-delete-cli.md), [PowerShell](key-vault-soft-delete-powershell.md) and [.NET/C#](/dotnet/api/microsoft.azure.keyvault?view=azure-dotnet) interfaces.
 
-Unless purge protection is on, a user can permanently delete a soft-deleted key vault or key vault object by performing a purge operation on it. Purge operations are not allowed when purge protection is enabled.
+## Scenarios
 
-## Soft-delete
+Azure Key Vaults are tracked resources, managed by Azure Resource Manager. Azure Resource Manager also specifies a well-defined behavior for deletion, which requires that a successful DELETE operation must result in that resource not being accessible anymore. The soft-delete feature addresses the recovery of the deleted object, whether the deletion was accidental or intentional.
 
-When soft-delete is enabled, resources marked as deleted 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.
+1. In the typical scenario, a user may have inadvertently deleted a key vault or a key vault object; if that key vault or key vault object were to be recoverable for a predetermined period, the user may undo the deletion and recover their data.
 
-When creating a new key vault through the portal, soft-delete is on by default; when creating a key vault through the [Azure CLI](key-vault-soft-delete-cli.md) or [Azure Powershell](key-vault-soft-delete-powershell.md), see [CLI: Enabling soft-delete](key-vault-soft-delete-cli.md#enabling-soft-delete) or [PowreShell: Enabling soft-delete](key-vault-soft-delete-powershell.md#enabling-soft-delete).
+2. In a different scenario, a rogue user may attempt to delete a key vault or a key vault object, such as a key inside a vault, to cause a business disruption. Separating the deletion of the key vault or key vault object from the actual deletion of the underlying data can be used as a safety measure by, for instance, restricting permissions on data deletion to a different, trusted role. This approach effectively requires quorum for an operation which might otherwise result in an immediate data loss.
 
-Once soft-delete is enabled on a key vault it cannot be disabled
+### Soft-delete behavior
 
-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.
+With this feature, the DELETE operation on a key vault or key vault object is a soft-delete, effectively holding the resources for a given retention period (90 days), while giving the appearance that the object is deleted. The service further provides a mechanism for recovering the deleted object, essentially undoing the deletion. 
 
-You cannot reuse the name of a key vault that has been soft-deleted until the retention period has passed.
+Soft-delete is now on by default for newly created key vaults. It can be disabled through the [Azure CLI](key-vault-soft-delete-cli.md) or [Azure Powershell](key-vault-soft-delete-powershell.md).
 
-### 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:
-
-- 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.
-- A key vault with the same name cannot be created in the same location; correspondingly, a key vault object cannot be created in a given vault if that key vault contains an object with the same name and which is in a deleted state 
-- Only a specifically privileged user may restore a key vault or key vault object by issuing a recover command on the corresponding proxy resource.
-    - The user, member of the custom role, who has the privilege to create a key vault under the resource group can restore the vault.
-- Only a specifically privileged user may forcibly delete a key vault or key vault object by issuing a delete command on the corresponding proxy resource.
+The default retention period is 90 days, but 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. 
 
-Unless a key vault or key vault object is recovered, at the end of the retention interval the service performs a purge of the soft-deleted key vault or key vault object and its content. Resource deletion may not be rescheduled.
-
-## Recovery
-
-Upon deleting a key vault, the service creates a proxy resource under the subscription, adding sufficient metadata for recovery. The proxy resource is a stored object, available in the same location as the deleted key vault.
-
-### Key vault object recovery
+Once soft-delete has been set on a key vault it cannot be disabled, and the retention policy interval cannot be changed. 
 
-Upon deleting a key vault object, such as a key, the service will place the object in a deleted state, making it inaccessible to any retrieval operations. While in this state, the key vault object can only be listed, recovered, or forcefully/permanently deleted. 
-
-At the same time, Key Vault will schedule the deletion of the underlying data corresponding to the deleted key vault or key vault object for execution after a predetermined retention interval. The DNS record corresponding to the vault is also retained for the duration of the retention interval.
+You cannot reuse the name of a key vault that has been soft-deleted until the retention period has passed. 
 
-## Purge protection 
+### Purge protection 
 
 Purge protection is an optional Key Vault behavior and is **not enabled by default**. It can be turned on via [CLI](key-vault-soft-delete-cli.md#enabling-purge-protection) or [Powershell](key-vault-soft-delete-powershell.md#enabling-purge-protection).
 
@@ -71,7 +55,30 @@ 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.
 
-## Billing implications
+### Key vault recovery
+
+Upon deleting a key vault, the service creates a proxy resource under the subscription, adding sufficient metadata for recovery. The proxy resource is a stored object, available in the same location as the deleted key vault. 
+
+### Key vault object recovery
+
+Upon deleting a key vault object, such as a key, the service will place the object in a deleted state, making it inaccessible to any retrieval operations. While in this state, the key vault object can only be listed, recovered, or forcefully/permanently deleted. 
+
+At the same time, Key Vault will schedule the deletion of the underlying data corresponding to the deleted key vault or key vault object for execution after a predetermined retention interval. The DNS record corresponding to the vault is also retained for the duration of the retention interval.
+
+### 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:
+
+- 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.
+- A key vault with the same name cannot be created in the same location; correspondingly, a key vault object cannot be created in a given vault if that key vault contains an object with the same name and which is in a deleted state 
+- Only a specifically privileged user may restore a key vault or key vault object by issuing a recover command on the corresponding proxy resource.
+    - The user, member of the custom role, who has the privilege to create a key vault under the resource group can restore the vault.
+- Only a specifically privileged user may forcibly delete a key vault or key vault object by issuing a delete command on the corresponding proxy resource.
+
+Unless a key vault or key vault object is recovered, at the end of the retention interval the service performs a purge of the soft-deleted key vault or key vault object and its content. Resource deletion may not be rescheduled.
+
+### Billing implications
 
 In general, when an object (a key vault or a key or a secret) is in deleted state, there are only two operations possible: 'purge' and 'recover'. All the other operations will fail. Therefore, even though the object exists, no operations can be performed and hence no usage will occur, so no bill. However there are following exceptions:
 

articles/storsimple/storsimple-8000-remote-connect.md

@@ -229,7 +229,7 @@ Perform the following procedure on the computer from which you want to make the
      `Enter-PSSession $session`
 6. You will need to wait a few minutes, and then you will be connected to your device via HTTPS over SSL. You see a message that indicates you are connected to your device.
    
-    ![PowerShell remoting using HTTPS and TLS](./media/storsimple-remote-connect/HCS_PSRemotingUsingHTTPSAndSSL.png)
+    ![PowerShell remoting using HTTPS and SSL](./media/storsimple-remote-connect/HCS_PSRemotingUsingHTTPSAndSSL.png)
 
 ## Next steps