Markdown changes for compatibility with ronn.
Signed-off-by: nfagerlund <[email protected]>
---
Local-branch: ticket/next/1204
lib/puppet/application/master.rb | 71 +++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index b2b77f8..39af33d 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -28,25 +28,32 @@ class Puppet::Application::Master < Puppet::Application
def help
<<-HELP
-SYNOPSIS
+puppet-master(8) -- The puppet master daemon
========
+
+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>]
+-----
+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.
+-----------
+This command starts an instance of puppet master, running as a daemon
+and using Ruby's built-in Webrick webserver. Puppet master can also be
+managed by other application servers; when this is the case, this
+executable is not used.
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
@@ -55,47 +62,55 @@ 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
+configuration options can also be generated by running puppet master
with '--genconfig'.
-daemonize: Send the process into the background. This is the default.
+* --daemonize:
+ Send the process into the background. This is the default.
-no-daemonize: Do not send the process into the background.
+* --no-daemonize:
+ Do not send the process into the background.
-debug: Enable full debugging.
+* --debug:
+ Enable full debugging.
-help: Print this help message.
+* --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.
+* --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.
+* --verbose:
+ Enable verbosity.
-version: Print the puppet version number and exit.
+* --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.
+* --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.
+* --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
--
1.7.3.3
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
