From 7ef2fbf1ac217ef78181ffb41a9a226c7bb2b40f Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Mon, 14 Feb 2011 06:08:50 +1100
Subject: Updated fix for #3646 - apply / compile documentation

---
 lib/puppet/util/command_line/puppetd       | 11 ++++++++---
 lib/puppet/util/command_line/puppetmasterd |  6 +-----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'lib/puppet/util')

diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd
index 71b28429b..d7d94ce09 100755
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@ -15,6 +15,7 @@
 #       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
 #       [--digest <digest>] [--fingerprint] [-V|--version]
 #       [-v|--verbose] [-w|--waitforcert <seconds>]
+#       [--apply catalog]
 #
 # = Description
 #
@@ -60,7 +61,7 @@
 # before signing a certificate request on the master, the certificate request the
 # master received is the same as the one the client sent (to prevent against
 # man-in-the-middle attacks when signing certificates).
-# 
+#
 #
 # = Options
 #
@@ -133,8 +134,8 @@
 #   makes sense when used in conjunction with --listen.
 #
 # onetime::
-#   Run the configuration once. Runs a single (normally daemonized) Puppet run. 
-#   Useful for interactively running puppet agent when used in conjunction with 
+#   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::
@@ -172,6 +173,10 @@
 #   client.  You can turn off waiting for certificates by specifying a time
 #   of 0.
 #
+# apply::
+#   Capability to apply JSON catalog (such as one generated with --compile on the Puppet master).
+#   You can either specify a JSON catalog file or pipe in JSON from standard input.
+#
 # = Example
 #
 #   puppet agent --server puppet.domain.com
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd
index 445169820..3b76db82b 100755
--- a/lib/puppet/util/command_line/puppetmasterd
+++ b/lib/puppet/util/command_line/puppetmasterd
@@ -9,7 +9,7 @@
 #
 #   puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
 #       [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
-#       [--compile <nodename>] [--apply <catalog>]
+#       [--compile <nodename>]
 #
 # = Description
 #
@@ -54,10 +54,6 @@
 #   Capability to compile a catalogue and output it in JSON from the Puppet master. Uses 
 #   facts contained in the $vardir/yaml/ directory to compile the catalog.
 # 
-# apply::
-#   Capability to apply JSON catalog (such as one generated with --compile). You can either specify 
-#   a JSON file or pipe in JSON from standard input.
-#
 # = Example
 #
 #   puppet master
-- 
cgit