diff options
| -rw-r--r-- | distro/common/markdown/man1/knife.mkd | 2 | ||||
| -rw-r--r-- | lib/chef/application/knife.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/distro/common/markdown/man1/knife.mkd b/distro/common/markdown/man1/knife.mkd index 8c97cc97e1..61e0c7f8b9 100644 --- a/distro/common/markdown/man1/knife.mkd +++ b/distro/common/markdown/man1/knife.mkd @@ -41,7 +41,7 @@ documentation using `knife help TOPIC`. * `-c`, `--config` CONFIG: The configuration file to use * `-E`, `--environment ENVIRONMENT`: - Set the Chef environment + Set the Chef environment (except for in searches, where this will be flagrantly ignored) * `-e`, `--editor` EDITOR: Set the editor to use for interactive commands * `-F`, `--format` FORMAT: diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb index 5f2456311c..1eac4b55f3 100644 --- a/lib/chef/application/knife.rb +++ b/lib/chef/application/knife.rb @@ -51,7 +51,7 @@ class Chef::Application::Knife < Chef::Application option :environment, :short => "-E ENVIRONMENT", :long => "--environment ENVIRONMENT", - :description => "Set the Chef environment" + :description => "Set the Chef environment (except for in searches, where this will be flagrantly ignored)" option :editor, :short => "-e EDITOR", |