Merge branch '2.7.x'

* 2.7.x: (25 commits)
  (#4411) Explain that runinterval = 0 does not mean "never run"
  Maint: Fix missing option text in puppet agent and arrange options alphabetically
  (#8302) Improve documentation of exec providers
  (#7853) Clarify and complete docs for the tagmail report processor
  Maint: Mention that audit metaparameter will accept "all"
  Maint: Adjust wording for file type's content parameter
  Maint: Fix poor documentation for versioncmp function.
  maint: Fix case sensitive require
  maint: Add inspect app options to help
  maint: Fix inspect help
  Increment lib/puppet.rb VERSION string
  Updated CHANGELOG for 2.7.3rc1
  (#4762) Ensure that clients on the moon can successfully connect.
  Add document outlining preferred contribution methods
  Add document outlining preferred contribution methods
  Add document outlining preferred contribution methods
  Revert "Merge branch 'vcsrepo'"
  Revert "Merge branch 'vcsrepo'"
  Updating CHANGELOG for 2.7.2rc3
  (#8704) Give better errors for invalid fileserver.conf
  ...

Manually Resolved Conflicts:
	lib/puppet/parser/functions/versioncmp.rb
	spec/integration/node/facts_spec.rb

2 files changed, 38 insertions, 30 deletions

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index ea7cbdfb5..b8645c3ce 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -100,12 +100,11 @@ similar), or run interactively for testing purposes.
 
 USAGE
 -----
-puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
-  [--detailed-exitcodes] [--disable] [--enable] [-h|--help]
-  [--certname <host name>] [-l|--logdest syslog|<file>|console]
-  [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
-  [--digest <digest>] [--fingerprint] [-V|--version]
-  [-v|--verbose] [-w|--waitforcert <seconds>]
+puppet agent [--certname <name>] [-D|--daemonize|--no-daemonize]
+  [-d|--debug] [--detailed-exitcodes] [--digest <digest>] [--disable] [--enable]
+  [--fingerprint] [-h|--help] [-l|--logdest syslog|<file>|console]
+  [--no-client] [--noop] [-o|--onetime] [--serve <handler>] [-t|--test]
+  [-v|--verbose] [-V|--version] [-w|--waitforcert <seconds>]
 
 
 DESCRIPTION
@@ -172,6 +171,13 @@ full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.
 
+* --certname:
+  Set the certname (unique ID) of the client. The master reads this
+  unique identifying string, which is usually set to the node's
+  fully-qualified domain name, to determine which configurations the
+  node will receive. Use this option to debug setup problems or
+  implement unusual node identification schemes.
+
 * --daemonize:
   Send the process into the background. This is the default.
 
@@ -181,17 +187,17 @@ configuration options can also be generated by running puppet agent with
 * --debug:
   Enable full debugging.
 
-* --digest:
-  Change the certificate fingerprinting digest algorithm. The default is
-  MD5. Valid values depends on the version of OpenSSL installed, but
-  should always at least contain MD5, MD2, SHA1 and SHA256.
-
 * --detailed-exitcodes:
   Provide transaction information via exit codes. If this is enabled, an exit
   code of '2' means there were changes, an exit code of '4' means there were
   failures during the transaction, and an exit code of '6' means there were both
   changes and failures.
 
+* --digest:
+  Change the certificate fingerprinting digest algorithm. The default is
+  MD5. Valid values depends on the version of OpenSSL installed, but
+  should always at least contain MD5, MD2, SHA1 and SHA256.
+
 * --disable:
   Disable working on the local system. This puts a lock file in place,
   causing 'puppet agent' not to work on the system until the lock file
@@ -212,12 +218,10 @@ configuration options can also be generated by running puppet agent with
 
   'puppet agent' exits after executing this.
 
-* --certname:
-  Set the certname (unique ID) of the client. The master reads this
-  unique identifying string, which is usually set to the node's
-  fully-qualified domain name, to determine which configurations the
-  node will receive. Use this option to debug setup problems or
-  implement unusual node identification schemes.
+* --fingerprint:
+  Display the current certificate or certificate signing request
+  fingerprint and then exit. Use the '--digest' option to change the
+  digest algorithm used.
 
 * --help:
   Print this help message
@@ -230,18 +234,19 @@ configuration options can also be generated by running puppet agent with
 * --no-client:
   Do not create a config client. This will cause the daemon to run
   without ever checking for its configuration automatically, and only
-  makes sense
+  makes sense when puppet agent is being run with listen = true in puppet.conf
+  or was started with the `--listen` option.
+
+* --noop:
+  Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
+  is useful for seeing what changes Puppet will make without actually
+  executing the changes.
 
 * --onetime:
   Run the configuration once. Runs a single (normally daemonized) Puppet
   run. Useful for interactively running puppet agent when used in
   conjunction with the --no-daemonize option.
 
-* --fingerprint:
-  Display the current certificate or certificate signing request
-  fingerprint and then exit. Use the '--digest' option to change the
-  digest algorithm used.
-
 * --serve:
   Start another type of server. By default, 'puppet agent' will start a
   service handler that allows authenticated and authorized remote nodes
@@ -256,11 +261,6 @@ configuration options can also be generated by running puppet agent with
   'verbose', 'ignorecache', 'no-daemonize', 'no-usecacheonfailure',
   'detailed-exit-codes', 'no-splay', and 'show_diff'.
 
-* --noop:
-  Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
-  is useful for seeing what changes Puppet will make without actually
-  executing the changes.
-
 * --verbose:
   Turn on verbose reporting.
 
@@ -290,7 +290,7 @@ Puppet agent accepts the following signals:
   Restart the puppet agent daemon.
 * SIGINT and SIGTERM:
   Shut down the puppet agent daemon.
-* SIGUSR1: 
+* SIGUSR1:
   Immediately retrieve and apply configurations from the puppet master.
 
 AUTHOR
diff --git a/lib/puppet/application/inspect.rb b/lib/puppet/application/inspect.rb
index b5a4ac872..6737128aa 100644
--- a/lib/puppet/application/inspect.rb
+++ b/lib/puppet/application/inspect.rb
@@ -31,7 +31,7 @@ Prepares and submits an inspection report to the puppet master.
 
 USAGE
 -----
-puppet inspect
+puppet inspect [--archive_files] [--archive_file_server]
 
 
 DESCRIPTION
@@ -57,6 +57,14 @@ configuration file documentation at
 http://docs.puppetlabs.com/references/latest/configuration.html for
 the full list of acceptable settings.
 
+* --archive_files:
+  During an inspect run, whether to archive files whose contents are audited to
+  a file bucket.
+
+* --archive_file_server:
+  During an inspect run, the file bucket server to archive files to if
+  archive_files is set.  The default value is '$server'.
+
 
 AUTHOR
 ------