feature #2276 Single Executable: help info

Change the --help text to match the new single executable invocations

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/sbin/puppetd b/sbin/puppetd
index f88e0fefe..d54834ab7 100755
--- a/sbin/puppetd
+++ b/sbin/puppetd
@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 # == Synopsis
 #
-# Retrieve the client configuration from the central puppet server and apply
+# Retrieve the client configuration from the puppet master and apply
 # it to the local host.
 #
 # Currently must be run out periodically, using cron or something similar.
 #
 # = Usage
 #
-#   puppetd  [-D|--daemonize|--no-daemonize] [-d|--debug]
+#   puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
 #       [--detailed-exitcodes] [--disable] [--enable]
 #       [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console]
 #       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
@@ -30,7 +30,7 @@
 #
 # = Usage Notes
 #
-# +puppetd+ does its best to find a compromise between interactive use and
+# +puppet agent+ does its best to find a compromise between interactive use and
 # daemon use.  Run with no arguments and no configuration, it will go into the
 # backgroun, attempt to get a signed certificate, and retrieve and apply its
 # configuration every 30 minutes.
@@ -52,7 +52,7 @@
 # which would only apply that small portion of the configuration during your
 # testing, rather than applying the whole thing.
 #
-# +fingerprint+ is a one-time flag. In this mode +puppetd+ will run once and
+# +fingerprint+ is a one-time flag. In this mode +puppet agent+ will run once and
 # display on the console (and in the log) the current certificate (or certificate
 # request) fingerprint. Providing the +--digest+ option allows to use a different
 # digest algorithm to generate the fingerprint. The main use is to verify that
@@ -70,7 +70,7 @@
 # See the configuration file documentation at
 # http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for
 # the full list of acceptable parameters. A commented list of all
-# configuration options can also be generated by running puppetd with
+# configuration options can also be generated by running puppet agent with
 # '--genconfig'.
 #
 # daemonize::
@@ -95,22 +95,22 @@
 #
 # disable::
 #   Disable working on the local system.  This puts a lock file in place,
-#   causing +puppetd+ not to work on the system until the lock file is removed.
+#   causing +puppet agent+ not to work on the system until the lock file is removed.
 #   This is useful if you are testing a configuration and do not want the central
 #   configuration to override the local state until everything is tested and
 #   committed.
 #
-#   +puppetd+ uses the same lock file while it is running, so no more than one
-#   +puppetd+ process is working at a time.
+#   +puppet agent+ uses the same lock file while it is running, so no more than one
+#   +puppet agent+ process is working at a time.
 #
-#   +puppetd+ exits after executing this.
+#   +puppet agent+ exits after executing this.
 #
 # enable::
 #   Enable working on the local system.  This removes any lock file, causing
-#   +puppetd+ to start managing the local system again (although it will continue
+#   +puppet agent+ to start managing the local system again (although it will continue
 #   to use its normal scheduling, so it might not start for another half hour).
 #
-#   +puppetd+ exits after executing this.
+#   +puppet agent+ exits after executing this.
 #
 # fqdn::
 #   Set the fully-qualified domain name of the client.  This is only used for
@@ -131,16 +131,16 @@
 #   makes sense when used in conjunction with --listen.
 #
 # onetime::
-#   Run the configuration once. Runs a single daemonized Puppet run. Useful for 
-#   interactively running puppetd and hence used in conjunction with the --no-daemonize 
-#   option.
+#   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, +puppetd+ will start
+#   Start another type of server.  By default, +puppet agent+ will start
 #   a service handler that allows authenticated and authorized remote nodes to
 #   trigger the configuration to be pulled down and applied.  You can specify
 #   any handler here that does not require configuration, e.g., filebucket, ca,
@@ -164,14 +164,14 @@
 # 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
-#   +puppetd+ to connect to the server every 2 minutes and ask it to sign a
+#   +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.
 #
 # = Example
 #
-#   puppetd --server puppet.domain.com
+#   puppet agent --server puppet.domain.com
 #
 # = Author
 #