Merge branch '2.7.x'

* 2.7.x: (40 commits)
  (#7746) Fix bootstrap issues from #7717 fix.
  (#7683) Use ronn, when available, to render the output.
  (#7683) Add a 'man' face and subcommand to Puppet.
  maint: remove obsolete work-around code from help face.
  (#7699) Don't duplicate inherited action names on faces.
  (#7177) Deprecate implicit 'puppet apply' for 2.7.0
  (#7717) Layout cleanup for subcommand extraction.
  #7211: Test unknown options don't shadow unknown actions.
  #7211: nasty logic error with global Face options taking arguments.
  #7211: more helpful error messages in various cases.
  maint: Fix order dependent test failure
  (#5966) Add support for hostname regular expressions in auth.conf
  (#7708) Delete extended documentation from configuration reference
  (#7707) Document signals in puppet agent and puppet master help
  add puppet master polling step for ticket 7117
  (#5318) Always notice changes to manifests when compiling.
  (#5318) Always notice changes to manifests when compiling.
  (#7557) Remove Faces Application
  maint: Fix order dependent spec failure for face indirection
  (#7690) Don't blow up when listing terminuses available for faces
  ...

Conflicts (resolved manually):
	acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

1 files changed, 19 insertions, 12 deletions

diff --git a/lib/puppet/face/plugin.rb b/lib/puppet/face/plugin.rb
index 969d42389..541468d39 100644
--- a/lib/puppet/face/plugin.rb
+++ b/lib/puppet/face/plugin.rb
@@ -3,29 +3,36 @@ Puppet::Face.define(:plugin, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "Interact with the Puppet plugin system"
-  description <<-EOT
+  summary "Interact with the Puppet plugin system."
+  description <<-'EOT'
     This face provides network access to the puppet master's store of
-    plugins. It is intended for use in other faces, rather than for direct
-    command line access.
+    plugins.
   EOT
-  notes <<-EOT
+  notes <<-'EOT'
     The puppet master can serve Ruby code collected from the lib directories
     of its modules. These plugins can be used on agent nodes to extend
     Facter and implement custom types and providers.
   EOT
 
   action :download do
-    summary "Download plugins from the configured master"
-    returns <<-EOT
-      An array containing the files actually downloaded. If all files
-      were in sync, this array will be empty.
+    summary "Download plugins from the puppet master."
+    description <<-'EOT'
+      Downloads plugins from the configured puppet master. Any plugins
+      downloaded in this way will be used in all subsequent Puppet activity.
     EOT
-    notes "This action modifies files on disk without returning any data."
-    examples <<-EOT
+    returns <<-'EOT'
+      A display-formatted list of the files downloaded. If all plugin
+      files were in sync, this list will be empty.
+    EOT
+    notes "This action modifies files on disk."
+    examples <<-'EOT'
       Retrieve plugins from the puppet master:
 
-          Puppet::Face[:plugin, '0.0.1'].download
+      $ puppet plugin download
+
+      Retrieve plugins from the puppet master (API example):
+
+      $ Puppet::Face[:plugin, '0.0.1'].download
     EOT
 
     when_invoked do |options|