Merge branch '2.7rc' into 2.7.x

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet/face/help.rb b/lib/puppet/face/help.rb
index 9376adf04..4a16a0d51 100644
--- a/lib/puppet/face/help.rb
+++ b/lib/puppet/face/help.rb
@@ -10,9 +10,9 @@ Puppet::Face.define(:help, '0.0.1') do
   summary "Display Puppet help."
 
   action(:help) do
-    summary "Display help about faces and their actions."
-    arguments "[<face>] [<action>]"
-    returns "Short help text for the specified face or action."
+    summary "Display help about Puppet subcommands and their actions."
+    arguments "[<subcommand>] [<action>]"
+    returns "Short help text for the specified subcommand or action."
     examples <<-'EOT'
       Get help for an action:
 
@@ -20,7 +20,7 @@ Puppet::Face.define(:help, '0.0.1') do
     EOT
 
     option "--version VERSION" do
-      summary "The version of the face for which to show help."
+      summary "The version of the subcommand for which to show help."
     end
 
     default
@@ -46,7 +46,7 @@ Puppet::Face.define(:help, '0.0.1') do
           EOT
           353.times{i,x=i.divmod(1184);a,b=x.divmod(37);print(c[a]*b)}
         end
-        raise ArgumentError, "help only takes two (optional) arguments, a face name, and an action"
+        raise ArgumentError, "Puppet help only takes two (optional) arguments: a subcommand and an action"
       end
 
       version = :current
@@ -55,7 +55,7 @@ Puppet::Face.define(:help, '0.0.1') do
           version = options[:version]
         else
           if args.length == 0 then
-            raise ArgumentError, "version only makes sense when a face is given"
+            raise ArgumentError, "Version only makes sense when a Faces subcommand is given"
           end
         end
       end