From 664ef670da62f9c3dd83d047dc9e575e9ffbb8a2 Mon Sep 17 00:00:00 2001
From: Jacob Helwig <jacob@puppetlabs.com>
Date: Mon, 14 Feb 2011 13:57:51 -0800
Subject: (#3646) Fix the documentation fix for `puppet apply --apply`

--apply is actually off of `puppet apply`, not off of `puppet agent` (nor
`puppet master`), so move the documentation accordingly.

Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
---
 lib/puppet/util/command_line/puppet  | 6 +++++-
 lib/puppet/util/command_line/puppetd | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet
index e75b92af8..ba3d57c19 100755
--- a/lib/puppet/util/command_line/puppet
+++ b/lib/puppet/util/command_line/puppet
@@ -7,7 +7,7 @@
 # = Usage
 #
 #   puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] [-e|--execute]
-#               [--detailed-exitcodes] [-l|--logdest <file>] <file>
+#               [--detailed-exitcodes] [-l|--logdest <file>] [--apply catalog] <file>
 #
 # = Description
 #
@@ -53,6 +53,10 @@
 # verbose::
 #   Print extra information.
 #
+# 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 -l /tmp/manifest.log manifest.pp
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd
index d7d94ce09..b4eafb483 100755
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@ -15,7 +15,6 @@
 #       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
 #       [--digest <digest>] [--fingerprint] [-V|--version]
 #       [-v|--verbose] [-w|--waitforcert <seconds>]
-#       [--apply catalog]
 #
 # = Description
 #
@@ -173,10 +172,6 @@
 #   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
-- 
cgit