[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[nfagerlund]

The following commit has been merged in the experimental branch:
commit bd14ff5e1ea5bad3e1cba1fd19610f63158c5bc4
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Wed Feb 16 15:09:56 2011 -0800

    (#1204) Fix --compile and --apply options
    
    Forward-porting a fix from 2.6.x to the new help text locations.

diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 37029cf..a1edf62 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -40,7 +40,8 @@ Applies a standalone Puppet manifest to the local system.
 USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-  [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>] <file>
+  [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>]
+  [--apply <catalog>] <file>
 
 
 DESCRIPTION
@@ -98,6 +99,10 @@ configuration options can also be generated by running puppet with
 * --verbose:
   Print extra information.
 
+* --apply:
+  Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
+  either specify a JSON file or pipe in JSON from standard input.
+
 
 EXAMPLE
 -------
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 39af33d..f689b9e 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -41,7 +41,7 @@ USAGE
 -----
 puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
   [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
-  [--compile <nodename>] [--apply <catalog>]
+  [--compile <node-name>]
 
 
 DESCRIPTION
@@ -89,14 +89,8 @@ with '--genconfig'.
   Print the puppet version number and exit.
 
 * --compile:
-  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.
+  Compile a catalogue and output it in JSON from the puppet master. Uses
+  facts contained in the $vardir/yaml/ directory to compile the catalog.
 
 
 EXAMPLE

-- 
Puppet packaging for Debian