Skip to content

DOCSP-15532 fix 4.4.5 merge conflicts with NextGen 2 #5184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2021
Merged

DOCSP-15532 fix 4.4.5 merge conflicts with NextGen 2 #5184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/core/security-client-side-encryption-key-management.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) <field-level-encryption-kms>`.

Expand Down