summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Jinglewski <mjinglewski@chef.io>2019-05-14 21:56:15 -0400
committerMary Jinglewski <mjinglewski@chef.io>2019-05-14 21:56:15 -0400
commit67ebf14fbcb21607ce2d107626d58b6aaefc9dff (patch)
tree0e3c0600c26fb61815318d7a481a0fd8234f20cd
parentcdcbe629ef44b8206e74db00148b04803a333892 (diff)
downloadchef-67ebf14fbcb21607ce2d107626d58b6aaefc9dff.tar.gz
Chef Infra Client 15 Release Notes Additional edits
Signed-off-by: Mary Jinglewski <mjinglewski@chef.io>
-rw-r--r--RELEASE_NOTES.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1049bc213e..3ad0247ccb 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -224,13 +224,13 @@ In order to accommodate a combined bootstrap that supports both SSH and WinRM, s
|-----:|:-----------|:------|
| --[no-]host-key-verify |--ssh-verify-host-key VALUE | See above for valid values. |
| --forward-agent | --ssh-forward-agent| |
-| --session-timeout MINUTES | --session-timeout SECONDS|New for ssh, existing for winrm. The unit has changed from MINUTES to SECONDS for consistency with other timeouts.|
+| --session-timeout MINUTES | --session-timeout SECONDS|New for ssh, existing for winrm. The unit has changed from MINUTES to SECONDS for consistency with other timeouts. |
| --ssh-password | --connection-password | |
| --ssh-port | --connection-port | `knife[:ssh_port]` config setting remains available.
| --ssh-user | --connection-user | `knife[:ssh_user]` config setting remains available.
| --ssl-peer-fingerprint | --winrm-ssl-peer-fingerprint | |
-| --prerelease |--channel CHANNEL | This now allows you to specify the channel that Chef Infra Client gets installed from. Valid values are _stable_, current, and unstable. 'current' has the same effect as using the old --prerelease. |
-| --winrm-authentication-protocol=PROTO | --winrm-auth-method=AUTH-METHOD | Valid values: plaintext, kerberos, ssl, _negotiate_|
+| --prerelease |--channel CHANNEL | This now allows you to specify the channel that Chef Infra Client gets installed from. Valid values are _stable_, _current_, and _unstable_. 'current' has the same effect as using the old --prerelease. |
+| --winrm-authentication-protocol=PROTO | --winrm-auth-method=AUTH-METHOD | Valid values: _plaintext_, _kerberos_, _ssl_, _negotiate_|
| --winrm-password| --connection-password | |
| --winrm-port| --connection-port | `knife[:winrm_port]` config setting remains available.|
| --winrm-ssl-verify-mode MODE | --winrm-no-verify-cert | Mode is not accepted. When flag is present, SSL cert will not be verified. Same as original mode of 'verify\_none'. [1] |