Typos and improved wording

When we talk about something requiring a specific version of Chef it helps to specify client vs. server.
If we run key delete the thing we're doing it deleting not destroying

6 files changed, 6 insertions, 6 deletions

diff --git a/lib/chef/knife/bootstrap/chef_vault_handler.rb b/lib/chef/knife/bootstrap/chef_vault_handler.rb
index 86eed6a8a6..9990565856 100644
--- a/lib/chef/knife/bootstrap/chef_vault_handler.rb
+++ b/lib/chef/knife/bootstrap/chef_vault_handler.rb
@@ -142,7 +142,7 @@ class Chef
         def require_chef_vault!
           @require_chef_vault ||=
             begin
-              error_message = "Knife bootstrap needs version 2.6.0 or higher of the chef-vault gem to configure chef vault items"
+              error_message = "Knife bootstrap requires version 2.6.0 or higher of the chef-vault gem to configure chef vault items"
               require "chef-vault"
               if Gem::Version.new(ChefVault::VERSION) < Gem::Version.new("2.6.0")
                 raise error_message
diff --git a/lib/chef/knife/client_create.rb b/lib/chef/knife/client_create.rb
index e296e416ce..9bae2fdafe 100644
--- a/lib/chef/knife/client_create.rb
+++ b/lib/chef/knife/client_create.rb
@@ -35,7 +35,7 @@ class Chef
       option :admin,
              :short => "-a",
              :long  => "--admin",
-             :description => "Open Source Chef 11 only. Create the client as an admin.",
+             :description => "Open Source Chef Server 11 only. Create the client as an admin.",
              :boolean => true
 
       option :validator,
diff --git a/lib/chef/knife/key_delete.rb b/lib/chef/knife/key_delete.rb
index b97d70db7a..a798e06475 100644
--- a/lib/chef/knife/key_delete.rb
+++ b/lib/chef/knife/key_delete.rb
@@ -39,7 +39,7 @@ class Chef
       end
 
       def print_destroyed
-        @ui.info("Destroyed key named #{@name} for the #{@actor_field_name} named #{@actor}")
+        @ui.info("Deleted key named #{@name} for the #{@actor_field_name} named #{@actor}")
       end
 
       def run
diff --git a/lib/chef/knife/osc_user_edit.rb b/lib/chef/knife/osc_user_edit.rb
index c73a80917c..89986c6f04 100644
--- a/lib/chef/knife/osc_user_edit.rb
+++ b/lib/chef/knife/osc_user_edit.rb
@@ -50,7 +50,7 @@ class Chef
           user.update
           ui.msg("Saved #{user}.")
         else
-          ui.msg("User unchaged, not saving.")
+          ui.msg("User unchanged, not saving.")
         end
       end
     end
diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb
index 549b337ddf..76b83d2212 100644
--- a/lib/chef/knife/raw.rb
+++ b/lib/chef/knife/raw.rb
@@ -59,7 +59,7 @@ class Chef
           exit(1)
         elsif name_args.length > 1
           show_usage
-          ui.fatal("Only one path accepted for knife raw")
+          ui.fatal("You must specify only a single path")
           exit(1)
         end
 
diff --git a/lib/chef/knife/search.rb b/lib/chef/knife/search.rb
index 520c9273af..38d1ab3f42 100644
--- a/lib/chef/knife/search.rb
+++ b/lib/chef/knife/search.rb
@@ -74,7 +74,7 @@ class Chef
       option :filter_result,
         :short => "-f FILTER",
         :long => "--filter-result FILTER",
-        :description => "Only bring back specific attributes of the matching objects; for example: \"ServerName=name, Kernel=kernel.version\""
+        :description => "Only return specific attributes of the matching objects; for example: \"ServerName=name, Kernel=kernel.version\""
 
       def run
         read_cli_args