diff --git a/docs/docsite/rst/user_guide/vault.rst b/docs/docsite/rst/user_guide/vault.rst index 8296dd1a80..7fba519707 100644 --- a/docs/docsite/rst/user_guide/vault.rst +++ b/docs/docsite/rst/user_guide/vault.rst @@ -38,9 +38,7 @@ To create a new encrypted data file, run the following command: ansible-vault create foo.yml -First you will be prompted for a password. The password used with vault currently must be the same for all files you wish to use together at the same time. - -After providing a password, the tool will launch whatever editor you have defined with $EDITOR, and defaults to vi (before 2.1 the default was vim). Once you are done with the editor session, the file will be saved as encrypted data. +First you will be prompted for a password. After providing a password, the tool will launch whatever editor you have defined with $EDITOR, and defaults to vi. Once you are done with the editor session, the file will be saved as encrypted data. The default cipher is AES (which is shared-secret based). diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index 96dc1588f0..56ea7518f2 100644 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -30,8 +30,6 @@ class VaultCLI(CLI): Because Ansible tasks, handlers, and other objects are data, these can also be encrypted with vault. If you'd like to not expose what variables you are using, you can keep an individual task file entirely encrypted. - - The password used with vault currently must be the same for all files you wish to use together at the same time. ''' VALID_ACTIONS = frozenset(("create", "decrypt", "edit", "encrypt", "encrypt_string", "rekey", "view"))