diff --git a/CHANGELOG.md b/CHANGELOG.md index 0be13acbcd..b91e433e08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -706,7 +706,7 @@ DEPRECATIONS/CHANGES: * SSH role list changes: When listing roles from the `ssh` backend via the API, the response data will additionally return a `key_info` map that will contain a map of each key with a corresponding object containing the `key_type`. - * More granularity in audit logs: Audit request and response entires are still + * More granularity in audit logs: Audit request and response entries are still in RFC3339 format but now have a granularity of nanoseconds. * High availability related values have been moved out of the `storage` and `ha_storage` stanzas, and into the top-level configuration. `redirect_addr` diff --git a/command/operator_init.go b/command/operator_init.go index fb49607117..4503d2eae9 100644 --- a/command/operator_init.go +++ b/command/operator_init.go @@ -125,7 +125,7 @@ func (c *OperatorInitCommand) Flags() *FlagSets { "public GPG keys OR a comma-separated list of Keybase usernames using " + "the format \"keybase:\". When supplied, the generated " + "unseal keys will be encrypted and base64-encoded in the order " + - "specified in this list. The number of entires must match -key-shares, " + + "specified in this list. The number of entries must match -key-shares, " + "unless -store-shares are used.", }) diff --git a/website/source/docs/commands/operator/init.html.md b/website/source/docs/commands/operator/init.html.md index 6f37d80928..20ed3df2c5 100644 --- a/website/source/docs/commands/operator/init.html.md +++ b/website/source/docs/commands/operator/init.html.md @@ -74,7 +74,7 @@ flags](/docs/commands/index.html) included on all commands. containing public GPG keys OR a comma-separated list of Keybase usernames using the format "keybase:". When supplied, the generated unseal keys will be encrypted and base64-encoded in the order specified in this list. - The number of entires must match -key-shares, unless -store-shares are used. + The number of entries must match -key-shares, unless -store-shares are used. - `-root-token-pgp-key` `(string: "")` - Path to a file on disk containing a binary or base64-encoded public GPG key. This can also be specified as a diff --git a/website/source/guides/upgrading/upgrade-to-0.9.0.html.md b/website/source/guides/upgrading/upgrade-to-0.9.0.html.md index 299fd9d906..6e638b6ba3 100644 --- a/website/source/guides/upgrading/upgrade-to-0.9.0.html.md +++ b/website/source/guides/upgrading/upgrade-to-0.9.0.html.md @@ -115,7 +115,7 @@ corresponding object containing the `key_type`. ### More granularity in audit logs (In 0.9) -Audit request and response entires are still in RFC3339 format but now have a +Audit request and response entries are still in RFC3339 format but now have a granularity of nanoseconds. [generate-root]: https://www.vaultproject.io/api/secret/pki/index.html#generate-root