Merge pull request #7869 from chef/knife_descriptions

Make knife command banners consistent

14 files changed, 14 insertions, 14 deletions

diff --git a/lib/chef/knife/config_list_profiles.rb b/lib/chef/knife/config_list_profiles.rb
index 8e46aef14b..b767e9dd42 100644
--- a/lib/chef/knife/config_list_profiles.rb
+++ b/lib/chef/knife/config_list_profiles.rb
@@ -21,7 +21,7 @@ require "chef/workstation_config_loader"
 class Chef
   class Knife
     class ConfigListProfiles < Knife
-      banner "knife config list-profiles"
+      banner "knife config list-profiles (options)"
 
       option :ignore_knife_rb,
              short: "-i",
diff --git a/lib/chef/knife/list.rb b/lib/chef/knife/list.rb
index 9452478ddb..5d95790a26 100644
--- a/lib/chef/knife/list.rb
+++ b/lib/chef/knife/list.rb
@@ -19,7 +19,7 @@ require "chef/chef_fs/knife"
 class Chef
   class Knife
     class List < Chef::ChefFS::Knife
-      banner "knife list [-dfR1p] [PATTERN1 ... PATTERNn]"
+      banner "knife list [-dfR1p] [PATTERN1 ... PATTERNn] (options)"
 
       category "path-based"
 
diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb
index 5658420c3e..a544dcbfdd 100644
--- a/lib/chef/knife/raw.rb
+++ b/lib/chef/knife/raw.rb
@@ -20,7 +20,7 @@ require "chef/http"
 class Chef
   class Knife
     class Raw < Chef::Knife
-      banner "knife raw REQUEST_PATH"
+      banner "knife raw REQUEST_PATH (options)"
 
       deps do
         require "chef/json_compat"
diff --git a/lib/chef/knife/role_env_run_list_clear.rb b/lib/chef/knife/role_env_run_list_clear.rb
index d9dc96c87d..ecc41347eb 100644
--- a/lib/chef/knife/role_env_run_list_clear.rb
+++ b/lib/chef/knife/role_env_run_list_clear.rb
@@ -28,7 +28,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role env_run_list clear [ROLE] [ENVIRONMENT]"
+      banner "knife role env_run_list clear [ROLE] [ENVIRONMENT] (options)"
       def clear_env_run_list(role, environment)
         nlist = []
         role.env_run_lists_add(environment => nlist)
diff --git a/lib/chef/knife/role_env_run_list_remove.rb b/lib/chef/knife/role_env_run_list_remove.rb
index f31f40b58a..9b627a00fc 100644
--- a/lib/chef/knife/role_env_run_list_remove.rb
+++ b/lib/chef/knife/role_env_run_list_remove.rb
@@ -27,7 +27,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES]"
+      banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES] (options)"
 
       def remove_from_env_run_list(role, environment, item_to_remove)
         nlist = []
diff --git a/lib/chef/knife/role_env_run_list_replace.rb b/lib/chef/knife/role_env_run_list_replace.rb
index e4b6179b65..f4e4dfec66 100644
--- a/lib/chef/knife/role_env_run_list_replace.rb
+++ b/lib/chef/knife/role_env_run_list_replace.rb
@@ -28,7 +28,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] "
+      banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] (options)"
 
       def replace_in_env_run_list(role, environment, old_entry, new_entry)
         nlist = []
diff --git a/lib/chef/knife/role_env_run_list_set.rb b/lib/chef/knife/role_env_run_list_set.rb
index f53616e151..fd8afd6652 100644
--- a/lib/chef/knife/role_env_run_list_set.rb
+++ b/lib/chef/knife/role_env_run_list_set.rb
@@ -28,7 +28,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES]"
+      banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES] (optionss)"
 
       # Clears out any existing env_run_list_items and sets them to the
       # specified entries
diff --git a/lib/chef/knife/role_run_list_clear.rb b/lib/chef/knife/role_run_list_clear.rb
index 81678d39ef..a3fde43875 100644
--- a/lib/chef/knife/role_run_list_clear.rb
+++ b/lib/chef/knife/role_run_list_clear.rb
@@ -28,7 +28,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role run_list clear [ROLE]"
+      banner "knife role run_list clear [ROLE] (options)"
       def clear_env_run_list(role, environment)
         nlist = []
         role.env_run_lists_add(environment => nlist)
diff --git a/lib/chef/knife/role_run_list_remove.rb b/lib/chef/knife/role_run_list_remove.rb
index 8aaf408a61..39e935605e 100644
--- a/lib/chef/knife/role_run_list_remove.rb
+++ b/lib/chef/knife/role_run_list_remove.rb
@@ -26,7 +26,7 @@ class Chef
         require "chef/role"
       end
 
-      banner "knife role run_list remove [ROLE] [ENTRY]"
+      banner "knife role run_list remove [ROLE] [ENTRY] (options)"
 
       def remove_from_env_run_list(role, environment, item_to_remove)
         nlist = []
diff --git a/lib/chef/knife/role_run_list_replace.rb b/lib/chef/knife/role_run_list_replace.rb
index 64b5790d9d..bb93661548 100644
--- a/lib/chef/knife/role_run_list_replace.rb
+++ b/lib/chef/knife/role_run_list_replace.rb
@@ -28,7 +28,7 @@ class Chef
         require "chef/json_compat"
       end
 
-      banner "knife role run_list replace [ROLE] [OLD_ENTRY] [NEW_ENTRY] "
+      banner "knife role run_list replace [ROLE] [OLD_ENTRY] [NEW_ENTRY] (options)"
 
       def replace_in_env_run_list(role, environment, old_entry, new_entry)
         nlist = []
diff --git a/lib/chef/knife/role_run_list_set.rb b/lib/chef/knife/role_run_list_set.rb
index 87ba3efb1f..d424bad7e6 100644
--- a/lib/chef/knife/role_run_list_set.rb
+++ b/lib/chef/knife/role_run_list_set.rb
@@ -27,7 +27,7 @@ class Chef
         require "chef/role"
       end
 
-      banner "knife role run_list set [ROLE] [ENTRIES]"
+      banner "knife role run_list set [ROLE] [ENTRIES] (options)"
 
       # Clears out any existing env_run_list_items and sets them to the
       # specified entries
diff --git a/lib/chef/knife/show.rb b/lib/chef/knife/show.rb
index e31a2c1b0c..10a1d521e3 100644
--- a/lib/chef/knife/show.rb
+++ b/lib/chef/knife/show.rb
@@ -19,7 +19,7 @@ require "chef/chef_fs/knife"
 class Chef
   class Knife
     class Show < Chef::ChefFS::Knife
-      banner "knife show [PATTERN1 ... PATTERNn]"
+      banner "knife show [PATTERN1 ... PATTERNn] (options)"
 
       category "path-based"
 
diff --git a/lib/chef/knife/upload.rb b/lib/chef/knife/upload.rb
index 9b651ae867..25dcd81004 100644
--- a/lib/chef/knife/upload.rb
+++ b/lib/chef/knife/upload.rb
@@ -19,7 +19,7 @@ require "chef/chef_fs/knife"
 class Chef
   class Knife
     class Upload < Chef::ChefFS::Knife
-      banner "knife upload PATTERNS"
+      banner "knife upload PATTERNS (options)"
 
       category "path-based"
 
diff --git a/lib/chef/knife/xargs.rb b/lib/chef/knife/xargs.rb
index a5ced3eea8..ae5851f465 100644
--- a/lib/chef/knife/xargs.rb
+++ b/lib/chef/knife/xargs.rb
@@ -19,7 +19,7 @@ require "chef/chef_fs/knife"
 class Chef
   class Knife
     class Xargs < Chef::ChefFS::Knife
-      banner "knife xargs [COMMAND]"
+      banner "knife xargs [COMMAND] (options)"
 
       category "path-based"