From bbf0a025c075124ffe2fc2838c27ace22d1ddb89 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 11:32:40 -0700
Subject: maint: fix misnamed acceptance test for #7139

Just s/\.rm/\.rb/ on the filename.
---
 .../tests/ticket_7139_puppet_resource_file_qualified_paths.rb | 11 +++++++++++
 .../tests/ticket_7139_puppet_resource_file_qualified_paths.rm | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
 delete mode 100644 acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm

diff --git a/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb b/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
new file mode 100644
index 000000000..f773ba17c
--- /dev/null
+++ b/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
@@ -0,0 +1,11 @@
+test_name "#7139: Puppet resource file failes on path with leading '/'"
+
+step "Agents: create valid, invalid formatted manifests"
+create_remote_file(agents, '/tmp/ticket-7139', %w{foo bar contents} )
+
+step "Run puppet file resource on /tmp/ticket-7139"
+agents.each do |host|
+  on(host, "puppet resource file /tmp/ticket-7139") do
+    assert_match(/file \{ \'\/tmp\/ticket-7139\':/, stdout, "puppet resource file failed on #{host}")
+  end
+end
diff --git a/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm b/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm
deleted file mode 100644
index f773ba17c..000000000
--- a/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm
+++ /dev/null
@@ -1,11 +0,0 @@
-test_name "#7139: Puppet resource file failes on path with leading '/'"
-
-step "Agents: create valid, invalid formatted manifests"
-create_remote_file(agents, '/tmp/ticket-7139', %w{foo bar contents} )
-
-step "Run puppet file resource on /tmp/ticket-7139"
-agents.each do |host|
-  on(host, "puppet resource file /tmp/ticket-7139") do
-    assert_match(/file \{ \'\/tmp\/ticket-7139\':/, stdout, "puppet resource file failed on #{host}")
-  end
-end
-- 
cgit 


From 5587b94ce1bcb4e86df1160e5238b535e10028da Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 11:33:17 -0700
Subject: maint: remove an unhelpful pending test.

This has been pending approximately forever, and adds little value; removing
the warning reduces noise without value.
---
 spec/unit/transaction_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/unit/transaction_spec.rb b/spec/unit/transaction_spec.rb
index d7788c06c..4bf615803 100755
--- a/spec/unit/transaction_spec.rb
+++ b/spec/unit/transaction_spec.rb
@@ -94,8 +94,6 @@ describe Puppet::Transaction do
     @transaction.report.should == report
   end
 
-  it "should consider a resource to have failed dependencies if any of its dependencies are failed"
-
   describe "when initializing" do
     it "should create an event manager" do
       @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new)
-- 
cgit 


From 5a9998e41bc442ca66ca2ff151750355d2ef6d6f Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Wed, 1 Jun 2011 18:07:40 -0700
Subject: (#7773, 7776, 7764) Several help template tweaks

Per UX review of help output, this commit makes several changes to templates and
shared help text:

* Change "unknown" to "undocumented"
* Remove copyright from short help
* Point readers to the man pages (issue 7773)
* Remove examples from short help (issue 7776)
* Remove summary from short help and make it a fallback for description
* Edit common option summaries to fit on a single 80-col line
---
 lib/puppet/face/help/action.erb | 16 ++++------------
 lib/puppet/face/help/face.erb   | 17 +++++------------
 lib/puppet/face/help/man.erb    | 14 +++++++++-----
 lib/puppet/indirector/face.rb   |  2 +-
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/lib/puppet/face/help/action.erb b/lib/puppet/face/help/action.erb
index c788f34fd..94b935fed 100644
--- a/lib/puppet/face/help/action.erb
+++ b/lib/puppet/face/help/action.erb
@@ -1,21 +1,16 @@
-<%= action.summary || face.summary || "unknown face..." %>
-
 <% if action.synopsis -%>
 USAGE: <%= action.synopsis %>
 
 <% end -%>
-<% if action.short_description -%>
-<%= action.short_description.strip %>
+<%= action.short_description || action.summary || face.summary || "undocumented face" %>
 
-<% end -%>
 <% if action.returns -%>
 RETURNS: <%= action.returns.strip %>
 
 <% end -%>
 OPTIONS:
 <%# Remove these options once we can introspect them normally. -%>
-  --mode MODE                    - The run mode to use (`user`, `agent`, or
-                                   `master`).
+  --mode MODE                    - The run mode to use (user, agent, or master).
   --render-as FORMAT             - The rendering format to use.
   --verbose                      - Whether to log verbosely.
   --debug                        - Whether to log debug information.
@@ -26,7 +21,7 @@ OPTIONS:
         option = action.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>
-unknown option...
+undocumented option
 <%     elsif option.summary.length <= summaryroom -%>
 <%= option.summary %>
 <%
@@ -51,7 +46,4 @@ unknown option...
       end -%>
 <% end -%>
 
-<% if action.examples -%>
-EXAMPLES:
-<%= action.examples %>
-<% end -%>
+See 'puppet man <%= face.name %>' or 'man puppet-<%= face.name %>' for full help.
diff --git a/lib/puppet/face/help/face.erb b/lib/puppet/face/help/face.erb
index 2a0f0181c..870cc547f 100644
--- a/lib/puppet/face/help/face.erb
+++ b/lib/puppet/face/help/face.erb
@@ -1,17 +1,12 @@
-<%= face.summary || "unknown face..." %>
-
 <% if face.synopsis -%>
 USAGE: <%= face.synopsis %>
 
 <% end -%>
-<% if face.short_description -%>
-<%= face.short_description %>
+<%= (face.short_description || face.summary || "undocumented subcommand").strip %>
 
-<% end -%>
 OPTIONS:
 <%# Remove these options once we can introspect them normally. -%>
-  --mode MODE                    - The run mode to use (`user`, `agent`, or
-                                   `master`).
+  --mode MODE                    - The run mode to use (user, agent, or master).
   --render-as FORMAT             - The rendering format to use.
   --verbose                      - Whether to log verbosely.
   --debug                        - Whether to log debug information.
@@ -22,7 +17,7 @@ OPTIONS:
         option = face.get_option name -%>
 <%= "  " + option.optparse.join(" | ")[0,(optionroom - 1)].ljust(optionroom) + ' - ' -%>
 <%     if !(option.summary) -%>
-unknown option...
+undocumented option
 <%     elsif option.summary.length <= summaryroom -%>
 <%= option.summary %>
 <%
@@ -54,7 +49,7 @@ ACTIONS:
      action = face.get_action(actionname) -%>
   <%= action.name.to_s.ljust(padding) + '  ' -%>
 <% if !(action.summary) -%>
-unknown action...
+undocumented action
 <% elsif action.summary.length <= summaryroom -%>
 <%= action.summary %>
 <% else
@@ -86,6 +81,4 @@ AUTHOR
 <%= face.authors.join("\n").gsub(/^/, ' * ') %>
 
 <% end -%>
-COPYRIGHT AND LICENSE:
-<%= face.copyright.gsub(/^/, '  ') %>
-<%= face.license.gsub(/^/, '  ')   %>
+See 'puppet man <%= face.name %>' or 'man puppet-<%= face.name %>' for full help.
diff --git a/lib/puppet/face/help/man.erb b/lib/puppet/face/help/man.erb
index 6f21fe413..0122d974c 100644
--- a/lib/puppet/face/help/man.erb
+++ b/lib/puppet/face/help/man.erb
@@ -1,4 +1,4 @@
-puppet-<%= face.name %>(8) -- <%= face.summary || "Unknown face." %>
+puppet-<%= face.name %>(8) -- <%= face.summary || "Undocumented face." %>
 <%= '=' * (_erbout.length - 1) %>
 
 <% if face.synopsis -%>
@@ -32,7 +32,7 @@ configuration options can also be generated by running puppet with
   and `master`.
 * --render-as FORMAT:
   The format in which to render output. The most common formats are `json`,
-  `s` (string), and `yaml`, but other options such as `dot` are
+  `s` (string), `yaml`, and `console`, but other options such as `dot` are
   sometimes available.
 * --verbose:
   Whether to log verbosely.
@@ -57,12 +57,15 @@ ACTIONS
   <%= action.synopsis %>
 
 <%   end -%>
-<%   if action.description -%>
   `DESCRIPTION`
 
+<%   if action.description -%>
 <%= action.description.gsub(/^/, '  ') %>
-<%   end
-     unique_options = action.options - face.options
+<% else -%>
+  <%= action.summary || "Undocumented action." %>
+<%   end -%>
+
+<%   unique_options = action.options - face.options
      unless unique_options.empty? -%>
   `OPTIONS`
 
@@ -101,6 +104,7 @@ EXAMPLES
 `<%= action.name.to_s %>`
 
 <%= action.examples.strip %>
+
 <%   end
    end -%>
 
diff --git a/lib/puppet/indirector/face.rb b/lib/puppet/indirector/face.rb
index 756306a2f..bb8ce2ceb 100644
--- a/lib/puppet/indirector/face.rb
+++ b/lib/puppet/indirector/face.rb
@@ -2,7 +2,7 @@ require 'puppet/face'
 
 class Puppet::Indirector::Face < Puppet::Face
   option "--terminus TERMINUS" do
-    summary "The indirector terminus to use for this action."
+    summary "The indirector terminus to use."
     description <<-EOT
       Indirector faces expose indirected subsystems of Puppet. These
       subsystems are each able to retrieve and alter a specific type of data
-- 
cgit 


From 17723634875e308b2752efed8ebdfd3db3239215 Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Fri, 3 Jun 2011 10:28:52 -0700
Subject: (#7764, 7775, 7778) Revisions to Faces help text

Per UX review of help text, this commit makes several changes over the breadth
of the Faces help:

* Preface API-only action summaries/descriptions with "API only." (issue #7775)
* Provide both CLI and API info in "returns," with the CLI info first. (issue #7778)
* Summaries should be sentences. (Add punctuation.)
* First sentences of descriptions should reiterate summaries. (Summaries and
  descriptions should be displayed far enough apart that this isn't a problem.)
* Standardize on "subcommand" instead of "face" when talking about the entity
  you invoke at the command line. (Use "face" when describing API use.)
* Fix outdated or clunky text in several faces.
---
 lib/puppet/face/catalog.rb                     | 52 ++++++++++++++++----------
 lib/puppet/face/catalog/select.rb              | 10 ++---
 lib/puppet/face/certificate.rb                 | 31 ++++++++-------
 lib/puppet/face/certificate_request.rb         | 23 ++++++------
 lib/puppet/face/certificate_revocation_list.rb | 24 ++++++------
 lib/puppet/face/config.rb                      | 10 ++---
 lib/puppet/face/facts.rb                       | 34 ++++++++++-------
 lib/puppet/face/file.rb                        |  8 ++--
 lib/puppet/face/file/download.rb               | 10 ++---
 lib/puppet/face/help.rb                        | 12 +++---
 lib/puppet/face/help/action.erb                |  2 +-
 lib/puppet/face/help/man.erb                   |  8 ++--
 lib/puppet/face/key.rb                         |  8 ++--
 lib/puppet/face/man.rb                         | 36 +++++++++---------
 lib/puppet/face/node.rb                        | 25 ++++++++-----
 lib/puppet/face/parser.rb                      |  9 +++++
 lib/puppet/face/plugin.rb                      | 17 +++++----
 lib/puppet/face/report.rb                      | 16 ++++----
 lib/puppet/face/resource.rb                    | 24 ++++++------
 lib/puppet/face/resource_type.rb               | 48 ++++++++++++++----------
 lib/puppet/face/secret_agent.rb                | 30 +++++++--------
 lib/puppet/face/status.rb                      | 21 ++++++-----
 lib/puppet/indirector/face.rb                  | 12 +++---
 23 files changed, 261 insertions(+), 209 deletions(-)

diff --git a/lib/puppet/face/catalog.rb b/lib/puppet/face/catalog.rb
index 13351540a..9bcaa19c6 100644
--- a/lib/puppet/face/catalog.rb
+++ b/lib/puppet/face/catalog.rb
@@ -6,25 +6,40 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
 
   summary "Compile, save, view, and convert catalogs."
   description <<-'EOT'
-    This face primarily interacts with the compiling subsystem. By default,
-    it compiles a catalog using the default manifest and the hostname from
-    `certname`, but you can choose to retrieve a catalog from the server by
-    specifying '--terminus rest'.  You can also choose to print any catalog
-    in 'dot' format (for easy graph viewing with OmniGraffle or Graphviz)
-    with '--render-as dot'.
+    This subcommand deals with catalogs, which are compiled per-node artifacts
+    generated from a set of Puppet manifests. By default, it interacts with the
+    compiling subsystem and compiles a catalog using the default manifest and
+    `certname`, but you can change the source of the catalog with the
+    `--terminus` option. You can also choose to print any catalog in 'dot'
+    format (for easy graph viewing with OmniGraffle or Graphviz) with
+    '--render-as dot'.
+  EOT
+  short_description <<-'EOT'
+    This subcommand deals with catalogs, which are compiled per-node artifacts
+    generated from a set of Puppet manifests. By default, it interacts with the
+    compiling subsystem and compiles a catalog using the default manifest and
+    `certname`; use the `--terminus` option to change the source of the catalog.
   EOT
 
-  get_action(:destroy).summary "Invalid for this face."
-  get_action(:search).summary "Query format unknown; potentially invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
+  get_action(:search).summary "Invalid for this subcommand."
+  find = get_action(:find)
+  find.summary "Retrieve the catalog for a node."
+  find.arguments "<certname>"
+  find.returns <<-'EOT'
+    A serialized catalog. When used from the Ruby API, returns a
+    Puppet::Resource::Catalog object.
+  EOT
 
   action(:apply) do
-    summary "Apply a Puppet::Resource::Catalog object."
+    summary "Find and apply a catalog."
     description <<-'EOT'
       Finds and applies a catalog. This action takes no arguments, but
-      the source of the catalog can be managed with the --terminus option.
+      the source of the catalog can be managed with the `--terminus` option.
     EOT
     returns <<-'EOT'
-      A Puppet::Transaction::Report object.
+      Nothing. When used from the Ruby API, returns a Puppet::Transaction::Report
+      object.
     EOT
     examples <<-'EOT'
       Apply the locally cached catalog:
@@ -71,18 +86,17 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
   action(:download) do
     summary "Download this node's catalog from the puppet master server."
     description <<-'EOT'
-      Retrieves a catalog from the puppet master and saves it to the
-      local yaml cache. The saved catalog can be used in subsequent
-      catalog actions by specifying '--terminus rest'.
-
-      This action always contacts the puppet master and will ignore
+      Retrieves a catalog from the puppet master and saves it to the local yaml
+      cache. This action always contacts the puppet master and will ignore
       alternate termini.
+
+      The saved catalog can be used in any subsequent catalog action by specifying
+      '--terminus yaml' for that action.
     EOT
     returns "Nothing."
     notes <<-'EOT'
-      As termini are singletons, this action has a side effect of
-      exporting Puppet::Resource::Catalog.indirection.terminus_class =
-      yaml to the calling context when used with the Ruby Faces API. The
+      When used from the Ruby API, this action has a side effect of leaving
+      Puppet::Resource::Catalog.indirection.terminus_class set to yaml. The
       terminus must be explicitly re-set for subsequent catalog actions.
     EOT
     examples <<-'EOT'
diff --git a/lib/puppet/face/catalog/select.rb b/lib/puppet/face/catalog/select.rb
index d86963e75..de2ca803b 100644
--- a/lib/puppet/face/catalog/select.rb
+++ b/lib/puppet/face/catalog/select.rb
@@ -1,15 +1,15 @@
 # Select and show a list of resources of a given type.
 Puppet::Face.define(:catalog, '0.0.1') do
   action :select do
-    summary "Select and show a list of resources of a given type"
+    summary "Retrieve a catalog and filter it for resources of a given type."
     arguments "<host> <resource_type>"
     returns <<-'EOT'
-      An array of resource objects excised from a catalog. When used at
-      the command line, returns a list of resource references (Type[title]).
+      A list of resource references ("Type[title]"). When used from the API,
+      returns an array of Puppet::Resource objects excised from a catalog.
     EOT
     description <<-'EOT'
-      Retrieves a catalog for the specified host and returns an array of
-      resources of the given type.
+      Retrieves a catalog for the specified host, then searches it for all
+      resources of the requested type.
     EOT
     notes <<-'NOTES'
       By default, this action will retrieve a catalog from Puppet's compiler
diff --git a/lib/puppet/face/certificate.rb b/lib/puppet/face/certificate.rb
index cab8817e3..cb0f61e3b 100644
--- a/lib/puppet/face/certificate.rb
+++ b/lib/puppet/face/certificate.rb
@@ -5,9 +5,9 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "Provide access to the CA for certificate management"
+  summary "Provide access to the CA for certificate management."
   description <<-'EOT'
-    This face interacts with a local or remote Puppet certificate
+    This subcommand interacts with a local or remote Puppet certificate
     authority. Currently, its behavior is not a full superset of `puppet
     cert`; specifically, it is unable to mimic puppet cert's "clean" option,
     and its "generate" action submits a CSR rather than creating a
@@ -15,10 +15,12 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   EOT
 
   option "--ca-location LOCATION" do
-    summary "The certificate authority to query"
+    summary "The certificate authority to query (local or remote)."
     description <<-'EOT'
       Whether to act on the local certificate authority or one provided by a
       remote puppet master. Allowed values are 'local' and 'remote.'
+
+      This option is required.
     EOT
 
     before_action do |action, args, options|
@@ -27,7 +29,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   end
 
   action :generate do
-    summary "Generate a new certificate signing request for HOST."
+    summary "Generate a new certificate signing request."
     arguments "<host>"
     returns "Nothing."
     description <<-'EOT'
@@ -55,8 +57,10 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   action :list do
     summary "List all certificate signing requests."
     returns <<-'EOT'
-      An array of CSR object #inspect strings. This output is currently messy,
-      but does contain the names of nodes requesting certificates.
+      An array of #inspect output from CSR objects. This output is
+      currently messy, but does contain the names of nodes requesting
+      certificates. This action returns #inspect strings even when used
+      from the Ruby API.
     EOT
 
     when_invoked do |options|
@@ -70,8 +74,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
     summary "Sign a certificate signing request for HOST."
     arguments "<host>"
     returns <<-'EOT'
-      A string that appears to be an x509 certificate, but is actually
-      not. Retrieve certificates using the `find` action.
+      A string that appears to be (but isn't) an x509 certificate.
     EOT
     examples <<-'EOT'
       Sign somenode.puppetlabs.lan's certificate:
@@ -88,24 +91,24 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
   # Indirector action doc overrides
   find = get_action(:find)
-  find.summary "Retrieve a certificate"
+  find.summary "Retrieve a certificate."
   find.arguments "<host>"
   find.returns <<-'EOT'
     An x509 SSL certificate. You will usually want to render this as a
-    string ('--render-as s').
+    string (--render-as s).
 
     Note that this action has a side effect of caching a copy of the
     certificate in Puppet's `ssldir`.
   EOT
 
   destroy = get_action(:destroy)
-  destroy.summary "Delete a local certificate."
+  destroy.summary "Delete a certificate."
   destroy.arguments "<host>"
   destroy.returns "Nothing."
   destroy.description <<-'EOT'
-    Deletes a certificate. This action currently only works with a local CA.
+    Deletes a certificate. This action currently only works on the local CA.
   EOT
 
-  get_action(:search).summary "Invalid for this face."
-  get_action(:save).summary "Invalid for this face."
+  get_action(:search).summary "Invalid for this subcommand."
+  get_action(:save).summary "Invalid for this subcommand."
 end
diff --git a/lib/puppet/face/certificate_request.rb b/lib/puppet/face/certificate_request.rb
index 29cf7dc78..12694ba21 100644
--- a/lib/puppet/face/certificate_request.rb
+++ b/lib/puppet/face/certificate_request.rb
@@ -6,20 +6,20 @@ Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
 
   summary "Manage certificate requests."
   description <<-'EOT'
-    Retrieves and submits certificate signing requests (CSRs). Invoke
-    `search` with a dummy key to retrieve all outstanding CSRs, invoke
-    `find` with a node certificate name to retrieve a specific request, and
-    invoke `save` to submit a CSR.
+    This subcommand retrieves and submits certificate signing requests (CSRs).
   EOT
 
   # Per-action doc overrides
-  get_action(:destroy).summary "Invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
 
   get_action(:find).summary "Retrieve a single CSR."
   get_action(:find).arguments "<host>"
   get_action(:find).returns <<-'EOT'
-    A single certificate request. In most cases, you will want to render
-    this as a string ('--render-as s').
+    A single certificate request. When used from the Ruby API, returns a
+    Puppet::SSL::CertificateRequest object.
+
+    RENDERING ISSUES: In most cases, you will want to render this as a string
+    ('--render-as s').
   EOT
   get_action(:find).examples <<-'EOT'
     Retrieve a single CSR from the puppet master's CA:
@@ -30,16 +30,17 @@ Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
   get_action(:search).summary "Retrieve all outstanding CSRs."
   get_action(:search).arguments "<dummy_key>"
   get_action(:search).returns <<-'EOT'
-    An array of certificate request objects. In most cases, you will
-    want to render this as a string ('--render-as s').
+    A list of certificate requests; be sure to to render this as a string
+    ('--render-as s'). When used from the Ruby API, returns an array of
+    Puppet::SSL::CertificateRequest objects.
   EOT
   get_action(:search).notes "This action always returns all CSRs, but requires a dummy search key."
   get_action(:search).examples <<-'EOT'
-    Retrieve all CSRs from the local CA:
+    Retrieve all CSRs from the local CA (similar to 'puppet cert list'):
 
     $ puppet certificate_request search x --terminus ca
   EOT
 
-  get_action(:save).summary "Submit a certificate signing request."
+  get_action(:save).summary "API only: submit a certificate signing request."
   get_action(:save).arguments "<x509_CSR>"
 end
diff --git a/lib/puppet/face/certificate_revocation_list.rb b/lib/puppet/face/certificate_revocation_list.rb
index 0525a601f..12ba1f73f 100644
--- a/lib/puppet/face/certificate_revocation_list.rb
+++ b/lib/puppet/face/certificate_revocation_list.rb
@@ -6,16 +6,18 @@ Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
 
   summary "Manage the list of revoked certificates."
   description <<-'EOT'
-    This face is primarily for retrieving the certificate revocation
-    list from the CA. Although it exposes search/save/destroy methods,
-    they shouldn't be used under normal circumstances.
+    This subcommand is primarily for retrieving the certificate revocation
+    list from the CA.
   EOT
 
   get_action(:find).summary "Retrieve the certificate revocation list."
   get_action(:find).arguments "<dummy_key>"
   get_action(:find).returns <<-'EOT'
-    A certificate revocation list. You will usually want to render this
-    as a string ('--render-as s').
+    A certificate revocation list. When used from the Ruby API: returns an
+    OpenSSL::X509::CRL object.
+
+    RENDERING ISSUES: this should usually be rendered as a string
+    ('--render-as s').
   EOT
   get_action(:find).examples <<-'EXAMPLES'
     Retrieve a copy of the puppet master's CRL:
@@ -27,13 +29,11 @@ Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
   get_action(:destroy).arguments "<dummy_key>"
   get_action(:destroy).returns "Nothing."
   get_action(:destroy).description <<-'EOT'
-    Deletes the certificate revocation list. This cannot be done over
-    REST, but it is possible to both delete the locally cached copy of
-    the CA's CRL and delete the CA's own copy (if running on the CA
-    machine and invoked with '--terminus ca'). Needless to say, don't do
-    this unless you know what you're up to.
+    Deletes the certificate revocation list. This cannot be done over REST, but
+    it is possible to delete the locally cached copy or (if run from the CA) the
+    CA's own copy of the CRL.
   EOT
 
-  get_action(:search).summary "Invalid for this face."
-  get_action(:save).summary "Invalid for this face."
+  get_action(:search).summary "Invalid for this subcommand."
+  get_action(:save).summary "Invalid for this subcommand."
 end
diff --git a/lib/puppet/face/config.rb b/lib/puppet/face/config.rb
index 6e5bff071..3fce0ed70 100644
--- a/lib/puppet/face/config.rb
+++ b/lib/puppet/face/config.rb
@@ -7,13 +7,11 @@ Puppet::Face.define(:config, '0.0.1') do
   summary "Interact with Puppet's configuration options."
 
   action(:print) do
-    summary "Examine Puppet's current configuration options."
-    arguments "(all | <option> [<option> ...]"
+    summary "Examine Puppet's current configuration settings."
+    arguments "(all | <setting> [<setting> ...]"
     returns <<-'EOT'
-      When called with one option: a single value.
-
-      When called with "all" or multiple options: a list of options and
-      their values.
+      A single value when called with one config setting, and a list of settings
+      and values when called with multiple options or "all."
     EOT
     description <<-'EOT'
       Prints the value of a single configuration option or a list of
diff --git a/lib/puppet/face/facts.rb b/lib/puppet/face/facts.rb
index 05028a435..99ff14bd9 100644
--- a/lib/puppet/face/facts.rb
+++ b/lib/puppet/face/facts.rb
@@ -7,22 +7,28 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
 
   summary "Retrieve and store facts."
   description <<-'EOT'
-    This face manages facts, the collections of normalized system
-    information used by Puppet. It can read facts directly from the
-    local system (using the default `facter` terminus), look up facts
-    reported by other systems, and submit facts to the puppet master.
+    This subcommand manages facts, which are collections of normalized system
+    information used by Puppet. It can read facts directly from the local system
+    (with the default `facter` terminus), look up facts reported by other
+    systems, and submit facts to the puppet master.
 
-    When used with the `rest` terminus, this face is essentially a
-    front-end to the inventory service REST API. See the inventory
-    service documentation for more detail.
+    When used with the `rest` terminus, this subcommand is essentially a front-end
+    to the inventory service REST API. See the inventory service documentation at
+    <http://docs.puppetlabs.com/guides/inventory_service.html> for more detail.
   EOT
 
   find = get_action(:find)
-  find.summary "Retrieve a host's facts."
-  find.arguments "<host>"
-  find.returns "A Puppet::Node::Facts object."
+  find.summary "Retrieve a node's facts."
+  find.arguments "<node_certname>"
+  find.returns <<-'EOT'
+    A hash containing some metadata and (under the "values" key) the set
+    of facts for the requested node. When used from the Ruby API: A
+    Puppet::Node::Facts object.
+
+    RENDERING ISSUES: Facts cannot currently be rendered as a string.
+  EOT
   find.notes <<-'EOT'
-    When using the `facter` terminus, the host argument is essentially ignored.
+    When using the `facter` terminus, the host argument is ignored.
   EOT
   find.examples <<-'EOT'
     Get facts from the local system:
@@ -38,13 +44,13 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
     $ puppet facts find somenode.puppetlabs.lan --terminus inventory_active_record --mode master
   EOT
 
-  get_action(:destroy).summary "Invalid for this face."
-  get_action(:search).summary "Query format unknown; potentially invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
+  get_action(:search).summary "Invalid for this subcommand."
 
   action(:upload) do
     summary "Upload local facts to the puppet master."
     description <<-'EOT'
-      Reads facts from the local system using the facter terminus, then
+      Reads facts from the local system using the `facter` terminus, then
       saves the returned facts using the rest terminus.
     EOT
     returns "Nothing."
diff --git a/lib/puppet/face/file.rb b/lib/puppet/face/file.rb
index 1cf9bc7f3..f63350e3b 100644
--- a/lib/puppet/face/file.rb
+++ b/lib/puppet/face/file.rb
@@ -6,7 +6,7 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do
 
   summary "Retrieve and store files in a filebucket"
   description <<-'EOT'
-    This face interacts with objects stored in a local or remote
+    This subcommand interacts with objects stored in a local or remote
     filebucket. File objects are accessed by their MD5 sum; see the
     examples for the relevant syntax.
   EOT
@@ -15,7 +15,7 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do
     --render-as s. Rendering as yaml will return a hash of metadata
     about the file, including its contents.
 
-    This face does not interact with the `clientbucketdir` (the default
+    This subcommand does not interact with the `clientbucketdir` (the default
     local filebucket for puppet agent); it interacts with the primary
     "master"-type filebucket located in the `bucketdir`. If you wish to
     interact with puppet agent's default filebucket, you'll need to set
@@ -40,8 +40,8 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do
     $ puppet file find md5/9aedba7f413c97dc65895b1cd9421f2c --render-as s
   EOT
 
-  get_action(:search).summary "Invalid for this face."
-  get_action(:destroy).summary "Invalid for this face."
+  get_action(:search).summary "Invalid for this subcommand."
+  get_action(:destroy).summary "Invalid for this subcommand."
 
   set_indirection_name :file_bucket_file
 end
diff --git a/lib/puppet/face/file/download.rb b/lib/puppet/face/file/download.rb
index 8a300fbf1..3e67e452a 100644
--- a/lib/puppet/face/file/download.rb
+++ b/lib/puppet/face/file/download.rb
@@ -2,12 +2,12 @@
 Puppet::Face.define(:file, '0.0.1') do
   action :download do |*args|
     summary "Download a file into the local filebucket."
-    arguments "( {md5}<checksum> | puppet:///... )"
-    returns "Nothing"
+    arguments "( {md5}<checksum> | <puppet_url> )"
+    returns "Nothing."
     description <<-EOT
-      Downloads a file from the puppet master's filebucket and
-      duplicates it in the local filebucket. This action's checksum
-      syntax differs from `find`'s, and it can accept a <puppet:///> URL.
+      Downloads a file from the puppet master's filebucket and duplicates it in
+      the local filebucket. This action's checksum syntax differs from `find`'s,
+      and it can accept a <puppet:///> URL.
     EOT
     examples <<-'EOT'
       Download a file by URL:
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
diff --git a/lib/puppet/face/help/action.erb b/lib/puppet/face/help/action.erb
index 94b935fed..5242ed218 100644
--- a/lib/puppet/face/help/action.erb
+++ b/lib/puppet/face/help/action.erb
@@ -2,7 +2,7 @@
 USAGE: <%= action.synopsis %>
 
 <% end -%>
-<%= action.short_description || action.summary || face.summary || "undocumented face" %>
+<%= action.short_description || action.summary || face.summary || "undocumented subcommand" %>
 
 <% if action.returns -%>
 RETURNS: <%= action.returns.strip %>
diff --git a/lib/puppet/face/help/man.erb b/lib/puppet/face/help/man.erb
index 0122d974c..90e27964c 100644
--- a/lib/puppet/face/help/man.erb
+++ b/lib/puppet/face/help/man.erb
@@ -1,4 +1,4 @@
-puppet-<%= face.name %>(8) -- <%= face.summary || "Undocumented face." %>
+puppet-<%= face.name %>(8) -- <%= face.summary || "Undocumented subcommand." %>
 <%= '=' * (_erbout.length - 1) %>
 
 <% if face.synopsis -%>
@@ -116,9 +116,9 @@ NOTES
 
 <% end # notes
 if face.respond_to? :indirection -%>
-This is an indirector face, which exposes `find`, `search`, `save`, and
-`destroy` actions for an indirected subsystem of Puppet. Valid termini
-for this face include:
+This subcommand is an indirector face, which exposes `find`, `search`, `save`,
+and `destroy` actions for an indirected subsystem of Puppet. Valid termini for
+this face include:
 
 * `<%= face.class.terminus_classes(face.indirection.name).join("`\n* `") %>`
 
diff --git a/lib/puppet/face/key.rb b/lib/puppet/face/key.rb
index 54c4975c5..96cfebe3a 100644
--- a/lib/puppet/face/key.rb
+++ b/lib/puppet/face/key.rb
@@ -6,10 +6,10 @@ Puppet::Indirector::Face.define(:key, '0.0.1') do
 
   summary "Create, save, and remove certificate keys."
   description <<-'EOT'
-    Manages certificate private keys. Keys are created for you
-    automatically when certificate requests are generated with 'puppet
-    certificate generate', and it should not be necessary to use this action
-    directly.
+    This subcommand manages certificate private keys. Keys are created
+    automatically by puppet agent and when certificate requests are generated
+    with 'puppet certificate generate'; it should not be necessary to use this
+    subcommand directly.
   EOT
 
 end
diff --git a/lib/puppet/face/man.rb b/lib/puppet/face/man.rb
index 38b9202eb..c43ead3ec 100644
--- a/lib/puppet/face/man.rb
+++ b/lib/puppet/face/man.rb
@@ -7,34 +7,32 @@ Puppet::Face.define(:man, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "Display Puppet subcommand manual pages."
+  summary "Display Puppet manual pages."
 
   description <<-EOT
-    The man face, when invoked from the command line, tries very hard to
-    behave nicely for interactive use.  If possible, it delegates to the
-    ronn(1) command to format the output as a real manual page.
-
-    If ronn(1) is not available, it will use the first of `$MANPAGER`,
-    `$PAGER`, `less`, `most`, or `more` to paginate the (human-readable)
-    input text for the manual page.
-
-    We do try hard to ensure that this behaves correctly when used as
-    part of a pipeline.  (Well, we delegate to tools that do the right
-    thing, which is more or less the same.)
+    This subcommand displays manual pages for all Puppet subcommands. If the
+    `ronn` gem (<https://github.com/rtomayko/ronn/>) is installed on your
+    system, puppet man will display fully-formated man pages. If `ronn` is not
+    available, puppet man will display the raw (but human-readable) source text
+    in a pager.
   EOT
 
   notes <<-EOT
-    We strongly encourage you to install the `ronn` gem on your system,
-    or otherwise make it available, so that we can display well structured
-    output from this face.
+    The pager used for display will be the first found of `$MANPAGER`, `$PAGER`,
+    `less`, `most`, or `more`.
   EOT
 
   action(:man) do
-    summary "Display the manual page for a face."
-    arguments "<face>"
-    returns "The man data, in markdown format, suitable for consumption by Ronn."
+    summary "Display the manual page for a Puppet subcommand."
+    arguments "<subcommand>"
+    returns <<-'EOT'
+      The man data, in Markdown format, suitable for consumption by Ronn.
+
+      RENDERING ISSUES: To skip fancy formatting and output the raw Markdown
+      text (e.g. for use in a pipeline), call this action with '--render-as s'.
+    EOT
     examples <<-'EOT'
-      Get the manual page for a face:
+      View the manual page for a subcommand:
 
       $ puppet man facts
     EOT
diff --git a/lib/puppet/face/node.rb b/lib/puppet/face/node.rb
index d244127a4..cd27e0b26 100644
--- a/lib/puppet/face/node.rb
+++ b/lib/puppet/face/node.rb
@@ -5,33 +5,38 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
 
   summary "View and manage node definitions."
   description <<-'EOT'
-    This face interacts with node objects, which are used by Puppet to
-    build a catalog. A node object consists of the node's facts,
-    environment, node parameters (exposed in the parser as top-scope
-    variables), and classes.
+    This subcommand interacts with node objects, which are used by Puppet to
+    build a catalog. A node object consists of the node's facts, environment,
+    node parameters (exposed in the parser as top-scope variables), and classes.
   EOT
 
-  get_action(:destroy).summary "Invalid for this face."
-  get_action(:search).summary "Invalid for this face."
-  get_action(:save).summary "Invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
+  get_action(:search).summary "Invalid for this subcommand."
+  get_action(:save).summary "Invalid for this subcommand."
 
   find = get_action(:find)
   find.summary "Retrieve a node object."
   find.arguments "<host>"
   find.returns <<-'EOT'
-    A Puppet::Node object.
+    A hash containing the node's `classes`, `environment`, `expiration`, `name`,
+    `parameters` (its facts, combined with any ENC-set parameters), and `time`.
+    When used from the Ruby API: a Puppet::Node object.
 
     RENDERING ISSUES: Rendering as string and json are currently broken;
     node objects can only be rendered as yaml.
   EOT
   find.examples <<-'EOT'
-    Retrieve an "empty" (no classes, fact and bulit-in parameters only,
-    and an environment of "production") node:
+    Retrieve an "empty" (no classes, no ENC-imposed parameters, and an
+    environment of "production") node:
 
     $ puppet node find somenode.puppetlabs.lan --terminus plain --render-as yaml
 
     Retrieve a node using the puppet master's configured ENC:
 
     $ puppet node find somenode.puppetlabs.lan --terminus exec --mode master --render-as yaml
+
+    Retrieve the same node from the puppet master:
+
+    $ puppet node find somenode.puppetlabs.lan --terminus rest --render-as yaml
   EOT
 end
diff --git a/lib/puppet/face/parser.rb b/lib/puppet/face/parser.rb
index 8dd3efb75..c99cbb747 100644
--- a/lib/puppet/face/parser.rb
+++ b/lib/puppet/face/parser.rb
@@ -16,6 +16,15 @@ Puppet::Face.define(:parser, '0.0.1') do
       syncing any resources. If no manifest files are provided, it will
       validate the default site manifest.
     EOT
+    examples <<-'EOT'
+      Validate the default site manifest at /etc/puppet/manifests/site.pp:
+
+      $ puppet parser validate
+
+      Validate two arbitrary manifest files:
+
+      $ puppet parser validate init.pp vhost.pp
+    EOT
     when_invoked do |*args|
       args.pop
       files = args
diff --git a/lib/puppet/face/plugin.rb b/lib/puppet/face/plugin.rb
index 541468d39..76c79f38d 100644
--- a/lib/puppet/face/plugin.rb
+++ b/lib/puppet/face/plugin.rb
@@ -5,13 +5,13 @@ Puppet::Face.define(:plugin, '0.0.1') do
 
   summary "Interact with the Puppet plugin system."
   description <<-'EOT'
-    This face provides network access to the puppet master's store of
+    This subcommand provides network access to the puppet master's store of
     plugins.
-  EOT
-  notes <<-'EOT'
-    The puppet master can serve Ruby code collected from the lib directories
+
+    The puppet master serves 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.
+    Facter and implement custom types and providers. Plugins are normally
+    downloaded by puppet agent during the course of a run.
   EOT
 
   action :download do
@@ -19,12 +19,13 @@ Puppet::Face.define(:plugin, '0.0.1') do
     description <<-'EOT'
       Downloads plugins from the configured puppet master. Any plugins
       downloaded in this way will be used in all subsequent Puppet activity.
+      This action modifies files on disk.
     EOT
     returns <<-'EOT'
-      A display-formatted list of the files downloaded. If all plugin
-      files were in sync, this list will be empty.
+      A list of the files downloaded, or a confirmation that no files were
+      downloaded. When used from the Ruby API, this action returns an array of
+      the files downloaded, which will be empty if none were retrieved.
     EOT
-    notes "This action modifies files on disk."
     examples <<-'EOT'
       Retrieve plugins from the puppet master:
 
diff --git a/lib/puppet/face/report.rb b/lib/puppet/face/report.rb
index 1345d6359..22737103c 100644
--- a/lib/puppet/face/report.rb
+++ b/lib/puppet/face/report.rb
@@ -4,13 +4,13 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "Create, display, and submit reports"
+  summary "Create, display, and submit reports."
 
   get_action(:find).summary "Invalid for this face."
   get_action(:search).summary "Invalid for this face."
   get_action(:destroy).summary "Invalid for this face."
   save = get_action(:save)
-  save.summary "Submit a report."
+  save.summary "API only: submit a report."
   save.arguments "<report>"
   save.returns "Nothing."
   save.examples <<-'EOT'
@@ -27,15 +27,15 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
   EOT
 
   action(:submit) do
-    summary "Submit a report object to the puppet master"
+    summary "API only: submit a report with error handling."
     description <<-'EOT'
-      This action is essentially a shortcut and wrapper for the `save` action
-      with the `rest` terminus, which provides additional details in the
-      event of a report submission failure. It is not intended for use from
-      a command line.
+      API only: Submits a report to the puppet master. This action is
+      essentially a shortcut and wrapper for the `save` action with the `rest`
+      terminus, and provides additional details in the event of a failure.
     EOT
+    arguments "<report>"
     examples <<-'EOT'
-      From secret_agent.rb:
+      From secret_agent.rb (API example):
 
           # ...
           report  = Puppet::Face[:catalog, '0.0.1'].apply
diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb
index 59f628675..95a2ffc9a 100644
--- a/lib/puppet/face/resource.rb
+++ b/lib/puppet/face/resource.rb
@@ -4,19 +4,18 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "Interact directly with resources via the RAL, like ralsh"
+  summary "API only: interact directly with resources via the RAL."
   description <<-'EOT'
-    This face provides a Ruby API with functionality similar to the puppet
-    resource (originally ralsh) command line application. It is not intended to be
-    used from the command line.
+    API only: this face provides a Ruby API with functionality similar to the
+    puppet resource (or ralsh) subcommand.
   EOT
 
-  get_action(:destroy).summary "Invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
 
   search = get_action(:search)
-  search.summary "Get all resources of a single type."
+  search.summary "API only: get all resources of a single type."
   search.arguments "<resource_type>"
-  search.returns "An array of resource objects."
+  search.returns "An array of Puppet::Resource objects."
   search.examples <<-'EOT'
     Get a list of all user resources (API example):
 
@@ -24,9 +23,9 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   EOT
 
   find = get_action(:find)
-  find.summary "Get a single resource."
+  find.summary "API only: get a single resource."
   find.arguments "<type>/<title>"
-  find.returns "A resource object."
+  find.returns "A Puppet::Resource object."
   find.examples <<-'EOT'
     Print information about a user on this system (API example):
 
@@ -34,9 +33,12 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   EOT
 
   save = get_action(:save)
-  save.summary "Create a new resource."
+  save.summary "API only: create a new resource."
+  save.description <<-EOT
+    API only: creates a new resource.
+  EOT
   save.arguments "<resource_object>"
-  save.returns "The same resource object passed."
+  save.returns "The same resource object passed as an argument."
   save.examples <<-'EOT'
     Create a new file resource (API example):
 
diff --git a/lib/puppet/face/resource_type.rb b/lib/puppet/face/resource_type.rb
index 9d7639fc5..dc6d9de90 100644
--- a/lib/puppet/face/resource_type.rb
+++ b/lib/puppet/face/resource_type.rb
@@ -4,39 +4,48 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
-  summary "View classes, defined resource types, and nodes from all manifests"
+  summary "View classes, defined resource types, and nodes from all manifests."
   description <<-'EOT'
-    This face reads information about the resource collections (classes,
+    This subcommand reads information about the resource collections (classes,
     nodes, and defined types) available in Puppet's site manifest and
     modules.
 
     It will eventually be extended to examine native resource types.
   EOT
-
-  # Action documentation overrides:
-  get_action(:save).summary = "Invalid for this face."
-  get_action(:destroy).summary = "Invalid for this face."
-
-  find = get_action(:find)
-  find.summary "Retrieve info about a resource collection."
-  find.arguments "<collection_name>"
-  find.returns <<-'EOT'
-    A hash of info about one resource collection. This hash will include the
-    following four keys:
+  notes <<-'EOT'
+    The `find` and `search` actions return similar hashes of resource collection
+    info. These hashes will include the following four keys:
 
     * `file` (a string)
     * `name` (a string)
     * `type` (<hostclass>, <definition>, or <node>)
     * `line` (an integer)
 
-    It may also include the following keys:
+    They may optionally include the following keys:
 
     * `parent`    (<name_of_resource_collection>)
     * `arguments` (a hash of parameters and default values)
     * `doc`       (a string)
+  EOT
 
-    RENDERING ISSUES: yaml and string output for this indirection are
-    currently unusable; use json instead.
+  # Action documentation overrides:
+  get_action(:save).summary = "Invalid for this subcommand."
+  get_action(:destroy).summary = "Invalid for this subcommand."
+
+  find = get_action(:find)
+  find.summary "Retrieve info about a resource collection."
+  find.arguments "<collection_name>"
+  find.returns <<-'EOT'
+    A hash of info about the requested resource collection. When used from the
+    Ruby API: returns a Puppet::Resource::Type object.
+
+    RENDERING ISSUES: yaml and string output for this indirection are currently
+    unusable; use json instead.
+  EOT
+  find.notes <<-'EOT'
+    If two resource collections share the same name (e.g. you have both a node
+    and a class named "default"), `find` will only return one of them. This can
+    be worked around by using `search` instead.
   EOT
   find.examples <<-'EOT'
     Retrieve info about a specific locally-defined class:
@@ -52,10 +61,11 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
   search.summary "Search for collections matching a regular expression."
   search.arguments "<regular_expression>"
   search.returns <<-'EOT'
-    An array of resource collection info hashes. (See "RETURNS" under `find`.)
+    An array of hashes of resource collection info. When used from the Ruby API:
+    returns an array of Puppet::Resource::Type objects.
 
-    RENDERING ISSUES: yaml and string output for this indirection are
-    currently unusable; use json instead.
+    RENDERING ISSUES: yaml and string output for this indirection are currently
+    unusable; use json instead.
   EOT
   search.examples <<-'EOT'
     Retrieve all classes, nodes, and defined types:
diff --git a/lib/puppet/face/secret_agent.rb b/lib/puppet/face/secret_agent.rb
index 79241da72..7771d576a 100644
--- a/lib/puppet/face/secret_agent.rb
+++ b/lib/puppet/face/secret_agent.rb
@@ -6,34 +6,34 @@ Puppet::Face.define(:secret_agent, '0.0.1') do
 
   summary "Mimics puppet agent."
   description <<-'EOT'
-    This face currently functions as a proof of concept, demonstrating
-    how Faces allows the separation of application logic from Puppet's
-    internal systems; compare the actual code for puppet agent. It will
-    eventually replace puppet agent entirely, and can provide a template
-    for users who wish to implement agent-like functionality with
-    non-standard application logic.
+    This subcommand currently functions as a proof of concept, demonstrating how
+    the Faces API exposes Puppet's internal systems to application logic;
+    compare the actual code for puppet agent. It will eventually replace puppet
+    agent entirely, and can provide a template for users who wish to implement
+    agent-like functionality with non-standard application logic.
   EOT
 
   action(:synchronize) do
     default
     summary "Run secret_agent once."
-    arguments "[-v | --verbose] [-d | --debug]" # Remove this once options are introspectible
     description <<-'EOT'
-      This action mimics a single run of the puppet agent application.
-      It does not currently daemonize, but can download plugins, submit
-      facts, retrieve and apply a catalog, and submit a report to the
-      puppet master.
+      Mimics a single run of puppet agent. This action does not currently
+      daemonize, but can download plugins, submit facts, retrieve and apply a
+      catalog, and submit a report to the puppet master.
+    EOT
+    returns <<-'EOT'
+      Verbose logging from the completed run. When used from the Ruby API:
+      returns a Puppet::Transaction::Report object.
     EOT
-    returns "A Puppet::Transaction::Report object."
     examples <<-'EOT'
       Trigger a Puppet run with the configured puppet master:
 
       $ puppet secret_agent
     EOT
     notes <<-'EOT'
-      This action requires that the puppet master's `auth.conf` file
-      allow save access to the `facts` REST terminus. Puppet agent does
-      not use this facility, and it is turned off by default. See
+      This action requires that the puppet master's `auth.conf` file allow save
+      access to the `facts` REST terminus. Puppet agent does not use this
+      facility, and it is turned off by default. See
       <http://docs.puppetlabs.com/guides/rest_auth_conf.html> for more details.
     EOT
 
diff --git a/lib/puppet/face/status.rb b/lib/puppet/face/status.rb
index 4ae24e81b..690c6b371 100644
--- a/lib/puppet/face/status.rb
+++ b/lib/puppet/face/status.rb
@@ -6,24 +6,27 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
   summary "View puppet server status."
 
-  get_action(:destroy).summary "Invalid for this face."
-  get_action(:save).summary "Invalid for this face."
-  get_action(:search).summary "Invalid for this face."
+  get_action(:destroy).summary "Invalid for this subcommand."
+  get_action(:save).summary "Invalid for this subcommand."
+  get_action(:search).summary "Invalid for this subcommand."
 
   find = get_action(:find)
   find.summary "Check status of puppet master server."
   find.arguments "<dummy_key>"
-  find.returns "A Puppet::Status object, or a low-level connection error."
+  find.returns <<-'EOT'
+    A "true" response or a low-level connection error. When used from the Ruby
+    API: returns a Puppet::Status object.
+  EOT
   find.description <<-'EOT'
     Checks whether a Puppet server is properly receiving and processing
-    REST requests. This action is only useful when used with '--terminus
+    HTTP requests. This action is only useful when used with '--terminus
     rest'; when invoked with the `local` terminus, `find` will always
     return true.
 
-    This action will query the configured puppet master. To query other
-    servers, including puppet agent nodes started with the --listen
-    option, you can set set the global --server and --masterport options
-    on the command line; note that agent nodes listen on port 8139.
+    Over REST, this action will query the configured puppet master by default.
+    To query other servers, including puppet agent nodes started with the
+    <--listen> option, you can set set the global <--server> and <--masterport>
+    options on the command line; note that agent nodes listen on port 8139.
   EOT
   find.notes <<-'EOT'
     This action requires that the server's `auth.conf` file allow find
diff --git a/lib/puppet/indirector/face.rb b/lib/puppet/indirector/face.rb
index bb8ce2ceb..ead3f4b46 100644
--- a/lib/puppet/indirector/face.rb
+++ b/lib/puppet/indirector/face.rb
@@ -61,11 +61,12 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   action :save do
-    summary "Create or overwrite an object."
+    summary "API only: create or overwrite an object."
     arguments "<object>"
     description <<-EOT
-      Create or overwrite an object. Save actions cannot currently be
-      invoked from the command line, and are for API use only.
+      API only: create or overwrite an object. As the Faces framework does not
+      currently accept data from STDIN, save actions cannot currently be invoked
+      from the command line.
     EOT
     when_invoked { |key, options| call_indirection_method(:save, key, options) }
   end
@@ -80,8 +81,9 @@ class Puppet::Indirector::Face < Puppet::Face
   action :info do
     summary "Print the default terminus class for this face."
     description <<-EOT
-      Prints the default terminus class for this face. Note that
-      different run modes may have different default terminuses.
+      Prints the default terminus class for this subcommand. Note that different
+      run modes may have different default termini; when in doubt, specify the
+      run mode with the '--mode' option.
     EOT
 
     when_invoked do |*args|
-- 
cgit 


From 973e752cc210cc64ec50b942ee989f6e6acaaca0 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Mon, 6 Jun 2011 17:56:53 -0700
Subject: (#7728) Suppress notifications from container whits.

We introduced changes to our graph to reduce the number of edges when we had
container dependencies.  As part of this the 'whit' object was created, and
used as an intermediate vertex to simplify processing.

During that change we introduced additional reporting, based on those whit
objects, about containment relationships during resource application failure.

Specifically, we would now report that the containing class(es) and stages of
any failed resource were failed, point-blank.  This was unclear, because the
entire class had not failed, but only part of it, but also unhelpful, because
it turned a single failure into at least one additional report that contained
no additional information.

Now, instead, we suppress reporting for the whit resources.  We still process
them identically; just the report is eliminated.

It isn't absolutely clear that this is the correct long term direction for
handling these objects, but it is the minimal change for the RC release.

Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/transaction.rb | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 3728a2fff..089f4d945 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -131,10 +131,22 @@ class Puppet::Transaction
     # enough to check the immediate dependencies, which is why we use
     # a tree from the reversed graph.
     found_failed = false
+
+
+    # When we introduced the :whit into the graph, to reduce the combinatorial
+    # explosion of edges, we also ended up reporting failures for containers
+    # like class and stage.  This is undesirable; while just skipping the
+    # output isn't perfect, it is RC-safe. --daniel 2011-06-07
+    suppress_report = (resource.class == Puppet::Type.type(:whit))
+
     relationship_graph.dependencies(resource).each do |dep|
       next unless failed?(dep)
-      resource.notice "Dependency #{dep} has failures: #{resource_status(dep).failed}"
       found_failed = true
+
+      # See above. --daniel 2011-06-06
+      unless suppress_report then
+        resource.notice "Dependency #{dep} has failures: #{resource_status(dep).failed}"
+      end
     end
 
     found_failed
@@ -336,7 +348,13 @@ class Puppet::Transaction
     elsif ! scheduled?(resource)
       resource.debug "Not scheduled"
     elsif failed_dependencies?(resource)
-      resource.warning "Skipping because of failed dependencies"
+      # When we introduced the :whit into the graph, to reduce the combinatorial
+      # explosion of edges, we also ended up reporting failures for containers
+      # like class and stage.  This is undesirable; while just skipping the
+      # output isn't perfect, it is RC-safe. --daniel 2011-06-07
+      unless resource.class == Puppet::Type.type(:whit) then
+        resource.warning "Skipping because of failed dependencies"
+      end
     elsif resource.virtual?
       resource.debug "Skipping because virtual"
     elsif resource.appliable_to_device? ^ for_network_device
-- 
cgit 


From 9017fea1904270f1c1a5365fe23fc52817867334 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 14:24:42 -0700
Subject: (#7728) Acceptance test for whit notifications.

This adds an acceptance test to verify that we emit the expected logs, but
none of the unexpected logs, when we process a manifest showing the whit
notification problem.

Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
---
 .../tests/ticket_7728_don't_log_whits_on_failure.rb  | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb

diff --git a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
new file mode 100644
index 000000000..51220d4d4
--- /dev/null
+++ b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
@@ -0,0 +1,20 @@
+test_name "#7728: Don't log whits on resource failure"
+
+manifest = %Q{
+  class foo {
+    exec { "test": command => "/usr/bin/false" }
+
+    notify { "before": before  => Exec["test"] }
+    notify { "after":  require => Exec["test"] }
+  }
+
+  include foo
+}
+
+apply_manifest_on(agents, manifest) do
+  # Note: using strings in the match, because I want them regexp-escaped,
+  # and the assertion code will do that automatically. --daniel 2011-06-07
+  assert_match('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true', stdout, "the after dependency must be reported")
+  assert_no_match('Class[Foo]', stdout, 'the class should not be mentioned')
+  assert_no_match('Stage[Main]', stdout, 'the class should not be mentioned')
+end
-- 
cgit 


From 48aafa3a5c553fec7b9a5193febd5591937d5680 Mon Sep 17 00:00:00 2001
From: Luke Kaines <luke@puppetlabs.com>
Date: Tue, 7 Jun 2011 15:58:26 -0700
Subject: (#6873) Add Static Compiler terminus to 2.7.0

This adds the static compiler terminus to the release.  This wraps the default
compiler terminus, and post-processes the catalog to rewrite every file
reference using the 'puppet://' URI/protocol into filebucket references that
use the MD5 checksum of the file contents.

This provides a genuinely static catalog, in terms of content: there are no
external dependencies that can change to make the behaviour of applying this
catalog change.

It also eliminates the describe calls from file checking, as all the metadata
is stored locally in the catalog.  This can be a substantial performance
increase for nodes, especially those that manage large trees of recursive
files.

To use this set the `catalog_terminus` to `static_compiler`; the resultant
catalog will then reference only static content.  This does not, however, put
the required files into the filebucket on the client.

There are some limitations of this code:

 * Files are all read into memory rather than streamed. This will definitely
   cause problems with large files, but the filebucket doesn't currently
   handle streaming.

 * We think the recursion behavior is equivalent, but can't really guarantee
   it without a good bit of testing.

 * You have to populate the client filebucket manually.  We don't have any
   support for doing this automatically, not even through variant access to
   the catalog downloader.

 * Behavior on the server is currently undefined if your puppet masters are
   behind a load balancer and they're configured to do fileserving through
   that load balancer. It should work, but it probably won't be that fast.

You can see https://github.com/lak/puppet-static-compiler for the original
prototype this was inherited from, which includes some example code for
scanning the downloaded catalog and fetching resources into the filebucket.

Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
---
 lib/puppet/indirector/catalog/static_compiler.rb | 137 +++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 lib/puppet/indirector/catalog/static_compiler.rb

diff --git a/lib/puppet/indirector/catalog/static_compiler.rb b/lib/puppet/indirector/catalog/static_compiler.rb
new file mode 100644
index 000000000..1d92121ed
--- /dev/null
+++ b/lib/puppet/indirector/catalog/static_compiler.rb
@@ -0,0 +1,137 @@
+require 'puppet/node'
+require 'puppet/resource/catalog'
+require 'puppet/indirector/code'
+
+class Puppet::Resource::Catalog::StaticCompiler < Puppet::Indirector::Code
+  def compiler
+    @compiler ||= indirection.terminus(:compiler)
+  end
+
+  def find(request)
+    return nil unless catalog = compiler.find(request)
+
+    raise "Did not get catalog back" unless catalog.is_a?(model)
+
+    catalog.resources.find_all { |res| res.type == "File" }.each do |resource|
+      next unless source = resource[:source]
+      next unless source =~ /^puppet:/
+
+      file = resource.to_ral
+      if file.recurse?
+        add_children(request.key, catalog, resource, file)
+      else
+        find_and_replace_metadata(request.key, resource, file)
+      end
+    end
+
+    catalog
+  end
+
+  def find_and_replace_metadata(host, resource, file)
+    # We remove URL info from it, so it forces a local copy
+    # rather than routing through the network.
+    # Weird, but true.
+    newsource = file[:source][0].sub("puppet:///", "")
+    file[:source][0] = newsource
+
+    raise "Could not get metadata for #{resource[:source]}" unless metadata = file.parameter(:source).metadata
+
+    replace_metadata(host, resource, metadata)
+  end
+
+  def replace_metadata(host, resource, metadata)
+    [:mode, :owner, :group].each do |param|
+      resource[param] ||= metadata.send(param)
+    end
+
+    resource[:ensure] = metadata.ftype
+    if metadata.ftype == "file"
+      unless resource[:content]
+        resource[:content] = metadata.checksum
+        resource[:checksum] = metadata.checksum_type
+      end
+    end
+
+    store_content(resource) if resource[:ensure] == "file"
+    old_source = resource.delete(:source)
+    Puppet.info "Metadata for #{resource} in catalog for '#{host}' added from '#{old_source}'"
+  end
+
+  def add_children(host, catalog, resource, file)
+    file = resource.to_ral
+
+    children = get_child_resources(host, catalog, resource, file)
+
+    remove_existing_resources(children, catalog)
+
+    children.each do |name, res|
+      catalog.add_resource res
+      catalog.add_edge(resource, res)
+    end
+  end
+
+  def get_child_resources(host, catalog, resource, file)
+    sourceselect = file[:sourceselect]
+    children = {}
+
+    source = resource[:source]
+
+    # This is largely a copy of recurse_remote in File
+    total = file[:source].collect do |source|
+      next unless result = file.perform_recursion(source)
+      return if top = result.find { |r| r.relative_path == "." } and top.ftype != "directory"
+      result.each { |data| data.source = "#{source}/#{data.relative_path}" }
+      break result if result and ! result.empty? and sourceselect == :first
+      result
+    end.flatten
+
+    # This only happens if we have sourceselect == :all
+    unless sourceselect == :first
+      found = []
+      total.reject! do |data|
+        result = found.include?(data.relative_path)
+        found << data.relative_path unless found.include?(data.relative_path)
+        result
+      end
+    end
+
+    total.each do |meta|
+      # This is the top-level parent directory
+      if meta.relative_path == "."
+        replace_metadata(host, resource, meta)
+        next
+      end
+      children[meta.relative_path] ||= Puppet::Resource.new(:file, File.join(file[:path], meta.relative_path))
+
+      # I think this is safe since it's a URL, not an actual file
+      children[meta.relative_path][:source] = source + "/" + meta.relative_path
+      replace_metadata(host, children[meta.relative_path], meta)
+    end
+
+    children
+  end
+
+  def remove_existing_resources(children, catalog)
+    existing_names = catalog.resources.collect { |r| r.to_s }
+
+    both = (existing_names & children.keys).inject({}) { |hash, name| hash[name] = true; hash }
+    
+    both.each { |name| children.delete(name) }
+  end
+
+  def store_content(resource)
+    @summer ||= Object.new
+    @summer.extend(Puppet::Util::Checksums)
+
+    type = @summer.sumtype(resource[:content])
+    sum = @summer.sumdata(resource[:content])
+
+    if Puppet::FileBucket::File.indirection.find("#{type}/#{sum}")
+      Puppet.info "Content for '#{resource[:source]}' already exists"
+    else
+      Puppet.info "Storing content for source '#{resource[:source]}'"
+      content = Puppet::FileServing::Content.find(resource[:source])
+      Puppet::FileBucket::File.new(content.content).save
+    end
+  end
+end
-- 
cgit 


From b4e9791df5c01183ff037a346361ed3667e67552 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 16:09:21 -0700
Subject: maint: handle incoherent Test::Unit assertions.

So, it turns out that the 1.8.7 Test::Unit assertions are a bit quirky.  If we
use 'assert_match' it will turn a String into a regular expression by passing
it through Regexp.quote automatically.

If you use 'assert_no_match', though, it will not do that.  It will just
complain that it isn't a Regexp and blow up.  So, we manually quote outside
the assertion in both cases, and things should just work.
---
 acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
index 51220d4d4..0d4dd6b5d 100644
--- a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
+++ b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
@@ -14,7 +14,7 @@ manifest = %Q{
 apply_manifest_on(agents, manifest) do
   # Note: using strings in the match, because I want them regexp-escaped,
   # and the assertion code will do that automatically. --daniel 2011-06-07
-  assert_match('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true', stdout, "the after dependency must be reported")
-  assert_no_match('Class[Foo]', stdout, 'the class should not be mentioned')
-  assert_no_match('Stage[Main]', stdout, 'the class should not be mentioned')
+  assert_match(Regexp.quote('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true'), stdout, "the after dependency must be reported")
+  assert_no_match(Regexp.quote('Class[Foo]'), stdout, 'the class should not be mentioned')
+  assert_no_match(Regexp.quote('Stage[Main]'), stdout, 'the class should not be mentioned')
 end
-- 
cgit 


From 0ae4732fd9058c2ae67f664c545dbd1846cef2df Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 16:52:39 -0700
Subject: (#7828) Fix whitespace in synopsis generator.

We accidentally omitted whitespace between multiple options while building the
synopsis.  This fixes that, by introducing a breakable space in the right
location.

Additionally, we extract the code that was 99 percent identical from the face
and action synopsis generators, push it down into the documentation module,
and then invoke it from both places.

This eliminates the duplicate code, allowing me to fix that bug once and have
it apply to both parts of the code; this is pretty much assured to be true
any time we change the synopsis generation.

Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
---
 lib/puppet/interface.rb                   | 21 +------------------
 lib/puppet/interface/action.rb            | 23 +--------------------
 lib/puppet/interface/documentation.rb     | 31 ++++++++++++++++++++++++++++
 spec/unit/interface/documentation_spec.rb | 34 +++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 42 deletions(-)
 create mode 100755 spec/unit/interface/documentation_spec.rb

diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
index 10e2ec8d7..6be8b6930 100644
--- a/lib/puppet/interface.rb
+++ b/lib/puppet/interface.rb
@@ -76,26 +76,7 @@ class Puppet::Interface
   # splits out this should merge into a module that both the action and face
   # include. --daniel 2011-04-17
   def synopsis
-    output = PrettyPrint.format do |s|
-      s.text("puppet #{name} <action>")
-      s.breakable
-
-      options.each do |option|
-        option = get_option(option)
-        wrap = option.required? ? %w{ < > } : %w{ [ ] }
-
-        s.group(0, *wrap) do
-          option.optparse.each do |item|
-            unless s.current_group.first?
-              s.breakable
-              s.text '|'
-              s.breakable
-            end
-            s.text item
-          end
-        end
-      end
-    end
+    build_synopsis self.name, '<action>'
   end
 
 
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb
index 748888c2e..185302b07 100644
--- a/lib/puppet/interface/action.rb
+++ b/lib/puppet/interface/action.rb
@@ -48,28 +48,7 @@ class Puppet::Interface::Action
   attr_doc :returns
   attr_doc :arguments
   def synopsis
-    output = PrettyPrint.format do |s|
-      s.text("puppet #{@face.name}")
-      s.text(" #{name}") unless default?
-      s.breakable
-
-      options.each do |option|
-        option = get_option(option)
-        wrap = option.required? ? %w{ < > } : %w{ [ ] }
-
-        s.group(0, *wrap) do
-          option.optparse.each do |item|
-            unless s.current_group.first?
-              s.breakable
-              s.text '|'
-              s.breakable
-            end
-            s.text item
-          end
-        end
-      end
-      s.text(" #{arguments}") if arguments
-    end
+    build_synopsis(@face.name, default? ? nil : name, arguments)
   end
 
   ########################################################################
diff --git a/lib/puppet/interface/documentation.rb b/lib/puppet/interface/documentation.rb
index fcaec2568..47e478a44 100644
--- a/lib/puppet/interface/documentation.rb
+++ b/lib/puppet/interface/documentation.rb
@@ -61,6 +61,37 @@ class Puppet::Interface
     end
 
     attr_doc :description
+
+    def build_synopsis(face, action = nil, arguments = nil)
+      output = PrettyPrint.format do |s|
+        s.text("puppet #{face}")
+        s.text(" #{action}") unless action.nil?
+        s.text(" ")
+
+        options.each do |option|
+          option = get_option(option)
+          wrap = option.required? ? %w{ < > } : %w{ [ ] }
+
+          s.group(0, *wrap) do
+            option.optparse.each do |item|
+              unless s.current_group.first?
+                s.breakable
+                s.text '|'
+                s.breakable
+              end
+              s.text item
+            end
+          end
+
+          s.breakable
+        end
+
+        if arguments then
+          s.text arguments.to_s
+        end
+      end
+    end
+
   end
 
   module FullDocs
diff --git a/spec/unit/interface/documentation_spec.rb b/spec/unit/interface/documentation_spec.rb
new file mode 100755
index 000000000..6865b9073
--- /dev/null
+++ b/spec/unit/interface/documentation_spec.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/interface'
+require 'puppet/interface/option'
+require 'puppet/interface/documentation'
+
+class Puppet::Interface::TinyDocs::Test
+  include Puppet::Interface::TinyDocs
+  attr_accessor :name, :options
+  def initialize
+    self.name    = "tinydoc-test"
+    self.options = []
+  end
+
+  def get_option(name)
+    Puppet::Interface::Option.new(nil, "--#{name}")
+  end
+end
+
+describe Puppet::Interface::TinyDocs do
+  subject { Puppet::Interface::TinyDocs::Test.new }
+
+  context "#build_synopsis" do
+    before :each do
+      subject.options = [:foo, :bar]
+    end
+
+    it { should respond_to :build_synopsis }
+
+    it "should put a space between options (#7828)" do
+      subject.build_synopsis('baz').should =~ /#{Regexp.quote('[--foo] [--bar]')}/
+    end
+  end
+end
-- 
cgit 


From 8c71df2af5ef281849b56eebfa42ad8372c3edca Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 17:05:14 -0700
Subject: maint: acceptance tests need to search for bin/false

Because Mac and Linux systems hide bin/false in different places, we should
have the catalog we are testing with search for it in the candidate places.
---
 acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
index 0d4dd6b5d..0941c030c 100644
--- a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
+++ b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
@@ -2,7 +2,7 @@ test_name "#7728: Don't log whits on resource failure"
 
 manifest = %Q{
   class foo {
-    exec { "test": command => "/usr/bin/false" }
+    exec { "test": command => "false", path => ['/bin', '/usr/bin'] }
 
     notify { "before": before  => Exec["test"] }
     notify { "after":  require => Exec["test"] }
-- 
cgit 


From 90d2cf0a7b2f3fc0d16f07abb11e204dc1ed0028 Mon Sep 17 00:00:00 2001
From: Daniel Pittman <daniel@puppetlabs.com>
Date: Tue, 7 Jun 2011 17:16:35 -0700
Subject: maint: more work on regexp matching in Test::Unit assertions.

---
 acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
index 0941c030c..eaa95ff55 100644
--- a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
+++ b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
@@ -12,9 +12,7 @@ manifest = %Q{
 }
 
 apply_manifest_on(agents, manifest) do
-  # Note: using strings in the match, because I want them regexp-escaped,
-  # and the assertion code will do that automatically. --daniel 2011-06-07
-  assert_match(Regexp.quote('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true'), stdout, "the after dependency must be reported")
-  assert_no_match(Regexp.quote('Class[Foo]'), stdout, 'the class should not be mentioned')
-  assert_no_match(Regexp.quote('Stage[Main]'), stdout, 'the class should not be mentioned')
+  assert_match(Regexp.new(Regexp.quote('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true')), stdout, "the after dependency must be reported")
+  assert_no_match(Regexp.new(Regexp.quote('Class[Foo]')), stdout, 'the class should not be mentioned')
+  assert_no_match(Regexp.new(Regexp.quote('Stage[Main]')), stdout, 'the class should not be mentioned')
 end
-- 
cgit 


From f370d5a9e2587c067c458eca65198dbf90c800a6 Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Wed, 8 Jun 2011 15:04:51 -0700
Subject: (#7833) Several help text/template edits

This commit makes the following changes:

* Changes wrapping on some "returns" blocks to accomodate the way we prepend
  "RETURNS: " to the first line in short help.
* Overrides description for save on faces where save is invalid. (Since save has
  an inherited description, the description was contradicting the summary.)
* Adds notes on dummy arguments to short_description where applicable, so as to
  show up in short help.
* Adds the termini list to the action short help template.
* Removes the authors block from short help for faces. (Save it for the man page.)
* Several trivial wording changes.

Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
---
 lib/puppet/face/catalog.rb                     |  4 +--
 lib/puppet/face/certificate.rb                 |  3 +-
 lib/puppet/face/certificate_request.rb         | 27 ++++++++++------
 lib/puppet/face/certificate_revocation_list.rb | 43 +++++++++++++++++++-------
 lib/puppet/face/config.rb                      |  4 +--
 lib/puppet/face/facts.rb                       |  3 +-
 lib/puppet/face/help/action.erb                |  4 +++
 lib/puppet/face/help/face.erb                  |  5 ---
 lib/puppet/face/node.rb                        |  1 +
 lib/puppet/face/resource_type.rb               |  1 +
 lib/puppet/face/status.rb                      | 12 ++++++-
 11 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/lib/puppet/face/catalog.rb b/lib/puppet/face/catalog.rb
index 9bcaa19c6..10b15d250 100644
--- a/lib/puppet/face/catalog.rb
+++ b/lib/puppet/face/catalog.rb
@@ -38,8 +38,8 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
       the source of the catalog can be managed with the `--terminus` option.
     EOT
     returns <<-'EOT'
-      Nothing. When used from the Ruby API, returns a Puppet::Transaction::Report
-      object.
+      Nothing. When used from the Ruby API, returns a
+      Puppet::Transaction::Report object.
     EOT
     examples <<-'EOT'
       Apply the locally cached catalog:
diff --git a/lib/puppet/face/certificate.rb b/lib/puppet/face/certificate.rb
index cb0f61e3b..9a306da37 100644
--- a/lib/puppet/face/certificate.rb
+++ b/lib/puppet/face/certificate.rb
@@ -15,7 +15,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   EOT
 
   option "--ca-location LOCATION" do
-    summary "The certificate authority to query (local or remote)."
+    summary "Which certificate authority to use (local or remote)."
     description <<-'EOT'
       Whether to act on the local certificate authority or one provided by a
       remote puppet master. Allowed values are 'local' and 'remote.'
@@ -111,4 +111,5 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
   get_action(:search).summary "Invalid for this subcommand."
   get_action(:save).summary "Invalid for this subcommand."
+  get_action(:save).description "Invalid for this subcommand."
 end
diff --git a/lib/puppet/face/certificate_request.rb b/lib/puppet/face/certificate_request.rb
index 12694ba21..774821f12 100644
--- a/lib/puppet/face/certificate_request.rb
+++ b/lib/puppet/face/certificate_request.rb
@@ -12,30 +12,39 @@ Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
   # Per-action doc overrides
   get_action(:destroy).summary "Invalid for this subcommand."
 
-  get_action(:find).summary "Retrieve a single CSR."
-  get_action(:find).arguments "<host>"
-  get_action(:find).returns <<-'EOT'
+  find = get_action(:find)
+  find.summary "Retrieve a single CSR."
+  find.arguments "<host>"
+  find.returns <<-'EOT'
     A single certificate request. When used from the Ruby API, returns a
     Puppet::SSL::CertificateRequest object.
 
     RENDERING ISSUES: In most cases, you will want to render this as a string
     ('--render-as s').
   EOT
-  get_action(:find).examples <<-'EOT'
+  find.examples <<-'EOT'
     Retrieve a single CSR from the puppet master's CA:
 
     $ puppet certificate_request find somenode.puppetlabs.lan --terminus rest
   EOT
 
-  get_action(:search).summary "Retrieve all outstanding CSRs."
-  get_action(:search).arguments "<dummy_key>"
-  get_action(:search).returns <<-'EOT'
+  search = get_action(:search)
+  search.summary "Retrieve all outstanding CSRs."
+  search.arguments "<dummy_text>"
+  search.returns <<-'EOT'
     A list of certificate requests; be sure to to render this as a string
     ('--render-as s'). When used from the Ruby API, returns an array of
     Puppet::SSL::CertificateRequest objects.
   EOT
-  get_action(:search).notes "This action always returns all CSRs, but requires a dummy search key."
-  get_action(:search).examples <<-'EOT'
+  search.short_description <<-EOT
+    Retrieves all outstanding certificate signing requests. Due to a known bug,
+    this action requires a dummy search key, the content of which is irrelevant.
+  EOT
+  search.notes <<-EOT
+    Although this action always returns all CSRs, it requires a dummy search
+    key; this is a known bug.
+  EOT
+  search.examples <<-'EOT'
     Retrieve all CSRs from the local CA (similar to 'puppet cert list'):
 
     $ puppet certificate_request search x --terminus ca
diff --git a/lib/puppet/face/certificate_revocation_list.rb b/lib/puppet/face/certificate_revocation_list.rb
index 12ba1f73f..f58368f75 100644
--- a/lib/puppet/face/certificate_revocation_list.rb
+++ b/lib/puppet/face/certificate_revocation_list.rb
@@ -10,30 +10,51 @@ Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
     list from the CA.
   EOT
 
-  get_action(:find).summary "Retrieve the certificate revocation list."
-  get_action(:find).arguments "<dummy_key>"
-  get_action(:find).returns <<-'EOT'
-    A certificate revocation list. When used from the Ruby API: returns an
+  find = get_action(:find)
+  find.summary "Retrieve the certificate revocation list."
+  find.arguments "<dummy_text>"
+  find.returns <<-'EOT'
+    The certificate revocation list. When used from the Ruby API: returns an
     OpenSSL::X509::CRL object.
 
     RENDERING ISSUES: this should usually be rendered as a string
     ('--render-as s').
   EOT
-  get_action(:find).examples <<-'EXAMPLES'
+  find.short_description <<-EOT
+    Retrieves the certificate revocation list. Due to a known bug, this action
+    requires a dummy argument, the content of which is irrelevant.
+  EOT
+  find.notes <<-EOT
+    Although this action always returns the CRL from the specified terminus, it
+    requires a dummy argument; this is a known bug.
+  EOT
+  find.examples <<-'EXAMPLES'
     Retrieve a copy of the puppet master's CRL:
 
     $ puppet certificate_revocation_list find crl --terminus rest
   EXAMPLES
 
-  get_action(:destroy).summary "Delete the certificate revocation list."
-  get_action(:destroy).arguments "<dummy_key>"
-  get_action(:destroy).returns "Nothing."
-  get_action(:destroy).description <<-'EOT'
+  destroy = get_action(:destroy)
+  destroy.summary "Delete the certificate revocation list."
+  destroy.arguments "<dummy_text>"
+  destroy.returns "Nothing."
+  destroy.description <<-'EOT'
     Deletes the certificate revocation list. This cannot be done over REST, but
-    it is possible to delete the locally cached copy or (if run from the CA) the
-    CA's own copy of the CRL.
+    it is possible to delete the locally cached copy or the local CA's copy of
+    the CRL.
+  EOT
+  destroy.short_description <<-EOT
+    Deletes the certificate revocation list. This cannot be done over REST, but
+    it is possible to delete the locally cached copy or the local CA's copy of
+    the CRL. Due to a known bug, this action requires a dummy argument, the
+    content of which is irrelevant.
+  EOT
+  destroy.notes <<-EOT
+    Although this action always deletes the CRL from the specified terminus, it
+    requires a dummy argument; this is a known bug.
   EOT
 
   get_action(:search).summary "Invalid for this subcommand."
   get_action(:save).summary "Invalid for this subcommand."
+  get_action(:save).description "Invalid for this subcommand."
 end
diff --git a/lib/puppet/face/config.rb b/lib/puppet/face/config.rb
index 3fce0ed70..05fc40684 100644
--- a/lib/puppet/face/config.rb
+++ b/lib/puppet/face/config.rb
@@ -10,8 +10,8 @@ Puppet::Face.define(:config, '0.0.1') do
     summary "Examine Puppet's current configuration settings."
     arguments "(all | <setting> [<setting> ...]"
     returns <<-'EOT'
-      A single value when called with one config setting, and a list of settings
-      and values when called with multiple options or "all."
+      A single value when called with one config setting, and a list of
+      settings and values when called with multiple options or "all."
     EOT
     description <<-'EOT'
       Prints the value of a single configuration option or a list of
diff --git a/lib/puppet/face/facts.rb b/lib/puppet/face/facts.rb
index 99ff14bd9..9d83e3d44 100644
--- a/lib/puppet/face/facts.rb
+++ b/lib/puppet/face/facts.rb
@@ -25,7 +25,8 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
     of facts for the requested node. When used from the Ruby API: A
     Puppet::Node::Facts object.
 
-    RENDERING ISSUES: Facts cannot currently be rendered as a string.
+    RENDERING ISSUES: Facts cannot currently be rendered as a string; use yaml
+    or json.
   EOT
   find.notes <<-'EOT'
     When using the `facter` terminus, the host argument is ignored.
diff --git a/lib/puppet/face/help/action.erb b/lib/puppet/face/help/action.erb
index 5242ed218..c84e46cf9 100644
--- a/lib/puppet/face/help/action.erb
+++ b/lib/puppet/face/help/action.erb
@@ -46,4 +46,8 @@ undocumented option
       end -%>
 <% end -%>
 
+<% if face.respond_to? :indirection -%>
+TERMINI: <%= face.class.terminus_classes(face.indirection.name).join(", ") %>
+
+<% end -%>
 See 'puppet man <%= face.name %>' or 'man puppet-<%= face.name %>' for full help.
diff --git a/lib/puppet/face/help/face.erb b/lib/puppet/face/help/face.erb
index 870cc547f..255d3d55b 100644
--- a/lib/puppet/face/help/face.erb
+++ b/lib/puppet/face/help/face.erb
@@ -75,10 +75,5 @@ end -%>
 <% if face.respond_to? :indirection -%>
 TERMINI: <%= face.class.terminus_classes(face.indirection.name).join(", ") %>
 
-<% end
-   unless face.authors.empty? -%>
-AUTHOR
-<%= face.authors.join("\n").gsub(/^/, ' * ') %>
-
 <% end -%>
 See 'puppet man <%= face.name %>' or 'man puppet-<%= face.name %>' for full help.
diff --git a/lib/puppet/face/node.rb b/lib/puppet/face/node.rb
index cd27e0b26..1153ad447 100644
--- a/lib/puppet/face/node.rb
+++ b/lib/puppet/face/node.rb
@@ -13,6 +13,7 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
   get_action(:destroy).summary "Invalid for this subcommand."
   get_action(:search).summary "Invalid for this subcommand."
   get_action(:save).summary "Invalid for this subcommand."
+  get_action(:save).description "Invalid for this subcommand."
 
   find = get_action(:find)
   find.summary "Retrieve a node object."
diff --git a/lib/puppet/face/resource_type.rb b/lib/puppet/face/resource_type.rb
index dc6d9de90..3cd28daa3 100644
--- a/lib/puppet/face/resource_type.rb
+++ b/lib/puppet/face/resource_type.rb
@@ -30,6 +30,7 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
 
   # Action documentation overrides:
   get_action(:save).summary = "Invalid for this subcommand."
+  get_action(:save).description "Invalid for this subcommand."
   get_action(:destroy).summary = "Invalid for this subcommand."
 
   find = get_action(:find)
diff --git a/lib/puppet/face/status.rb b/lib/puppet/face/status.rb
index 690c6b371..bdb0c4d26 100644
--- a/lib/puppet/face/status.rb
+++ b/lib/puppet/face/status.rb
@@ -8,11 +8,12 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
   get_action(:destroy).summary "Invalid for this subcommand."
   get_action(:save).summary "Invalid for this subcommand."
+  get_action(:save).description "Invalid for this subcommand."
   get_action(:search).summary "Invalid for this subcommand."
 
   find = get_action(:find)
   find.summary "Check status of puppet master server."
-  find.arguments "<dummy_key>"
+  find.arguments "<dummy_text>"
   find.returns <<-'EOT'
     A "true" response or a low-level connection error. When used from the Ruby
     API: returns a Puppet::Status object.
@@ -28,11 +29,20 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
     <--listen> option, you can set set the global <--server> and <--masterport>
     options on the command line; note that agent nodes listen on port 8139.
   EOT
+  find.short_description <<-EOT
+    Checks whether a Puppet server is properly receiving and processing HTTP
+    requests. Due to a known bug, this action requires a dummy argument, the
+    content of which is irrelevant. This action is only useful when used with
+    '--terminus rest', and will always return true when invoked locally.
+  EOT
   find.notes <<-'EOT'
     This action requires that the server's `auth.conf` file allow find
     access to the `status` REST terminus. Puppet agent does not use this
     facility, and it is turned off by default. See
     <http://docs.puppetlabs.com/guides/rest_auth_conf.html> for more details.
+
+    Although this action always returns an unnamed status object, it requires a
+    dummy argument. This is a known bug.
   EOT
   find.examples <<-'EOT'
     Check the status of the configured puppet master:
-- 
cgit 


From 50d188cc2f447a17b43b5bc7c9db5f7430826529 Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Wed, 8 Jun 2011 17:18:15 -0700
Subject: Maint: Update static man page generator for Faces.

The man page updater wasn't making man pages for the new Faces app. This commit
gives it that capability, and handles the name collision on puppet resource.

Reviewed-By: Nick Lewis <nick@puppetlabs.com>
---
 tasks/rake/manpages.rake | 54 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/tasks/rake/manpages.rake b/tasks/rake/manpages.rake
index f7275e4c3..a2dc850c8 100644
--- a/tasks/rake/manpages.rake
+++ b/tasks/rake/manpages.rake
@@ -2,36 +2,68 @@
 
 desc "Build Puppet manpages"
 task :gen_manpages do
+  require 'puppet/face'
+  require 'fileutils'
 
+  helpface = Puppet::Face[:help, '0.0.1']
+  manface  = Puppet::Face[:man, '0.0.1']
   sbins = Dir.glob(%w{sbin/*})
   bins  = Dir.glob(%w{bin/*})
-  applications  = Dir.glob(%w{lib/puppet/application/*})
+  non_face_applications = helpface.legacy_applications
+  faces = Puppet::Face.faces
+  ronn_args = '--manual="Puppet manual" --organization="Puppet Labs, LLC" -r'
+
   # Locate ronn
   ronn = %x{which ronn}.chomp
   unless File.executable?(ronn) then fail("Ronn does not appear to be installed.") end
 
+#   def write_manpage(text, filename)
+#     IO.popen("#{ronn} #{ronn_args} -r > #{filename}") do |fh| fh.write text end
+#   end
+
   # Create puppet.conf.5 man page
+#   IO.popen("#{ronn} #{ronn_args} > ./man/man5/puppet.conf.5", 'w') do |fh|
+#     fh.write %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration}
+#   end
   %x{RUBYLIB=./lib:$RUBYLIB bin/puppetdoc --reference configuration > ./man/man5/puppetconf.5.ronn}
-  %x{#{ronn} --manual="Puppet manual" --organization="Puppet Labs, LLC" -r ./man/man5/puppetconf.5.ronn}
-  File.move("./man/man5/puppetconf.5", "./man/man5/puppet.conf.5")
-  File.unlink("./man/man5/puppetconf.5.ronn")
+  %x{#{ronn} #{ronn_args} ./man/man5/puppetconf.5.ronn}
+  FileUtils.mv("./man/man5/puppetconf.5", "./man/man5/puppet.conf.5")
+  FileUtils.rm("./man/man5/puppetconf.5.ronn")
 
   # Create LEGACY binary man pages (i.e. delete me for 2.8.0)
   binary = bins + sbins
   binary.each do |bin|
     b = bin.gsub( /^s?bin\//, "")
     %x{RUBYLIB=./lib:$RUBYLIB #{bin} --help > ./man/man8/#{b}.8.ronn}
-    %x{#{ronn} --manual="Puppet manual" --organization="Puppet Labs, LLC" -r ./man/man8/#{b}.8.ronn}
-    File.unlink("./man/man8/#{b}.8.ronn")
+    %x{#{ronn} #{ronn_args} ./man/man8/#{b}.8.ronn}
+    FileUtils.rm("./man/man8/#{b}.8.ronn")
   end
 
-  # Create modern binary man pages
-  applications.each do |app|
-    app.gsub!( /^lib\/puppet\/application\/(.*?)\.rb/, '\1')
+  # Create regular non-face man pages
+  non_face_applications.each do |app|
     %x{RUBYLIB=./lib:$RUBYLIB bin/puppet #{app} --help > ./man/man8/puppet-#{app}.8.ronn}
-    %x{#{ronn} --manual="Puppet manual" --organization="Puppet Labs, LLC" -r ./man/man8/puppet-#{app}.8.ronn}
-    File.unlink("./man/man8/puppet-#{app}.8.ronn")
+    %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{app}.8.ronn}
+    FileUtils.rm("./man/man8/puppet-#{app}.8.ronn")
+  end
+
+  # Create face man pages
+  faces.each do |face|
+    File.open("./man/man8/puppet-#{face}.8.ronn", 'w') do |fh|
+      # For some reason no one understands at the moment, it duplicates termini,
+      # so we have to remove the dupes with a gsub.
+      fh.write manface.man("#{face}", {:render_as => :s}).gsub(/^(\* `[^`]+`)\n\1/, '\1')
+    end
+
+    %x{#{ronn} #{ronn_args} ./man/man8/puppet-#{face}.8.ronn}
+    FileUtils.rm("./man/man8/puppet-#{face}.8.ronn")
   end
 
+  # Vile hack: create puppet resource man page
+  # Currently, the useless resource face wins against puppet resource in puppet
+  # man. (And actually, it even gets removed from the list of legacy
+  # applications.) So we overwrite it with the correct man page at the end.
+  %x{RUBYLIB=./lib:$RUBYLIB bin/puppet resource --help > ./man/man8/puppet-resource.8.ronn}
+  %x{#{ronn} #{ronn_args} ./man/man8/puppet-resource.8.ronn}
+  FileUtils.rm("./man/man8/puppet-resource.8.ronn")
 
 end
\ No newline at end of file
-- 
cgit 


From dbe2310dda94fb19fe767286ff26a51d934f8d60 Mon Sep 17 00:00:00 2001
From: nfagerlund <nick.fagerlund@gmail.com>
Date: Wed, 8 Jun 2011 17:19:18 -0700
Subject: Maint: Update static man pages for 2.7.0

This commit updates the static man pages for the final 2.7.0 release.

Reviewed-By: Nick Lewis <nick@puppetlabs.com>
---
 man/man5/puppet.conf.5                        | 163 ++++-----------
 man/man8/filebucket.8                         |   4 +-
 man/man8/pi.8                                 |   4 +-
 man/man8/puppet-agent.8                       |  19 +-
 man/man8/puppet-apply.8                       |   4 +-
 man/man8/puppet-catalog.8                     | 286 ++++++++++++++++++++++++++
 man/man8/puppet-cert.8                        |  73 +++----
 man/man8/puppet-certificate.8                 | 229 +++++++++++++++++++++
 man/man8/puppet-certificate_request.8         | 168 +++++++++++++++
 man/man8/puppet-certificate_revocation_list.8 | 165 +++++++++++++++
 man/man8/puppet-config.8                      |  80 +++++++
 man/man8/puppet-describe.8                    |   4 +-
 man/man8/puppet-device.8                      |  86 ++++++++
 man/man8/puppet-doc.8                         |   4 +-
 man/man8/puppet-facts.8                       | 217 +++++++++++++++++++
 man/man8/puppet-file.8                        | 225 ++++++++++++++++++++
 man/man8/puppet-filebucket.8                  |   4 +-
 man/man8/puppet-help.8                        |  71 +++++++
 man/man8/puppet-inspect.8                     |   4 +-
 man/man8/puppet-key.8                         | 126 ++++++++++++
 man/man8/puppet-kick.8                        |  28 +--
 man/man8/puppet-man.8                         |  74 +++++++
 man/man8/puppet-master.8                      |  15 +-
 man/man8/puppet-node.8                        | 171 +++++++++++++++
 man/man8/puppet-parser.8                      |  71 +++++++
 man/man8/puppet-plugin.8                      |  77 +++++++
 man/man8/puppet-queue.8                       |   4 +-
 man/man8/puppet-report.8                      | 187 +++++++++++++++++
 man/man8/puppet-resource.8                    |   4 +-
 man/man8/puppet-resource_type.8               | 214 +++++++++++++++++++
 man/man8/puppet-secret_agent.8                |  74 +++++++
 man/man8/puppet-status.8                      | 150 ++++++++++++++
 man/man8/puppet.8                             |   4 +-
 man/man8/puppetca.8                           |  73 +++----
 man/man8/puppetd.8                            |  19 +-
 man/man8/puppetdoc.8                          |   4 +-
 man/man8/puppetmasterd.8                      |  15 +-
 man/man8/puppetqd.8                           |   4 +-
 man/man8/puppetrun.8                          |  28 +--
 man/man8/ralsh.8                              |   4 +-
 40 files changed, 2879 insertions(+), 277 deletions(-)
 create mode 100644 man/man8/puppet-catalog.8
 create mode 100644 man/man8/puppet-certificate.8
 create mode 100644 man/man8/puppet-certificate_request.8
 create mode 100644 man/man8/puppet-certificate_revocation_list.8
 create mode 100644 man/man8/puppet-config.8
 create mode 100644 man/man8/puppet-device.8
 create mode 100644 man/man8/puppet-facts.8
 create mode 100644 man/man8/puppet-file.8
 create mode 100644 man/man8/puppet-help.8
 create mode 100644 man/man8/puppet-key.8
 create mode 100644 man/man8/puppet-man.8
 create mode 100644 man/man8/puppet-node.8
 create mode 100644 man/man8/puppet-parser.8
 create mode 100644 man/man8/puppet-plugin.8
 create mode 100644 man/man8/puppet-report.8
 create mode 100644 man/man8/puppet-resource_type.8
 create mode 100644 man/man8/puppet-secret_agent.8
 create mode 100644 man/man8/puppet-status.8

diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
index 930cec533..aa747bdd4 100644
--- a/man/man5/puppet.conf.5
+++ b/man/man5/puppet.conf.5
@@ -1,136 +1,33 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "April 2011" "Puppet Labs, LLC" "Puppet manual"
-\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Apr 13 14:24:43 \-0700 2011)\fR
+.TH "PUPPETCONF" "5" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Jun 08 17:09:41 \-0700 2011)\fR
 .
-.SH "Specifying Configuration Parameters"
+.SH "Configuration Settings"
 .
-.SS "On The Command\-Line"
-Every Puppet executable (with the exception of \fBpuppetdoc\fR) accepts all of the parameters below, but not all of the arguments make sense for every executable\.
-.
-.P
-I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not\.
-.
-.P
-These parameters can be supplied to the executables either as command\-line options or in the configuration file\. For instance, the command\-line invocation below would set the configuration directory to \fB/private/puppet\fR:
-.
-.IP "" 4
-.
-.nf
-
-$ puppet agent \-\-confdir=/private/puppet
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Note that boolean options are turned on and off with a slightly different syntax on the command line:
-.
-.IP "" 4
-.
-.nf
-
-$ puppet agent \-\-storeconfigs
-
-$ puppet agent \-\-no\-storeconfigs
-.
-.fi
-.
-.IP "" 0
-.
-.P
-The invocations above will enable and disable, respectively, the storage of the client configuration\.
-.
-.SS "Configuration Files"
-As mentioned above, the configuration parameters can also be stored in a configuration file, located in the configuration directory\. As root, the default configuration directory is \fB/etc/puppet\fR, and as a regular user, the default configuration directory is \fB~user/\.puppet\fR\. As of 0\.23\.0, all executables look for \fBpuppet\.conf\fR in their configuration directory (although they previously looked for separate files)\. For example, \fBpuppet\.conf\fR is located at \fB/etc/puppet/puppet\.conf\fR as \fBroot\fR and \fB~user/\.puppet/puppet\.conf\fR as a regular user by default\.
-.
-.P
-All executables will set any parameters set within the \fB[main]\fR section, and each executable will also use one of the \fB[master]\fR, \fB[agent]\fR\.
-.
-.P
-The file follows INI\-style formatting\. Here is an example of a very simple \fBpuppet\.conf\fR file:
-.
-.IP "" 4
-.
-.nf
-
-[main]
-  confdir = /private/puppet
-  storeconfigs = true
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Note that boolean parameters must be explicitly specified as \fBtrue\fR or \fBfalse\fR as seen above\.
-.
-.P
-If you need to change file or directory parameters (e\.g\., reset the mode or owner), do so within curly braces on the same line:
-.
-.IP "" 4
-.
-.nf
-
-[main]
-  vardir = /new/vardir {owner = root, mode = 644}
-.
-.fi
-.
-.IP "" 0
-.
-.P
-If you\'re starting out with a fresh configuration, you may wish to let the executable generate a template configuration file for you by invoking the executable in question with the \fB\-\-genconfig\fR command\. The executable will print a template configuration to standard output, which can be redirected to a file like so:
-.
-.IP "" 4
-.
-.nf
-
-$ puppet agent \-\-genconfig > /etc/puppet/puppet\.conf
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Note that this invocation will replace the contents of any pre\-existing \fBpuppet\.conf\fR file, so make a backup of your present config if it contains valuable information\.
-.
-.P
-Like the \fB\-\-genconfig\fR argument, the executables also accept a \fB\-\-genmanifest\fR argument, which will generate a manifest that can be used to manage all of Puppet\'s directories and files and prints it to standard output\. This can likewise be redirected to a file:
-.
-.IP "" 4
-.
-.nf
-
-$ puppet agent \-\-genmanifest > /etc/puppet/manifests/site\.pp
-.
-.fi
+.IP "\(bu" 4
+Each of these settings can be specified in \fBpuppet\.conf\fR or on the command line\.
 .
-.IP "" 0
+.IP "\(bu" 4
+When using boolean settings on the command line, use \fB\-\-setting\fR and \fB\-\-no\-setting\fR instead of \fB\-\-setting (true|false)\fR\.
 .
-.P
-Puppet can also create user and group accounts for itself (one \fBpuppet\fR group and one \fBpuppet\fR user) if it is invoked as \fBroot\fR with the \fB\-\-mkusers\fR argument:
+.IP "\(bu" 4
+Settings can be interpolated as \fB$variables\fR in other settings; \fB$environment\fR is special, in that puppet master will interpolate each agent node\'s environment instead of its own\.
 .
-.IP "" 4
+.IP "\(bu" 4
+Multiple values should be specified as comma\-separated lists; multiple directories should be separated with the system path separator (usually a colon)\.
 .
-.nf
-
-$ puppet master \-\-mkusers
+.IP "\(bu" 4
+Settings that take a single file or directory can optionally set the owner, group, and mode for their value: \fBrundir = $vardir/run { owner = puppet, group = puppet, mode = 644 }\fR
 .
-.fi
+.IP "\(bu" 4
+The Puppet executables will ignore any setting that isn\'t relevant to their function\.
 .
 .IP "" 0
 .
-.SH "Signals"
-The \fBpuppet agent\fR and \fBpuppet master\fR executables catch some signals for special handling\. Both daemons catch (\fBSIGHUP\fR), which forces the server to restart tself\. Predictably, interrupt and terminate (\fBSIGINT\fR and \fBSIGTERM\fR) will shut down the server, whether it be an instance of \fBpuppet agent\fR or \fBpuppet master\fR\.
-.
 .P
-Sending the \fBSIGUSR1\fR signal to an instance of \fBpuppet agent\fR will cause it to immediately begin a new configuration transaction with the server\. This signal has no effect on \fBpuppet master\fR\.
-.
-.SH "Configuration Parameter Reference"
-Below is a list of all documented parameters\. Not all of them are valid with all Puppet executables, but the executables will ignore any inappropriate values\.
+See the configuration guide \fIhttp://docs\.puppetlabs\.com/guides/configuring\.html\fR for more details\.
 .
 .SS "allow_duplicate_certs"
 Whether to allow a new certificate request to overwrite an existing certificate\.
@@ -348,7 +245,7 @@ Whether certificate revocation should be supported by downloading a Certificate
 The name to use when handling certificates\. Defaults to the fully qualified domain name\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: nick\-lewiss\-macbook\-pro\.local
+\fIDefault\fR: magpie\.puppetlabs\.lan
 .
 .IP "" 0
 .
@@ -514,6 +411,22 @@ The database user for caching\. Only used when networked databases are used\.
 .
 .IP "" 0
 .
+.SS "deviceconfig"
+Path to the device config file for puppet device
+.
+.IP "\(bu" 4
+\fIDefault\fR: $confdir/device\.conf
+.
+.IP "" 0
+.
+.SS "devicedir"
+The root directory of devices\' $vardir
+.
+.IP "\(bu" 4
+\fIDefault\fR: $vardir/devices
+.
+.IP "" 0
+.
 .SS "diff"
 Which diff command to use when printing differences between files\.
 .
@@ -731,7 +644,7 @@ Where individual hosts store and look for their public key\.
 .IP "" 0
 .
 .SS "http_compression"
-Allow http compression in REST communication with the master\. This setting might improve performance for agent \-> master communications over slow WANs\. Your puppetmaster needs to support compression (usually by activating some settings in a reverse\-proxy in front of the puppetmaster, which rules out webrick)\. It is harmless to activate this settings if your master doesn\'t support compression, but if it supports it, this setting might reduce performance on high\-speed LANs\.
+Allow http compression in REST communication with the master\. This setting might improve performance for agent \-> master communications over slow WANs\. Your puppet master needs to support compression (usually by activating some settings in a reverse\-proxy in front of the puppet master, which rules out webrick)\. It is harmless to activate this settings if your master doesn\'t support compression, but if it supports it, this setting might reduce performance on high\-speed LANs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -940,7 +853,7 @@ An extra search path for Puppet\. This is only useful for those files that Puppe
 .IP "" 0
 .
 .SS "listen"
-Whether puppet agent should listen for connections\. If this is true, then by default only the \fBrunner\fR server is started, which allows remote authorized and authenticated nodes to connect and trigger \fBpuppet agent\fR runs\.
+Whether puppet agent should listen for connections\. If this is true, then puppet agent will accept incoming REST API requests, subject to the default ACLs and the ACLs set in the \fBrest_authconfig\fR file\. Puppet agent can respond usefully to requests on the \fBrun\fR, \fBfacts\fR, \fBcertificate\fR, and \fBresource\fR endpoints\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -1052,7 +965,7 @@ The name of the application, if we are running as one\. The default is essential
 .IP "" 0
 .
 .SS "node_name"
-How the puppetmaster determines the client\'s identity and sets the \'hostname\', \'fqdn\' and \'domain\' facts for use in the manifest, in particular for determining which \'node\' statement applies to the client\. Possible values are \'cert\' (use the subject\'s CN in the client\'s certificate) and \'facter\' (use the hostname that the client reported in its facts)
+How the puppet master determines the client\'s identity and sets the \'hostname\', \'fqdn\' and \'domain\' facts for use in the manifest, in particular for determining which \'node\' statement applies to the client\. Possible values are \'cert\' (use the subject\'s CN in the client\'s certificate) and \'facter\' (use the hostname that the client reported in its facts)
 .
 .IP "\(bu" 4
 \fIDefault\fR: cert
@@ -1269,7 +1182,7 @@ The directory in which to store reports received from the client\. Each client g
 The \'from\' email address for the reports\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: report@Nick\-Lewiss\-MacBook\-Pro\.local
+\fIDefault\fR: report@magpie\.puppetlabs\.lan
 .
 .IP "" 0
 .
@@ -1605,4 +1518,4 @@ Boolean; whether to use the zlib library
 .IP "" 0
 .
 .P
-\fIThis page autogenerated on Wed Apr 13 14:24:43 \-0700 2011\fR
+\fIThis page autogenerated on Wed Jun 08 17:09:41 \-0700 2011\fR
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index 7ff0da9af..990756858 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket
@@ -78,4 +78,4 @@ $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index c54a7bec7..af246f16b 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types
@@ -48,4 +48,4 @@ $ puppet describe user \-s \-m
 David Lutterkort
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-agent.8 b/man/man8/puppet-agent.8
index 3fadd9df7..2e5cedf51 100644
--- a/man/man8/puppet-agent.8
+++ b/man/man8/puppet-agent.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon
@@ -132,8 +132,23 @@ $ puppet agent \-\-server puppet\.domain\.com
 .
 .fi
 .
+.SH "DIAGNOSTICS"
+Puppet agent accepts the following signals:
+.
+.TP
+SIGHUP
+Restart the puppet agent daemon\.
+.
+.TP
+SIGINT and SIGTERM
+Shut down the puppet agent daemon\.
+.
+.TP
+SIGUSR1
+Immediately retrieve and apply configurations from the puppet master\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-apply.8 b/man/man8/puppet-apply.8
index d8d864b56..b93713ff5 100644
--- a/man/man8/puppet-apply.8
+++ b/man/man8/puppet-apply.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-APPLY" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-apply\fR \- Apply Puppet manifests locally
@@ -72,4 +72,4 @@ $ puppet apply \-\-modulepath=/root/dev/modules \-e "include ntpd::server"
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-catalog.8 b/man/man8/puppet-catalog.8
new file mode 100644
index 000000000..e06ddefe7
--- /dev/null
+++ b/man/man8/puppet-catalog.8
@@ -0,0 +1,286 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-CATALOG" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\.
+.
+.SH "SYNOPSIS"
+puppet catalog \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand deals with catalogs, which are compiled per\-node artifacts generated from a set of Puppet manifests\. By default, it interacts with the compiling subsystem and compiles a catalog using the default manifest and \fBcertname\fR, but you can change the source of the catalog with the \fB\-\-terminus\fR option\. You can also choose to print any catalog in \'dot\' format (for easy graph viewing with OmniGraffle or Graphviz) with \'\-\-render\-as dot\'\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBapply\fR \- Find and apply a catalog\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog apply [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Finds and applies a catalog\. This action takes no arguments, but the source of the catalog can be managed with the \fB\-\-terminus\fR option\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\. When used from the Ruby API, returns a Puppet::Transaction::Report object\.
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBdownload\fR \- Download this node\'s catalog from the puppet master server\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog download [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieves a catalog from the puppet master and saves it to the local yaml cache\. This action always contacts the puppet master and will ignore alternate termini\.
+.
+.IP
+The saved catalog can be used in any subsequent catalog action by specifying \'\-\-terminus yaml\' for that action\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+When used from the Ruby API, this action has a side effect of leaving Puppet::Resource::Catalog\.indirection\.terminus_class set to yaml\. The terminus must be explicitly re\-set for subsequent catalog actions\.
+.
+.TP
+\fBfind\fR \- Retrieve the catalog for a node\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog find [\-\-terminus TERMINUS] \fIcertname\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve the catalog for a node\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A serialized catalog\. When used from the Ruby API, returns a Puppet::Resource::Catalog object\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: create or overwrite an object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBselect\fR \- Retrieve a catalog and filter it for resources of a given type\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet catalog select [\-\-terminus TERMINUS] \fIhost\fR \fIresource_type\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieves a catalog for the specified host, then searches it for all resources of the requested type\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A list of resource references ("Type[title]")\. When used from the API, returns an array of Puppet::Resource objects excised from a catalog\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+By default, this action will retrieve a catalog from Puppet\'s compiler subsystem; you must call the action with \fB\-\-terminus rest\fR if you wish to retrieve a catalog from the puppet master\.
+.
+.IP
+FORMATTING ISSUES: This action cannot currently render useful yaml; instead, it returns an entire catalog\. Use json instead\.
+.
+.SH "EXAMPLES"
+\fBapply\fR
+.
+.P
+Apply the locally cached catalog:
+.
+.P
+$ puppet catalog apply \-\-terminus yaml
+.
+.P
+Retrieve a catalog from the master and apply it, in one step:
+.
+.P
+$ puppet catalog apply \-\-terminus rest
+.
+.P
+From \fBsecret_agent\.rb\fR (API example):
+.
+.IP "" 4
+.
+.nf
+
+# \.\.\.
+Puppet::Face[:catalog, \'0\.0\.1\']\.download
+# (Termini are singletons; catalog\.download has a side effect of
+# setting the catalog terminus to yaml)
+report  = Puppet::Face[:catalog, \'0\.0\.1\']\.apply
+# \.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBdownload\fR
+.
+.P
+Retrieve and store a catalog:
+.
+.P
+$ puppet catalog download
+.
+.P
+From \fBsecret_agent\.rb\fR (API example):
+.
+.IP "" 4
+.
+.nf
+
+Puppet::Face[:plugin, \'0\.0\.1\']\.download
+Puppet::Face[:facts, \'0\.0\.1\']\.upload
+Puppet::Face[:catalog, \'0\.0\.1\']\.download
+# \.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBselect\fR
+.
+.P
+Ask the puppet master for a list of managed file resources for a node:
+.
+.P
+$ puppet catalog select \-\-terminus rest somenode\.magpie\.lan file
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBactive_record\fR
+.
+.IP "\(bu" 4
+\fBcompiler\fR
+.
+.IP "\(bu" 4
+\fBqueue\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "\(bu" 4
+\fBstatic_compiler\fR
+.
+.IP "\(bu" 4
+\fByaml\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-cert.8 b/man/man8/puppet-cert.8
index bea7596d4..211f8ca7a 100644
--- a/man/man8/puppet-cert.8
+++ b/man/man8/puppet-cert.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CERT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-CERT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-cert\fR \- Manage certificates and requests
@@ -10,60 +10,67 @@
 Standalone certificate authority\. Capable of generating certificates, but mostly used for signing certificate requests from puppet clients\.
 .
 .SH "USAGE"
-puppet cert [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-g|\-\-generate] [\-l|\-\-list] [\-s|\-\-sign] [\-r|\-\-revoke] [\-p|\-\-print] [\-c|\-\-clean] [\-\-verify] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [host]
+puppet cert \fIaction\fR [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-\-digest \fIdigest\fR] [\fIhost\fR]
 .
 .SH "DESCRIPTION"
 Because the puppet master service defaults to not signing client certificate requests, this script is available for signing outstanding requests\. It can be used to list outstanding requests and then either sign them individually or sign all of them\.
 .
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
+.SH "ACTIONS"
+Every action except \'list\' and \'generate\' requires a hostname to act on, unless the \'\-\-all\' option is set\.
 .
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
+.TP
+clean
+Revoke a host\'s certificate (if applicable) and remove all files related to that host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
 .
 .TP
-\-\-all
-Operate on all items\. Currently only makes sense with \'\-\-sign\', \'\-\-clean\', or \'\-\-list\'\.
+fingerprint
+Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
 .
 .TP
-\-\-digest
-Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
+generate
+Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
 .
 .TP
-\-\-clean
-Remove all files related to a host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. The certificate of the host is also revoked\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
+list
+List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
 .
 .TP
-\-\-debug
-Enable full debugging\.
+print
+Print the full\-text version of a host\'s certificate\.
 .
 .TP
-\-\-generate
-Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
+revoke
+Revoke the certificate of a client\. The certificate can be specified either by its serial number (given as a decimal number or a hexadecimal number prefixed by \'0x\') or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' configuration option\. Note that the puppet master needs to be restarted after revoking certificates\.
 .
 .TP
-\-\-help
-Print this help message
+sign
+Sign an outstanding certificate request\.
 .
 .TP
-\-\-list
-List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
+verify
+Verify the named certificate against the local CA certificate\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
+.
+.P
+See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
 .
 .TP
-\-\-print
-Print the full\-text version of a host\'s certificate\.
+\-\-all
+Operate on all items\. Currently only makes sense with the \'sign\', \'clean\', \'list\', and \'fingerprint\' actions\.
 .
 .TP
-\-\-fingerprint
-Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
+\-\-digest
+Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
 .
 .TP
-\-\-revoke
-Revoke the certificate of a client\. The certificate can be specified either by its serial number, given as a decimal number or a hexadecimal number prefixed by \'0x\', or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' config parameter\. Note that the puppetmasterd needs to be restarted after revoking certificates\.
+\-\-debug
+Enable full debugging\.
 .
 .TP
-\-\-sign
-Sign an outstanding certificate request\. Unless \'\-\-all\' is specified, hosts must be listed after all flags\.
+\-\-help
+Print this help message
 .
 .TP
 \-\-verbose
@@ -73,17 +80,13 @@ Enable verbosity\.
 \-\-version
 Print the puppet version number and exit\.
 .
-.TP
-\-\-verify
-Verify the named certificate against the local CA certificate\.
-.
 .SH "EXAMPLE"
 .
 .nf
 
-$ puppet cert \-l
+$ puppet cert list
 culain\.madstop\.com
-$ puppet cert \-s culain\.madstop\.com
+$ puppet cert sign culain\.madstop\.com
 .
 .fi
 .
@@ -91,4 +94,4 @@ $ puppet cert \-s culain\.madstop\.com
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-certificate.8 b/man/man8/puppet-certificate.8
new file mode 100644
index 000000000..03f2b55e6
--- /dev/null
+++ b/man/man8/puppet-certificate.8
@@ -0,0 +1,229 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-CERTIFICATE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-certificate\fR \- Provide access to the CA for certificate management\.
+.
+.SH "SYNOPSIS"
+puppet certificate \fIaction\fR [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION]
+.
+.SH "DESCRIPTION"
+This subcommand interacts with a local or remote Puppet certificate authority\. Currently, its behavior is not a full superset of \fBpuppet cert\fR; specifically, it is unable to mimic puppet cert\'s "clean" option, and its "generate" action submits a CSR rather than creating a signed certificate\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-ca\-location LOCATION
+Whether to act on the local certificate authority or one provided by a remote puppet master\. Allowed values are \'local\' and \'remote\.\'
+.
+.IP
+This option is required\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Delete a certificate\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate destroy [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Deletes a certificate\. This action currently only works on the local CA\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.TP
+\fBfind\fR \- Retrieve a certificate\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate find [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve a certificate\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+An x509 SSL certificate\. You will usually want to render this as a string (\-\-render\-as s)\.
+.
+.IP
+Note that this action has a side effect of caching a copy of the certificate in Puppet\'s \fBssldir\fR\.
+.
+.TP
+\fBgenerate\fR \- Generate a new certificate signing request\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate generate [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Generates and submits a certificate signing request (CSR) for the specified host\. This CSR will then have to be signed by a user with the proper authorization on the certificate authority\.
+.
+.IP
+Puppet agent usually handles CSR submission automatically\. This action is primarily useful for requesting certificates for individual users and external applications\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate info [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBlist\fR \- List all certificate signing requests\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate list [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+List all certificate signing requests\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+An array of #inspect output from CSR objects\. This output is currently messy, but does contain the names of nodes requesting certificates\. This action returns #inspect strings even when used from the Ruby API\.
+.
+.TP
+\fBsave\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate save [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate search [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsign\fR \- Sign a certificate signing request for HOST\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate sign [\-\-terminus TERMINUS] [\-\-ca\-location LOCATION] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Sign a certificate signing request for HOST\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A string that appears to be (but isn\'t) an x509 certificate\.
+.
+.SH "EXAMPLES"
+\fBgenerate\fR
+.
+.P
+Request a certificate for "somenode" from the site\'s CA:
+.
+.P
+$ puppet certificate generate somenode\.puppetlabs\.lan \-\-ca\-location remote
+.
+.P
+\fBsign\fR
+.
+.P
+Sign somenode\.puppetlabs\.lan\'s certificate:
+.
+.P
+$ puppet certificate sign somenode\.puppetlabs\.lan \-\-ca\-location remote
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBca\fR
+.
+.IP "\(bu" 4
+\fBfile\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-certificate_request.8 b/man/man8/puppet-certificate_request.8
new file mode 100644
index 000000000..faeb5a06c
--- /dev/null
+++ b/man/man8/puppet-certificate_request.8
@@ -0,0 +1,168 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-CERTIFICATE_REQUEST" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-certificate_request\fR \- Manage certificate requests\.
+.
+.SH "SYNOPSIS"
+puppet certificate_request \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand retrieves and submits certificate signing requests (CSRs)\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_request destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBfind\fR \- Retrieve a single CSR\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_request find [\-\-terminus TERMINUS] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve a single CSR\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A single certificate request\. When used from the Ruby API, returns a Puppet::SSL::CertificateRequest object\.
+.
+.IP
+RENDERING ISSUES: In most cases, you will want to render this as a string (\'\-\-render\-as s\')\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_request info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: submit a certificate signing request\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_request save [\-\-terminus TERMINUS] \fIx509_CSR\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.TP
+\fBsearch\fR \- Retrieve all outstanding CSRs\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_request search [\-\-terminus TERMINUS] \fIdummy_text\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve all outstanding CSRs\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A list of certificate requests; be sure to to render this as a string (\'\-\-render\-as s\')\. When used from the Ruby API, returns an array of Puppet::SSL::CertificateRequest objects\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+Although this action always returns all CSRs, it requires a dummy search key; this is a known bug\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Retrieve a single CSR from the puppet master\'s CA:
+.
+.P
+$ puppet certificate_request find somenode\.puppetlabs\.lan \-\-terminus rest
+.
+.P
+\fBsearch\fR
+.
+.P
+Retrieve all CSRs from the local CA (similar to \'puppet cert list\'):
+.
+.P
+$ puppet certificate_request search x \-\-terminus ca
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBca\fR
+.
+.IP "\(bu" 4
+\fBfile\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-certificate_revocation_list.8 b/man/man8/puppet-certificate_revocation_list.8
new file mode 100644
index 000000000..4a9c856df
--- /dev/null
+++ b/man/man8/puppet-certificate_revocation_list.8
@@ -0,0 +1,165 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-CERTIFICATE_REVOCATION_LIST" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-certificate_revocation_list\fR \- Manage the list of revoked certificates\.
+.
+.SH "SYNOPSIS"
+puppet certificate_revocation_list \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand is primarily for retrieving the certificate revocation list from the CA\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Delete the certificate revocation list\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_revocation_list destroy [\-\-terminus TERMINUS] \fIdummy_text\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Deletes the certificate revocation list\. This cannot be done over REST, but it is possible to delete the locally cached copy or the local CA\'s copy of the CRL\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+Although this action always deletes the CRL from the specified terminus, it requires a dummy argument; this is a known bug\.
+.
+.TP
+\fBfind\fR \- Retrieve the certificate revocation list\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_revocation_list find [\-\-terminus TERMINUS] \fIdummy_text\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve the certificate revocation list\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+The certificate revocation list\. When used from the Ruby API: returns an OpenSSL::X509::CRL object\.
+.
+.IP
+RENDERING ISSUES: this should usually be rendered as a string (\'\-\-render\-as s\')\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+Although this action always returns the CRL from the specified terminus, it requires a dummy argument; this is a known bug\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_revocation_list info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_revocation_list save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet certificate_revocation_list search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Retrieve a copy of the puppet master\'s CRL:
+.
+.P
+$ puppet certificate_revocation_list find crl \-\-terminus rest
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBca\fR
+.
+.IP "\(bu" 4
+\fBfile\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-config.8 b/man/man8/puppet-config.8
new file mode 100644
index 000000000..f7592a43b
--- /dev/null
+++ b/man/man8/puppet-config.8
@@ -0,0 +1,80 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-CONFIG" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-config\fR \- Interact with Puppet\'s configuration options\.
+.
+.SH "SYNOPSIS"
+puppet config \fIaction\fR
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBprint\fR \- Examine Puppet\'s current configuration settings\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet config print (all | \fIsetting\fR [\fIsetting\fR \.\.\.]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the value of a single configuration option or a list of configuration options\.
+.
+.IP
+This action is an alternate interface to the information available with \fBpuppet <subcommand> \-\-configprint\fR\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A single value when called with one config setting, and a list of settings and values when called with multiple options or "all\."
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+By default, this action reads the configuration in agent mode\. Use the \'\-\-mode\' and \'\-\-environment\' flags to examine other configuration domains\.
+.
+.SH "EXAMPLES"
+\fBprint\fR
+.
+.P
+Get puppet\'s runfile directory:
+.
+.P
+$ puppet config print rundir
+.
+.P
+Get a list of important directories from the master\'s config:
+.
+.P
+$ puppet config print all \-\-mode master | grep \-E "(path|dir)"
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-describe.8 b/man/man8/puppet-describe.8
index c54a7bec7..af246f16b 100644
--- a/man/man8/puppet-describe.8
+++ b/man/man8/puppet-describe.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types
@@ -48,4 +48,4 @@ $ puppet describe user \-s \-m
 David Lutterkort
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-device.8 b/man/man8/puppet-device.8
new file mode 100644
index 000000000..a63f96ddf
--- /dev/null
+++ b/man/man8/puppet-device.8
@@ -0,0 +1,86 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-DEVICE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-device\fR \- Manage remote network devices
+.
+.SH "SYNOPSIS"
+Retrieves all configurations from the puppet master and apply them to the remote devices configured in /etc/puppet/device\.conf\.
+.
+.P
+Currently must be run out periodically, using cron or something similar\.
+.
+.SH "USAGE"
+puppet device [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-V|\-\-version]
+.
+.IP "" 4
+.
+.nf
+
+            [\-h|\-\-help] [\-l|\-\-logdest syslog|<file>|console]
+            [\-v|\-\-verbose] [\-w|\-\-waitforcert <seconds>]
+.
+.fi
+.
+.IP "" 0
+.
+.SH "DESCRIPTION"
+Once the client has a signed certificate for a given remote device, it will retrieve its configuration and apply it\.
+.
+.SH "USAGE NOTES"
+One need a /etc/puppet/device\.conf file with the following content:
+.
+.P
+[remote\.device\.fqdn] type \fItype\fR url \fIurl\fR
+.
+.P
+where: * type: the current device type (the only value at this time is cisco) * url: an url allowing to connect to the device
+.
+.P
+Supported url must conforms to: scheme://user:password@hostname/?query
+.
+.P
+with: * scheme: either ssh or telnet * user: username, can be omitted depending on the switch/router configuration * password: the connection password * query: this is device specific\. Cisco devices supports an enable parameter whose value would be the enable password\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
+.
+.TP
+\-\-debug
+Enable full debugging\.
+.
+.TP
+\-\-detailed\-exitcodes
+Provide transaction information via exit codes\. If this is enabled, an exit code of \'2\' means there were changes, and an exit code of \'4\' means that there were failures during the transaction\. This option only makes sense in conjunction with \-\-onetime\.
+.
+.TP
+\-\-help
+Print this help message
+.
+.TP
+\-\-logdest
+Where to send messages\. Choose between syslog, the console, and a log file\. Defaults to sending messages to syslog, or the console if debugging or verbosity is enabled\.
+.
+.TP
+\-\-verbose
+Turn on verbose reporting\.
+.
+.TP
+\-\-waitforcert
+This option only matters for daemons that do not yet have certificates and it is enabled by default, with a value of 120 (seconds)\. This causes +puppet agent+ to connect to the server every 2 minutes and ask it to sign a certificate request\. This is useful for the initial setup of a puppet client\. You can turn off waiting for certificates by specifying a time of 0\.
+.
+.SH "EXAMPLE"
+.
+.nf
+
+  $ puppet device \-\-server puppet\.domain\.com
+.
+.fi
+.
+.SH "AUTHOR"
+Brice Figureau
+.
+.SH "COPYRIGHT"
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-doc.8 b/man/man8/puppet-doc.8
index e0cabd5d1..f6de3951a 100644
--- a/man/man8/puppet-doc.8
+++ b/man/man8/puppet-doc.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-DOC" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet documentation and references
@@ -98,4 +98,4 @@ $ puppet doc \-m pdf \-r configuration
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-facts.8 b/man/man8/puppet-facts.8
new file mode 100644
index 000000000..25470cc0e
--- /dev/null
+++ b/man/man8/puppet-facts.8
@@ -0,0 +1,217 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-FACTS" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-facts\fR \- Retrieve and store facts\.
+.
+.SH "SYNOPSIS"
+puppet facts \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand manages facts, which are collections of normalized system information used by Puppet\. It can read facts directly from the local system (with the default \fBfacter\fR terminus), look up facts reported by other systems, and submit facts to the puppet master\.
+.
+.P
+When used with the \fBrest\fR terminus, this subcommand is essentially a front\-end to the inventory service REST API\. See the inventory service documentation at \fIhttp://docs\.puppetlabs\.com/guides/inventory_service\.html\fR for more detail\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBfind\fR \- Retrieve a node\'s facts\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts find [\-\-terminus TERMINUS] \fInode_certname\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve a node\'s facts\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A hash containing some metadata and (under the "values" key) the set of facts for the requested node\. When used from the Ruby API: A Puppet::Node::Facts object\.
+.
+.IP
+RENDERING ISSUES: Facts cannot currently be rendered as a string; use yaml or json\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+When using the \fBfacter\fR terminus, the host argument is ignored\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: create or overwrite an object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBupload\fR \- Upload local facts to the puppet master\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet facts upload [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Reads facts from the local system using the \fBfacter\fR terminus, then saves the returned facts using the rest terminus\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+This action requires that the puppet master\'s \fBauth\.conf\fR file allow save access to the \fBfacts\fR REST terminus\. Puppet agent does not use this facility, and it is turned off by default\. See \fIhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Get facts from the local system:
+.
+.P
+$ puppet facts find x
+.
+.P
+Ask the puppet master for facts for an arbitrary node:
+.
+.P
+$ puppet facts find somenode\.puppetlabs\.lan \-\-terminus rest
+.
+.P
+Query a DB\-backed inventory directly (bypassing the REST API):
+.
+.P
+$ puppet facts find somenode\.puppetlabs\.lan \-\-terminus inventory_active_record \-\-mode master
+.
+.P
+\fBupload\fR
+.
+.P
+Upload facts:
+.
+.P
+$ puppet facts upload
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBactive_record\fR
+.
+.IP "\(bu" 4
+\fBcouch\fR
+.
+.IP "\(bu" 4
+\fBfacter\fR
+.
+.IP "\(bu" 4
+\fBinventory_active_record\fR
+.
+.IP "\(bu" 4
+\fBmemory\fR
+.
+.IP "\(bu" 4
+\fBnetwork_device\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "\(bu" 4
+\fByaml\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-file.8 b/man/man8/puppet-file.8
new file mode 100644
index 000000000..1c39df7f3
--- /dev/null
+++ b/man/man8/puppet-file.8
@@ -0,0 +1,225 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-FILE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-file\fR \- Retrieve and store files in a filebucket
+.
+.SH "SYNOPSIS"
+puppet file \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand interacts with objects stored in a local or remote filebucket\. File objects are accessed by their MD5 sum; see the examples for the relevant syntax\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBdownload\fR \- Download a file into the local filebucket\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file download [\-\-terminus TERMINUS] ( {md5}\fIchecksum\fR | \fIpuppet_url\fR )
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Downloads a file from the puppet master\'s filebucket and duplicates it in the local filebucket\. This action\'s checksum syntax differs from \fBfind\fR\'s, and it can accept a <puppet:///> URL\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.TP
+\fBfind\fR \- Retrieve a file from the filebucket\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file find [\-\-terminus TERMINUS] md5/\fImd5sum\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve a file from the filebucket\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+The file object with the specified checksum\.
+.
+.IP
+RENDERING ISSUES: Rendering as a string returns the contents of the file object; rendering as yaml returns a hash of metadata about said file, including but not limited to its contents\. Rendering as json is currently broken, and returns a hash containing only the contents of the file\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: create or overwrite an object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBstore\fR \- Store a file in the local filebucket\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file store [\-\-terminus TERMINUS] \fIfile\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Store a file in the local filebucket\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.TP
+\fBupload\fR \- Upload a file to the remote filebucket\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet file upload [\-\-terminus TERMINUS] \fIfile\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Upload a file to the remote filebucket\.
+.
+.SH "EXAMPLES"
+\fBdownload\fR
+.
+.P
+Download a file by URL:
+.
+.P
+$ puppet file download puppet:///modules/editors/vim/\.vimrc
+.
+.P
+Download a file by MD5 sum:
+.
+.P
+$ puppet file download {md5}8f798d4e754db0ac89186bbaeaf0af18
+.
+.P
+\fBfind\fR
+.
+.P
+Retrieve the contents of a file:
+.
+.P
+$ puppet file find md5/9aedba7f413c97dc65895b1cd9421f2c \-\-render\-as s
+.
+.P
+\fBstore\fR
+.
+.P
+Store a file:
+.
+.P
+$ puppet file store /root/\.bashrc
+.
+.SH "NOTES"
+To retrieve the unmunged contents of a file, you must call find with \-\-render\-as s\. Rendering as yaml will return a hash of metadata about the file, including its contents\.
+.
+.P
+This subcommand does not interact with the \fBclientbucketdir\fR (the default local filebucket for puppet agent); it interacts with the primary "master"\-type filebucket located in the \fBbucketdir\fR\. If you wish to interact with puppet agent\'s default filebucket, you\'ll need to set the \fI\-\-bucketdir\fR option appropriately when invoking actions\.
+.
+.P
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBfile\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-filebucket.8 b/man/man8/puppet-filebucket.8
index 7ff0da9af..990756858 100644
--- a/man/man8/puppet-filebucket.8
+++ b/man/man8/puppet-filebucket.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket
@@ -78,4 +78,4 @@ $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-help.8 b/man/man8/puppet-help.8
new file mode 100644
index 000000000..0f22ca887
--- /dev/null
+++ b/man/man8/puppet-help.8
@@ -0,0 +1,71 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-HELP" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-help\fR \- Display Puppet help\.
+.
+.SH "SYNOPSIS"
+puppet help \fIaction\fR
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBhelp\fR \- Display help about Puppet subcommands and their actions\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet help [\-\-version VERSION] [\fIsubcommand\fR] [\fIaction\fR]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Display help about Puppet subcommands and their actions\.
+.
+.IP
+\fBOPTIONS\fR
+.
+.IP
+\fI\-\-version VERSION\fR \- The version of the subcommand for which to show help\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Short help text for the specified subcommand or action\.
+.
+.SH "EXAMPLES"
+\fBhelp\fR
+.
+.P
+Get help for an action:
+.
+.P
+$ puppet help
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-inspect.8 b/man/man8/puppet-inspect.8
index ae19deede..e11c9fe81 100644
--- a/man/man8/puppet-inspect.8
+++ b/man/man8/puppet-inspect.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-INSPECT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-INSPECT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-inspect\fR \- Send an inspection report
@@ -25,4 +25,4 @@ Any configuration setting which is valid in the configuration file is also a val
 Puppet Labs
 .
 .SH "COPYRIGHT"
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the GNU General Public License version 2
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-key.8 b/man/man8/puppet-key.8
new file mode 100644
index 000000000..b0812d831
--- /dev/null
+++ b/man/man8/puppet-key.8
@@ -0,0 +1,126 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-KEY" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-key\fR \- Create, save, and remove certificate keys\.
+.
+.SH "SYNOPSIS"
+puppet key \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand manages certificate private keys\. Keys are created automatically by puppet agent and when certificate requests are generated with \'puppet certificate generate\'; it should not be necessary to use this subcommand directly\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Delete an object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet key destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Delete an object\.
+.
+.TP
+\fBfind\fR \- Retrieve an object by name\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet key find [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve an object by name\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet key info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: create or overwrite an object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet key save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.TP
+\fBsearch\fR \- Search for an object or retrieve multiple objects\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet key search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Search for an object or retrieve multiple objects\.
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBca\fR
+.
+.IP "\(bu" 4
+\fBfile\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-kick.8 b/man/man8/puppet-kick.8
index b6a868918..2b7502310 100644
--- a/man/man8/puppet-kick.8
+++ b/man/man8/puppet-kick.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KICK" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-KICK" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-kick\fR \- Remotely control puppet agent
@@ -25,30 +25,10 @@ You will most likely have to run \'puppet kick\' as root to get access to the SS
 \'puppet kick\' reads \'puppet master\'\'s configuration file, so that it can copy things like LDAP settings\.
 .
 .SH "USAGE NOTES"
-\'puppet kick\' is useless unless \'puppet agent\' is listening\. See its documentation for more information, but the gist is that you must enable \'listen\' on the \'puppet agent\' daemon, either using \'\-\-listen\' on the command line or adding \'listen = true\' in its config file\. In addition, you need to set the daemons up to specifically allow connections by creating the \'namespaceauth\' file, normally at \'/etc/puppet/namespaceauth\.conf\'\. This file specifies who has access to each namespace; if you create the file you must add every namespace you want any Puppet daemon to allow \-\- it is currently global to all Puppet daemons\.
+Puppet kick is useless unless puppet agent is listening for incoming connections and allowing access to the \fBrun\fR endpoint\. This entails starting the agent with \fBlisten = true\fR in its puppet\.conf file, and allowing access to the \fB/run\fR path in its auth\.conf file; see \fBhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
 .
 .P
-An example file looks like this:
-.
-.IP "" 4
-.
-.nf
-
-[fileserver]
-    allow *\.madstop\.com
-
-[puppetmaster]
-    allow *\.madstop\.com
-
-[puppetrunner]
-    allow culain\.madstop\.com
-.
-.fi
-.
-.IP "" 0
-.
-.P
-This is what you would install on your Puppet master; non\-master hosts could leave off the \'fileserver\' and \'puppetmaster\' namespaces\.
+Additionally, due to a known bug, you must make sure a namespaceauth\.conf file exists in puppet agent\'s $confdir\. This file will not be consulted, and may be left empty\.
 .
 .SH "OPTIONS"
 Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
@@ -112,4 +92,4 @@ $ sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-man.8 b/man/man8/puppet-man.8
new file mode 100644
index 000000000..fe5f375eb
--- /dev/null
+++ b/man/man8/puppet-man.8
@@ -0,0 +1,74 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-MAN" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-man\fR \- Display Puppet manual pages\.
+.
+.SH "SYNOPSIS"
+puppet man \fIaction\fR
+.
+.SH "DESCRIPTION"
+This subcommand displays manual pages for all Puppet subcommands\. If the \fBronn\fR gem (\fIhttps://github\.com/rtomayko/ronn/\fR) is installed on your system, puppet man will display fully\-formated man pages\. If \fBronn\fR is not available, puppet man will display the raw (but human\-readable) source text in a pager\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBman\fR \- Display the manual page for a Puppet subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet man \fIsubcommand\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Display the manual page for a Puppet subcommand\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+The man data, in Markdown format, suitable for consumption by Ronn\.
+.
+.IP
+RENDERING ISSUES: To skip fancy formatting and output the raw Markdown text (e\.g\. for use in a pipeline), call this action with \'\-\-render\-as s\'\.
+.
+.SH "EXAMPLES"
+\fBman\fR
+.
+.P
+View the manual page for a subcommand:
+.
+.P
+$ puppet man facts
+.
+.SH "NOTES"
+The pager used for display will be the first found of \fB$MANPAGER\fR, \fB$PAGER\fR, \fBless\fR, \fBmost\fR, or \fBmore\fR\.
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-master.8 b/man/man8/puppet-master.8
index 9ed2a6ad6..c38d34afa 100644
--- a/man/man8/puppet-master.8
+++ b/man/man8/puppet-master.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MASTER" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-MASTER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-master\fR \- The puppet master daemon
@@ -56,8 +56,19 @@ Compile a catalogue and output it in JSON from the puppet master\. Uses facts co
 .SH "EXAMPLE"
 puppet master
 .
+.SH "DIAGNOSTICS"
+When running as a standalone daemon, puppet master accepts the following signals:
+.
+.TP
+SIGHUP
+Restart the puppet master server\.
+.
+.TP
+SIGINT and SIGTERM
+Shut down the puppet master server\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-node.8 b/man/man8/puppet-node.8
new file mode 100644
index 000000000..4da08722f
--- /dev/null
+++ b/man/man8/puppet-node.8
@@ -0,0 +1,171 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-NODE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-node\fR \- View and manage node definitions\.
+.
+.SH "SYNOPSIS"
+puppet node \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand interacts with node objects, which are used by Puppet to build a catalog\. A node object consists of the node\'s facts, environment, node parameters (exposed in the parser as top\-scope variables), and classes\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet node destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBfind\fR \- Retrieve a node object\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet node find [\-\-terminus TERMINUS] \fIhost\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve a node object\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A hash containing the node\'s \fBclasses\fR, \fBenvironment\fR, \fBexpiration\fR, \fBname\fR, \fBparameters\fR (its facts, combined with any ENC\-set parameters), and \fBtime\fR\. When used from the Ruby API: a Puppet::Node object\.
+.
+.IP
+RENDERING ISSUES: Rendering as string and json are currently broken; node objects can only be rendered as yaml\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet node info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet node save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet node search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Retrieve an "empty" (no classes, no ENC\-imposed parameters, and an environment of "production") node:
+.
+.P
+$ puppet node find somenode\.puppetlabs\.lan \-\-terminus plain \-\-render\-as yaml
+.
+.P
+Retrieve a node using the puppet master\'s configured ENC:
+.
+.P
+$ puppet node find somenode\.puppetlabs\.lan \-\-terminus exec \-\-mode master \-\-render\-as yaml
+.
+.P
+Retrieve the same node from the puppet master:
+.
+.P
+$ puppet node find somenode\.puppetlabs\.lan \-\-terminus rest \-\-render\-as yaml
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBactive_record\fR
+.
+.IP "\(bu" 4
+\fBexec\fR
+.
+.IP "\(bu" 4
+\fBldap\fR
+.
+.IP "\(bu" 4
+\fBmemory\fR
+.
+.IP "\(bu" 4
+\fBplain\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "\(bu" 4
+\fByaml\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-parser.8 b/man/man8/puppet-parser.8
new file mode 100644
index 000000000..0029907e6
--- /dev/null
+++ b/man/man8/puppet-parser.8
@@ -0,0 +1,71 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-PARSER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-parser\fR \- Interact directly with the parser\.
+.
+.SH "SYNOPSIS"
+puppet parser \fIaction\fR
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBvalidate\fR \- Validate the syntax of one or more Puppet manifests\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet parser validate [\fImanifest\fR] [\fImanifest\fR \.\.\.]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+This action validates Puppet DSL syntax without compiling a catalog or syncing any resources\. If no manifest files are provided, it will validate the default site manifest\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing, or the first syntax error encountered\.
+.
+.SH "EXAMPLES"
+\fBvalidate\fR
+.
+.P
+Validate the default site manifest at /etc/puppet/manifests/site\.pp:
+.
+.P
+$ puppet parser validate
+.
+.P
+Validate two arbitrary manifest files:
+.
+.P
+$ puppet parser validate init\.pp vhost\.pp
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-plugin.8 b/man/man8/puppet-plugin.8
new file mode 100644
index 000000000..05d1af0d5
--- /dev/null
+++ b/man/man8/puppet-plugin.8
@@ -0,0 +1,77 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-PLUGIN" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.
+.
+.SH "SYNOPSIS"
+puppet plugin \fIaction\fR
+.
+.SH "DESCRIPTION"
+This subcommand provides network access to the puppet master\'s store of plugins\.
+.
+.P
+The puppet master serves Ruby code collected from the \fBlib\fR directories of its modules\. These plugins can be used on agent nodes to extend Facter and implement custom types and providers\. Plugins are normally downloaded by puppet agent during the course of a run\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdownload\fR \- Download plugins from the puppet master\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet plugin download
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Downloads plugins from the configured puppet master\. Any plugins downloaded in this way will be used in all subsequent Puppet activity\. This action modifies files on disk\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A list of the files downloaded, or a confirmation that no files were downloaded\. When used from the Ruby API, this action returns an array of the files downloaded, which will be empty if none were retrieved\.
+.
+.SH "EXAMPLES"
+\fBdownload\fR
+.
+.P
+Retrieve plugins from the puppet master:
+.
+.P
+$ puppet plugin download
+.
+.P
+Retrieve plugins from the puppet master (API example):
+.
+.P
+$ Puppet::Face[:plugin, \'0\.0\.1\']\.download
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-queue.8 b/man/man8/puppet-queue.8
index 7dbd683bf..1a3241c9f 100644
--- a/man/man8/puppet-queue.8
+++ b/man/man8/puppet-queue.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-QUEUE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-QUEUE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs
@@ -52,4 +52,4 @@ $ puppet queue
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-report.8 b/man/man8/puppet-report.8
new file mode 100644
index 000000000..1c2c236b2
--- /dev/null
+++ b/man/man8/puppet-report.8
@@ -0,0 +1,187 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-REPORT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-report\fR \- Create, display, and submit reports\.
+.
+.SH "SYNOPSIS"
+puppet report \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this face\.
+.
+.TP
+\fBfind\fR \- Invalid for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report find [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this face\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- API only: submit a report\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report save [\-\-terminus TERMINUS] \fIreport\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: create or overwrite an object\. As the Faces framework does not currently accept data from STDIN, save actions cannot currently be invoked from the command line\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Nothing\.
+.
+.TP
+\fBsearch\fR \- Invalid for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this face\.
+.
+.TP
+\fBsubmit\fR \- API only: submit a report with error handling\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet report submit [\-\-terminus TERMINUS] \fIreport\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+API only: Submits a report to the puppet master\. This action is essentially a shortcut and wrapper for the \fBsave\fR action with the \fBrest\fR terminus, and provides additional details in the event of a failure\.
+.
+.SH "EXAMPLES"
+\fBsave\fR
+.
+.P
+From the implementation of \fBpuppet report submit\fR (API example):
+.
+.IP "" 4
+.
+.nf
+
+begin
+  Puppet::Transaction::Report\.indirection\.terminus_class = :rest
+  Puppet::Face[:report, "0\.0\.1"]\.save(report)
+  Puppet\.notice "Uploaded report for #{report\.name}"
+rescue => detail
+  puts detail\.backtrace if Puppet[:trace]
+  Puppet\.err "Could not send report: #{detail}"
+end
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBsubmit\fR
+.
+.P
+From secret_agent\.rb (API example):
+.
+.IP "" 4
+.
+.nf
+
+# \.\.\.
+report  = Puppet::Face[:catalog, \'0\.0\.1\']\.apply
+Puppet::Face[:report, \'0\.0\.1\']\.submit(report)
+return report
+.
+.fi
+.
+.IP "" 0
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBprocessor\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "\(bu" 4
+\fByaml\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-resource.8 b/man/man8/puppet-resource.8
index 738537e84..7e09c0739 100644
--- a/man/man8/puppet-resource.8
+++ b/man/man8/puppet-resource.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell
@@ -81,4 +81,4 @@ user { \'luke\':
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppet-resource_type.8 b/man/man8/puppet-resource_type.8
new file mode 100644
index 000000000..241b68207
--- /dev/null
+++ b/man/man8/puppet-resource_type.8
@@ -0,0 +1,214 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-RESOURCE_TYPE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-resource_type\fR \- View classes, defined resource types, and nodes from all manifests\.
+.
+.SH "SYNOPSIS"
+puppet resource_type \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "DESCRIPTION"
+This subcommand reads information about the resource collections (classes, nodes, and defined types) available in Puppet\'s site manifest and modules\.
+.
+.P
+It will eventually be extended to examine native resource types\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet resource_type destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBfind\fR \- Retrieve info about a resource collection\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet resource_type find [\-\-terminus TERMINUS] \fIcollection_name\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Retrieve info about a resource collection\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A hash of info about the requested resource collection\. When used from the Ruby API: returns a Puppet::Resource::Type object\.
+.
+.IP
+RENDERING ISSUES: yaml and string output for this indirection are currently unusable; use json instead\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+If two resource collections share the same name (e\.g\. you have both a node and a class named "default"), \fBfind\fR will only return one of them\. This can be worked around by using \fBsearch\fR instead\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet resource_type info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet resource_type save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsearch\fR \- Search for collections matching a regular expression\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet resource_type search [\-\-terminus TERMINUS] \fIregular_expression\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Search for collections matching a regular expression\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+An array of hashes of resource collection info\. When used from the Ruby API: returns an array of Puppet::Resource::Type objects\.
+.
+.IP
+RENDERING ISSUES: yaml and string output for this indirection are currently unusable; use json instead\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Retrieve info about a specific locally\-defined class:
+.
+.P
+$ puppet resource_type find ntp::disabled
+.
+.P
+Retrieve info from the puppet master about a specific class:
+.
+.P
+$ puppet resource_type find ntp \-\-terminus rest
+.
+.P
+\fBsearch\fR
+.
+.P
+Retrieve all classes, nodes, and defined types:
+.
+.P
+$ puppet resource_type search \'\.*\'
+.
+.P
+Search for classes related to Nagios:
+.
+.P
+$ puppet resource_type search nagios
+.
+.SH "NOTES"
+The \fBfind\fR and \fBsearch\fR actions return similar hashes of resource collection info\. These hashes will include the following four keys:
+.
+.IP "\(bu" 4
+\fBfile\fR (a string)
+.
+.IP "\(bu" 4
+\fBname\fR (a string)
+.
+.IP "\(bu" 4
+\fBtype\fR (\fIhostclass\fR, \fIdefinition\fR, or \fInode\fR)
+.
+.IP "\(bu" 4
+\fBline\fR (an integer)
+.
+.IP "" 0
+.
+.P
+They may optionally include the following keys:
+.
+.IP "\(bu" 4
+\fBparent\fR (\fIname_of_resource_collection\fR)
+.
+.IP "\(bu" 4
+\fBarguments\fR (a hash of parameters and default values)
+.
+.IP "\(bu" 4
+\fBdoc\fR (a string)
+.
+.IP "" 0
+.
+.P
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBparser\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-secret_agent.8 b/man/man8/puppet-secret_agent.8
new file mode 100644
index 000000000..f2e5c3a1c
--- /dev/null
+++ b/man/man8/puppet-secret_agent.8
@@ -0,0 +1,74 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-SECRET_AGENT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-secret_agent\fR \- Mimics puppet agent\.
+.
+.SH "SYNOPSIS"
+puppet secret_agent \fIaction\fR
+.
+.SH "DESCRIPTION"
+This subcommand currently functions as a proof of concept, demonstrating how the Faces API exposes Puppet\'s internal systems to application logic; compare the actual code for puppet agent\. It will eventually replace puppet agent entirely, and can provide a template for users who wish to implement agent\-like functionality with non\-standard application logic\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBsynchronize\fR \- Run secret_agent once\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet secret_agent
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Mimics a single run of puppet agent\. This action does not currently daemonize, but can download plugins, submit facts, retrieve and apply a catalog, and submit a report to the puppet master\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+Verbose logging from the completed run\. When used from the Ruby API: returns a Puppet::Transaction::Report object\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+This action requires that the puppet master\'s \fBauth\.conf\fR file allow save access to the \fBfacts\fR REST terminus\. Puppet agent does not use this facility, and it is turned off by default\. See \fIhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
+.
+.SH "EXAMPLES"
+\fBsynchronize\fR
+.
+.P
+Trigger a Puppet run with the configured puppet master:
+.
+.P
+$ puppet secret_agent
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet-status.8 b/man/man8/puppet-status.8
new file mode 100644
index 000000000..c7707497a
--- /dev/null
+++ b/man/man8/puppet-status.8
@@ -0,0 +1,150 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-STATUS" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-status\fR \- View puppet server status\.
+.
+.SH "SYNOPSIS"
+puppet status \fIaction\fR [\-\-terminus TERMINUS]
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument, although it may or may not be relevant to the present action\. For example, \fBserver\fR is a valid configuration parameter, so you can specify \fB\-\-server <servername>\fR as an argument\.
+.
+.P
+See the configuration file documentation at \fIhttp://docs\.puppetlabs\.com/references/stable/configuration\.html\fR for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \fB\-\-genconfig\fR\.
+.
+.TP
+\-\-mode MODE
+The run mode to use for the current action\. Valid modes are \fBuser\fR, \fBagent\fR, and \fBmaster\fR\.
+.
+.TP
+\-\-render\-as FORMAT
+The format in which to render output\. The most common formats are \fBjson\fR, \fBs\fR (string), \fByaml\fR, and \fBconsole\fR, but other options such as \fBdot\fR are sometimes available\.
+.
+.TP
+\-\-verbose
+Whether to log verbosely\.
+.
+.TP
+\-\-debug
+Whether to log debug information\.
+.
+.TP
+\-\-terminus TERMINUS
+Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
+.
+.IP
+Almost all indirected subsystems have a \fBrest\fR terminus that interacts with the puppet master\'s data\. Most of them have additional terminuses for various local data models, which are in turn used by the indirected subsystem on the puppet master whenever it receives a remote request\.
+.
+.IP
+The terminus for an action is often determined by context, but occasionally needs to be set explicitly\. See the "Notes" section of this face\'s manpage for more details\.
+.
+.SH "ACTIONS"
+.
+.TP
+\fBdestroy\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet status destroy [\-\-terminus TERMINUS] \fIkey\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBfind\fR \- Check status of puppet master server\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet status find [\-\-terminus TERMINUS] \fIdummy_text\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Checks whether a Puppet server is properly receiving and processing HTTP requests\. This action is only useful when used with \'\-\-terminus rest\'; when invoked with the \fBlocal\fR terminus, \fBfind\fR will always return true\.
+.
+.IP
+Over REST, this action will query the configured puppet master by default\. To query other servers, including puppet agent nodes started with the \fI\-\-listen\fR option, you can set set the global \fI\-\-server\fR and \fI\-\-masterport\fR options on the command line; note that agent nodes listen on port 8139\.
+.
+.IP
+\fBRETURNS\fR
+.
+.IP
+A "true" response or a low\-level connection error\. When used from the Ruby API: returns a Puppet::Status object\.
+.
+.IP
+\fBNOTES\fR
+.
+.IP
+This action requires that the server\'s \fBauth\.conf\fR file allow find access to the \fBstatus\fR REST terminus\. Puppet agent does not use this facility, and it is turned off by default\. See \fIhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
+.
+.IP
+Although this action always returns an unnamed status object, it requires a dummy argument\. This is a known bug\.
+.
+.TP
+\fBinfo\fR \- Print the default terminus class for this face\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet status info [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Prints the default terminus class for this subcommand\. Note that different run modes may have different default termini; when in doubt, specify the run mode with the \'\-\-mode\' option\.
+.
+.TP
+\fBsave\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet status save [\-\-terminus TERMINUS]
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.TP
+\fBsearch\fR \- Invalid for this subcommand\.
+\fBSYNOPSIS\fR
+.
+.IP
+puppet status search [\-\-terminus TERMINUS] \fIquery\fR
+.
+.IP
+\fBDESCRIPTION\fR
+.
+.IP
+Invalid for this subcommand\.
+.
+.SH "EXAMPLES"
+\fBfind\fR
+.
+.P
+Check the status of the configured puppet master:
+.
+.P
+$ puppet status find x \-\-terminus rest
+.
+.SH "NOTES"
+This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR actions for an indirected subsystem of Puppet\. Valid termini for this face include:
+.
+.IP "\(bu" 4
+\fBlocal\fR
+.
+.IP "\(bu" 4
+\fBrest\fR
+.
+.IP "" 0
+.
+.SH "COPYRIGHT AND LICENSE"
+Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index f58a54d41..ce6b6a458 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -1,10 +1,10 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
 .
 .P
-Usage: puppet command \fIspace separated arguments\fR Available commands are: agent, apply, cert, describe, doc, filebucket, inspect, kick, master, queue, resource
+See \'puppet help\' for help on available puppet subcommands
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index bea7596d4..211f8ca7a 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CERT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-CERT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-cert\fR \- Manage certificates and requests
@@ -10,60 +10,67 @@
 Standalone certificate authority\. Capable of generating certificates, but mostly used for signing certificate requests from puppet clients\.
 .
 .SH "USAGE"
-puppet cert [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-g|\-\-generate] [\-l|\-\-list] [\-s|\-\-sign] [\-r|\-\-revoke] [\-p|\-\-print] [\-c|\-\-clean] [\-\-verify] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [host]
+puppet cert \fIaction\fR [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-\-digest \fIdigest\fR] [\fIhost\fR]
 .
 .SH "DESCRIPTION"
 Because the puppet master service defaults to not signing client certificate requests, this script is available for signing outstanding requests\. It can be used to list outstanding requests and then either sign them individually or sign all of them\.
 .
-.SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
+.SH "ACTIONS"
+Every action except \'list\' and \'generate\' requires a hostname to act on, unless the \'\-\-all\' option is set\.
 .
-.P
-See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
+.TP
+clean
+Revoke a host\'s certificate (if applicable) and remove all files related to that host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
 .
 .TP
-\-\-all
-Operate on all items\. Currently only makes sense with \'\-\-sign\', \'\-\-clean\', or \'\-\-list\'\.
+fingerprint
+Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
 .
 .TP
-\-\-digest
-Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
+generate
+Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
 .
 .TP
-\-\-clean
-Remove all files related to a host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. The certificate of the host is also revoked\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
+list
+List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
 .
 .TP
-\-\-debug
-Enable full debugging\.
+print
+Print the full\-text version of a host\'s certificate\.
 .
 .TP
-\-\-generate
-Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
+revoke
+Revoke the certificate of a client\. The certificate can be specified either by its serial number (given as a decimal number or a hexadecimal number prefixed by \'0x\') or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' configuration option\. Note that the puppet master needs to be restarted after revoking certificates\.
 .
 .TP
-\-\-help
-Print this help message
+sign
+Sign an outstanding certificate request\.
 .
 .TP
-\-\-list
-List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
+verify
+Verify the named certificate against the local CA certificate\.
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
+.
+.P
+See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
 .
 .TP
-\-\-print
-Print the full\-text version of a host\'s certificate\.
+\-\-all
+Operate on all items\. Currently only makes sense with the \'sign\', \'clean\', \'list\', and \'fingerprint\' actions\.
 .
 .TP
-\-\-fingerprint
-Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
+\-\-digest
+Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
 .
 .TP
-\-\-revoke
-Revoke the certificate of a client\. The certificate can be specified either by its serial number, given as a decimal number or a hexadecimal number prefixed by \'0x\', or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' config parameter\. Note that the puppetmasterd needs to be restarted after revoking certificates\.
+\-\-debug
+Enable full debugging\.
 .
 .TP
-\-\-sign
-Sign an outstanding certificate request\. Unless \'\-\-all\' is specified, hosts must be listed after all flags\.
+\-\-help
+Print this help message
 .
 .TP
 \-\-verbose
@@ -73,17 +80,13 @@ Enable verbosity\.
 \-\-version
 Print the puppet version number and exit\.
 .
-.TP
-\-\-verify
-Verify the named certificate against the local CA certificate\.
-.
 .SH "EXAMPLE"
 .
 .nf
 
-$ puppet cert \-l
+$ puppet cert list
 culain\.madstop\.com
-$ puppet cert \-s culain\.madstop\.com
+$ puppet cert sign culain\.madstop\.com
 .
 .fi
 .
@@ -91,4 +94,4 @@ $ puppet cert \-s culain\.madstop\.com
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index 3fadd9df7..2e5cedf51 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon
@@ -132,8 +132,23 @@ $ puppet agent \-\-server puppet\.domain\.com
 .
 .fi
 .
+.SH "DIAGNOSTICS"
+Puppet agent accepts the following signals:
+.
+.TP
+SIGHUP
+Restart the puppet agent daemon\.
+.
+.TP
+SIGINT and SIGTERM
+Shut down the puppet agent daemon\.
+.
+.TP
+SIGUSR1
+Immediately retrieve and apply configurations from the puppet master\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
index e0cabd5d1..f6de3951a 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-DOC" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet documentation and references
@@ -98,4 +98,4 @@ $ puppet doc \-m pdf \-r configuration
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index 9ed2a6ad6..c38d34afa 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MASTER" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-MASTER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-master\fR \- The puppet master daemon
@@ -56,8 +56,19 @@ Compile a catalogue and output it in JSON from the puppet master\. Uses facts co
 .SH "EXAMPLE"
 puppet master
 .
+.SH "DIAGNOSTICS"
+When running as a standalone daemon, puppet master accepts the following signals:
+.
+.TP
+SIGHUP
+Restart the puppet master server\.
+.
+.TP
+SIGINT and SIGTERM
+Shut down the puppet master server\.
+.
 .SH "AUTHOR"
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index 7dbd683bf..1a3241c9f 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-QUEUE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-QUEUE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs
@@ -52,4 +52,4 @@ $ puppet queue
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index b6a868918..2b7502310 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KICK" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-KICK" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-kick\fR \- Remotely control puppet agent
@@ -25,30 +25,10 @@ You will most likely have to run \'puppet kick\' as root to get access to the SS
 \'puppet kick\' reads \'puppet master\'\'s configuration file, so that it can copy things like LDAP settings\.
 .
 .SH "USAGE NOTES"
-\'puppet kick\' is useless unless \'puppet agent\' is listening\. See its documentation for more information, but the gist is that you must enable \'listen\' on the \'puppet agent\' daemon, either using \'\-\-listen\' on the command line or adding \'listen = true\' in its config file\. In addition, you need to set the daemons up to specifically allow connections by creating the \'namespaceauth\' file, normally at \'/etc/puppet/namespaceauth\.conf\'\. This file specifies who has access to each namespace; if you create the file you must add every namespace you want any Puppet daemon to allow \-\- it is currently global to all Puppet daemons\.
+Puppet kick is useless unless puppet agent is listening for incoming connections and allowing access to the \fBrun\fR endpoint\. This entails starting the agent with \fBlisten = true\fR in its puppet\.conf file, and allowing access to the \fB/run\fR path in its auth\.conf file; see \fBhttp://docs\.puppetlabs\.com/guides/rest_auth_conf\.html\fR for more details\.
 .
 .P
-An example file looks like this:
-.
-.IP "" 4
-.
-.nf
-
-[fileserver]
-    allow *\.madstop\.com
-
-[puppetmaster]
-    allow *\.madstop\.com
-
-[puppetrunner]
-    allow culain\.madstop\.com
-.
-.fi
-.
-.IP "" 0
-.
-.P
-This is what you would install on your Puppet master; non\-master hosts could leave off the \'fileserver\' and \'puppetmaster\' namespaces\.
+Additionally, due to a known bug, you must make sure a namespaceauth\.conf file exists in puppet agent\'s $confdir\. This file will not be consulted, and may be left empty\.
 .
 .SH "OPTIONS"
 Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
@@ -112,4 +92,4 @@ $ sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index 738537e84..7e09c0739 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell
@@ -81,4 +81,4 @@ user { \'luke\':
 Luke Kanies
 .
 .SH "COPYRIGHT"
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License
-- 
cgit 


From d4c499dfdbd94f5272278e1ba87a75915607c3d7 Mon Sep 17 00:00:00 2001
From: Michael Stahnke <stahnma@puppetlabs.com>
Date: Wed, 8 Jun 2011 17:28:35 -0700
Subject: Updated CHANGELOG for 2.7.0rc4

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
---
 CHANGELOG | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1459bc77f..885504615 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,52 @@
+2.7.0rc4
+===
+dbe2310 Maint: Update static man pages for 2.7.0
+50d188c Maint: Update static man page generator for Faces.
+f370d5a (#7833) Several help text/template edits
+90d2cf0 maint: more work on regexp matching in Test::Unit assertions.
+8c71df2 maint: acceptance tests need to search for bin/false
+0ae4732 (#7828) Fix whitespace in synopsis generator.
+b4e9791 maint: handle incoherent Test::Unit assertions.
+48aafa3 (#6873) Add Static Compiler terminus to 2.7.0
+9017fea (#7728) Acceptance test for whit notifications.
+973e752 (#7728) Suppress notifications from container whits.
+1772363 (#7764, 7775, 7778) Revisions to Faces help text
+5a9998e (#7773, 7776, 7764) Several help template tweaks
+5587b94 maint: remove an unhelpful pending test.
+bbf0a02 maint: fix misnamed acceptance test for #7139
+d4e6c26 (#7624) Manually fetch all properties in instances.
+c8df027 (#7193) Fix path issues with acceptance tests that call old shell tests
+31bf55c (#7632) Make secret_agent application compatible with secret_agent face
+c5448b7 (#7624) Auditing should not be enabled by default for purged resources.
+b70f32a (#7746) Fix bootstrap issues from #7717 fix.
+be233c3 (#7683) Use ronn, when available, to render the output.
+2389bdf (#7683) Add a 'man' face and subcommand to Puppet.
+e647f70 maint: remove obsolete work-around code from help face.
+796900b (#7699) Don't duplicate inherited action names on faces.
+a23cfd8 (#7177) Deprecate implicit 'puppet apply' for 2.7.0
+3f47b0c (#7717) Layout cleanup for subcommand extraction.
+8072b4b #7211: Test unknown options don't shadow unknown actions.
+dd8108c #7211: nasty logic error with global Face options taking arguments.
+618495c #7211: more helpful error messages in various cases.
+7df1fa4 (#7708) Delete extended documentation from configuration reference
+2935feb (#7707) Document signals in puppet agent and puppet master help
+3facc33 add puppet master polling step for ticket 7117
+68c106e (#5318) Always notice changes to manifests when compiling.
+a5a78a5 (#7557) Remove Faces Application
+ea7908b maint: Fix order dependent spec failure for face indirection
+2aa9f2f (#7690) Don't blow up when listing terminuses available for faces
+9447cb9 maint: Dedup the loadpath so we don't have to walk it multiple times
+149a12f Maint: Fix ellipses for short descriptions
+7688706 (#7563) DRY: Remove indirector boilerplate from individual faces
+4662f4d (#7564) Finish templates
+331d812 (#7561) Complete help text for all faces and actions
+069a6b8 Maint: Add ellipsis to generated short_descriptions.
+ebc642b (#6962) Add "arguments" method to help API
+163ff6b (#7681) Add an acceptance test for resource refs with array variables
+9f6dec2 (#7681) Allow array variables as resource references
+76ad2bb (#7507) Add exclude filter for ruby 1.9 spec failures
+3682025 maint: move trap call to Signal so we can stub it for specs
+
 2.7.0rc3
 ===
 83c7563 (#7259) Remove ActiveRecord requirement from indirector face spec
-- 
cgit