diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /distro/common/markdown/man1/knife.mkd | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-merging-master.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'distro/common/markdown/man1/knife.mkd')
| -rw-r--r-- | distro/common/markdown/man1/knife.mkd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/distro/common/markdown/man1/knife.mkd b/distro/common/markdown/man1/knife.mkd index 61e0c7f8b9..c3add163f9 100644 --- a/distro/common/markdown/man1/knife.mkd +++ b/distro/common/markdown/man1/knife.mkd @@ -174,7 +174,7 @@ recommended though, and git fits with a lot of the workflow paradigms. ## ENVIRONMENT * `EDITOR`: The text editor to use for editing data. The --editor option takes - precedence over this value, and the --disable-editing option supresses + precedence over this value, and the --disable-editing option suppresses data editing entirely. ## SEE ALSO |