From 6fd1c0504541e47d5f83b225c1e15efc26703484 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 20 May 2014 20:51:21 -0700 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 3 +++ website/docs/source/v2/cli/box.html.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65f660cd8..f444e7089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ FEATURES: IMPROVEMENTS: + - core: A CA path can be specified in the Vagrantfile, not just + a file, when using a custom CA. [GH-3848] + - commands/box/add: `--capath` flag added for custom CA path. [GH-3848] - commands/halt: Halt in reverse order of up, like destroy. [GH-3790] - hosts/linux: Uses rdesktop to RDP into machines if available. [GH-3845] - provisioners/salt: Works on Windows guests. [GH-3825] diff --git a/website/docs/source/v2/cli/box.html.md b/website/docs/source/v2/cli/box.html.md index 82bd9197a..f071d9291 100644 --- a/website/docs/source/v2/cli/box.html.md +++ b/website/docs/source/v2/cli/box.html.md @@ -51,7 +51,7 @@ after the initial download. * `--cacert CERTFILE` - The certificate for the CA used to verify the peer. This should be used if the remote end doesn't use a standard root CA. -* `--capath CERTDIR` - The certificate directoryt for the CA used to verify the peer. +* `--capath CERTDIR` - The certificate directory for the CA used to verify the peer. This should be used if the remote end doesn't use a standard root CA. * `--cert CERTFILE` - A client certificate to use when downloading the box, if