From 0c5f4bc15b5be5cb28bab5d2a78df0e3893faa8b Mon Sep 17 00:00:00 2001 From: Andrew Feierabend Date: Thu, 8 Apr 2021 13:28:30 -0400 Subject: [PATCH] DOCSP-15532 fix 4.4.5 merge conflicts with NextGen --- source/core/security-client-side-encryption-key-management.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/security-client-side-encryption-key-management.txt b/source/core/security-client-side-encryption-key-management.txt index a420cbe37a0..e2819b48edf 100644 --- a/source/core/security-client-side-encryption-key-management.txt +++ b/source/core/security-client-side-encryption-key-management.txt @@ -201,7 +201,7 @@ Encryption Key Vault -------------------- The key vault is a collection that stores data encryption keys for use -with client-side field level encryption. data encryption keys are +with client-side field level encryption. Data encryption keys are encrypted using a Customer Master Key (CMK) managed through a supported :ref:`Key Management System (KMS) `.