Fixed #3128 - Updated man pages and moved puppet.conf.8 to puppet.conf.5

1 files changed, 24 insertions, 34 deletions

diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index 629fc9969..02176ce81 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -2,91 +2,81 @@
 .SH NAME
  \- 
 .\" Man page generated from reStructeredText.
-
+.
 .SH SYNOPSIS
+.sp
 Run a stand\-alone +puppet+ manifest.
-
-
 .SH USAGE
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
-
 .TP
 .B puppet [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-execute]
+.
 [\-\-detailed\-exitcodes] [\-l|\-\-logdest <file>] <file>
-
 .UNINDENT
 .UNINDENT
 .UNINDENT
-
 .SH DESCRIPTION
+.sp
 This is the standalone puppet execution tool; use it to execute
 individual manifests that you write. If you need to execute site\-wide
 manifests, use +puppetd+ and +puppetmasterd+.
-
-
 .SH 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
+.sp
+Note that any configuration parameter that\(aqs valid in the configuration
+file is also a valid long argument. For example, \(aqssldir\(aq is a valid
+configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
-
+.sp
 See the configuration file documentation at
 \fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
-\'\-\-genconfig\'.
-
+\(aq\-\-genconfig\(aq.
+.sp
 debug:              Enable full debugging.
-
 .INDENT 0.0
-
 .TP
 .B detailed\-exitcodes: Provide transaction information via exit codes. If
-this is enabled, an exit code of \'2\' means there
-were changes, and an exit code of \'4\' means that
+.
+this is enabled, an exit code of \(aq2\(aq means there
+were changes, and an exit code of \(aq4\(aq means that
 there were failures during the transaction.
-
 .UNINDENT
+.sp
 help:               Print this help message
-
 .INDENT 0.0
-
 .TP
 .B loadclasses:        Load any stored classes. +puppetd+ caches configured
+.
 classes (usually at /etc/puppet/classes.txt), and
 setting this option causes all of those classes to
 be set in your +puppet+ manifest.
-
-
 .TP
 .B logdest:            Where to send messages. Choose between syslog, the
+.
 console, and a log file. Defaults to sending
 messages to the console.
-
 .UNINDENT
+.sp
 execute:            Execute a specific piece of Puppet code
-
+.sp
 verbose:            Print extra information.
-
-
 .SH EXAMPLE
 .INDENT 0.0
 .INDENT 3.5
+.sp
 puppet \-l /tmp/manifest.log manifest.pp
-
 .UNINDENT
 .UNINDENT
-
 .SH AUTHOR
+.sp
 Luke Kanies
-
-
 .SH COPYRIGHT
+.sp
 Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
 License
-
-
-.\" Generated by docutils manpage writer on 2009-12-30 19:24.
+.\" Generated by docutils manpage writer.
 .\" 
+.