Merge branch 'maint/2.6.next/help' into next

1 files changed, 77 insertions, 0 deletions

diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 879b66c67..b2b77f870 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -25,6 +25,83 @@ class Puppet::Application::Master < Puppet::Application
     end
   end
 
+  def help
+    <<-HELP
+
+SYNOPSIS
+========
+The central puppet server. Functions as a certificate authority by
+default.
+
+
+USAGE
+=====
+  puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
+      [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
+      [--compile <nodename>] [--apply <catalog>]
+
+DESCRIPTION
+===========
+This is the puppet central daemon.
+
+
+OPTIONS
+=======
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '--ssldir <directory>' as an
+argument.
+
+See the configuration file documentation at
+http://docs.puppetlabs.com/references/stable/configuration.html for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppetmasterdd
+with '--genconfig'.
+
+daemonize:    Send the process into the background. This is the default.
+
+no-daemonize: Do not send the process into the background.
+
+debug:        Enable full debugging.
+
+help:         Print this help message.
+
+logdest:      Where to send messages. Choose between syslog, the
+              console, and a log file. Defaults to sending messages to
+              syslog, or the console if debugging or verbosity is
+              enabled.
+
+verbose:      Enable verbosity.
+
+version:      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.
+
+
+EXAMPLE
+=======
+  puppet master
+
+
+AUTHOR
+======
+Luke Kanies
+
+
+COPYRIGHT
+=========
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
+License
+
+    HELP
+  end
+
   def preinit
     trap(:INT) do
       $stderr.puts "Cancelling startup"