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

nfagerlund nick.fagerlund at gmail.com
Tue May 10 08:04:54 UTC 2011


The following commit has been merged in the experimental branch:
commit a0cff49aaa6586347b77437137cfa57f8013c344
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Wed Feb 16 17:43:54 2011 -0800

    (#1204) Update all the manpages
    
    We got the rake task working! We're not done, but all the
    manpages look a lot better, so let's commit that.

diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
index 210f367..feccf10 100644
--- a/man/man5/puppet.conf.5
+++ b/man/man5/puppet.conf.5
@@ -1,14 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "August 2010" "" ""
-\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Sat Aug 28 14:00:20 \-0700 2010)\fR
-.
-.P
-{:toc}
+.TH "PUPPETCONF" "5" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Feb 16 17:06:38 \-0800 2011)\fR
 .
 .SH "Specifying Configuration Parameters"
-On The Command\-Line +++++++++++++++++++ Every Puppet executable (with the exception of \fBpuppetdoc\fR) accepts all of the parameters below, but not all of the arguments make sense for every executable\.
+.
+.SS "On The Command\-Line"
+Every Puppet executable (with the exception of \fBpuppetdoc\fR) accepts all of the parameters below, but not all of the arguments make sense for every executable\.
 .
 .P
 I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not\.
@@ -44,19 +43,13 @@ $ puppet agent \-\-no\-storeconfigs
 .P
 The invocations above will enable and disable, respectively, the storage of the client configuration\.
 .
-.P
-Configuration Files +++++++++++++++++++
-.
-.P
+.SS "Configuration Files"
 As mentioned above, the configuration parameters can also be stored in a configuration file, located in the configuration directory\. As root, the default configuration directory is \fB/etc/puppet\fR, and as a regular user, the default configuration directory is \fB~user/\.puppet\fR\. As of 0\.23\.0, all executables look for \fBpuppet\.conf\fR in their configuration directory (although they previously looked for separate files)\. For example, \fBpuppet\.conf\fR is located at \fB/etc/puppet/puppet\.conf\fR as \fBroot\fR and \fB~user/\.puppet/puppet\.conf\fR as a regular user by default\.
 .
 .P
 All executables will set any parameters set within the \fB[main]\fR section, and each executable will also use one of the \fB[master]\fR, \fB[agent]\fR\.
 .
 .P
-File Format \'\'\'\'\'\'\'\'\'\'\'
-.
-.P
 The file follows INI\-style formatting\. Here is an example of a very simple \fBpuppet\.conf\fR file:
 .
 .IP "" 4
@@ -75,14 +68,14 @@ The file follows INI\-style formatting\. Here is an example of a very simple \fB
 Note that boolean parameters must be explicitly specified as \fBtrue\fR or \fBfalse\fR as seen above\.
 .
 .P
-If you need to change file parameters (e\.g\., reset the mode or owner), do so within curly braces on the same line:
+If you need to change file or directory parameters (e\.g\., reset the mode or owner), do so within curly braces on the same line:
 .
 .IP "" 4
 .
 .nf
 
 [main]
-  myfile = /tmp/whatever {owner = root, mode = 644}
+  vardir = /new/vardir {owner = root, mode = 644}
 .
 .fi
 .
@@ -139,21 +132,31 @@ Sending the \fBSIGUSR1\fR signal to an instance of \fBpuppet agent\fR will cause
 .SH "Configuration Parameter Reference"
 Below is a list of all documented parameters\. Not all of them are valid with all Puppet executables, but the executables will ignore any inappropriate values\.
 .
-.P
-async_storeconfigs ++++++++++++++++++
+.SS "archive_file_server"
+During an inspect run, the file bucket server to archive files to if archive_files is set\.
 .
-.P
-Whether to use a queueing system to provide asynchronous database integration\. Requires that \fBpuppetqd\fR be running and that \'PSON\' support for ruby be installed\.
+.IP "\(bu" 4
+\fIDefault\fR: $server
+.
+.IP "" 0
+.
+.SS "archive_files"
+During an inspect run, whether to archive files whose contents are audited to a file bucket\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
-.P
-authconfig ++++++++++
+.SS "async_storeconfigs"
+Whether to use a queueing system to provide asynchronous database integration\. Requires that \fBpuppetqd\fR be running and that \'PSON\' support for ruby be installed\.
 .
-.P
+.IP "\(bu" 4
+\fIDefault\fR: false
+.
+.IP "" 0
+.
+.SS "authconfig"
 The configuration file that defines the rights to the different namespaces and methods\. This can be used as a coarse\-grained authorization system for both \fBpuppet agent\fR and \fBpuppet master\fR\.
 .
 .IP "\(bu" 4
@@ -161,10 +164,7 @@ The configuration file that defines the rights to the different namespaces and m
 .
 .IP "" 0
 .
-.P
-autoflush +++++++++
-.
-.P
+.SS "autoflush"
 Whether log files should always flush to disk\.
 .
 .IP "\(bu" 4
@@ -172,10 +172,7 @@ Whether log files should always flush to disk\.
 .
 .IP "" 0
 .
-.P
-autosign ++++++++
-.
-.P
+.SS "autosign"
 Whether to enable autosign\. Valid values are true (which autosigns any key request, and is a very bad idea), false (which never autosigns any key request), and the path to a file, which uses that configuration file to determine which keys to sign\.
 .
 .IP "\(bu" 4
@@ -183,16 +180,10 @@ Whether to enable autosign\. Valid values are true (which autosigns any key requ
 .
 .IP "" 0
 .
-.P
-bindaddress +++++++++++
-.
-.P
+.SS "bindaddress"
 The address a listening server should bind to\. Mongrel servers default to 127\.0\.0\.1 and WEBrick defaults to 0\.0\.0\.0\.
 .
-.P
-bucketdir +++++++++
-.
-.P
+.SS "bucketdir"
 Where FileBucket files are stored\.
 .
 .IP "\(bu" 4
@@ -200,10 +191,7 @@ Where FileBucket files are stored\.
 .
 .IP "" 0
 .
-.P
-ca ++
-.
-.P
+.SS "ca"
 Wether the master should function as a certificate authority\.
 .
 .IP "\(bu" 4
@@ -211,16 +199,10 @@ Wether the master should function as a certificate authority\.
 .
 .IP "" 0
 .
-.P
-ca_days +++++++
-.
-.P
+.SS "ca_days"
 How long a certificate should be valid\. This parameter is deprecated, use ca_ttl instead
 .
-.P
-ca_md +++++
-.
-.P
+.SS "ca_md"
 The type of hash used in certificates\.
 .
 .IP "\(bu" 4
@@ -228,21 +210,15 @@ The type of hash used in certificates\.
 .
 .IP "" 0
 .
-.P
-ca_name +++++++
-.
-.P
+.SS "ca_name"
 The name to use the Certificate Authority certificate\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $certname
+\fIDefault\fR: Puppet CA: $certname
 .
 .IP "" 0
 .
-.P
-ca_port +++++++
-.
-.P
+.SS "ca_port"
 The port to use for the certificate authority\.
 .
 .IP "\(bu" 4
@@ -250,10 +226,7 @@ The port to use for the certificate authority\.
 .
 .IP "" 0
 .
-.P
-ca_server +++++++++
-.
-.P
+.SS "ca_server"
 The server to use for certificate authority requests\. It\'s a separate server because it cannot and does not need to horizontally scale\.
 .
 .IP "\(bu" 4
@@ -261,10 +234,7 @@ The server to use for certificate authority requests\. It\'s a separate server b
 .
 .IP "" 0
 .
-.P
-ca_ttl ++++++
-.
-.P
+.SS "ca_ttl"
 The default TTL for new certificates; valid values must be an integer, optionally followed by one of the units \'y\' (years of 365 days), \'d\' (days), \'h\' (hours), or \'s\' (seconds)\. The unit defaults to seconds\. If this parameter is set, ca_days is ignored\. Examples are \'3600\' (one hour) and \'1825d\', which is the same as \'5y\' (5 years)
 .
 .IP "\(bu" 4
@@ -272,10 +242,7 @@ The default TTL for new certificates; valid values must be an integer, optionall
 .
 .IP "" 0
 .
-.P
-cacert ++++++
-.
-.P
+.SS "cacert"
 The CA certificate\.
 .
 .IP "\(bu" 4
@@ -283,10 +250,7 @@ The CA certificate\.
 .
 .IP "" 0
 .
-.P
-cacrl +++++
-.
-.P
+.SS "cacrl"
 The certificate revocation list (CRL) for the CA\. Will be used if present but otherwise ignored\.
 .
 .IP "\(bu" 4
@@ -294,10 +258,7 @@ The certificate revocation list (CRL) for the CA\. Will be used if present but o
 .
 .IP "" 0
 .
-.P
-cadir +++++
-.
-.P
+.SS "cadir"
 The root directory for the certificate authority\.
 .
 .IP "\(bu" 4
@@ -305,10 +266,7 @@ The root directory for the certificate authority\.
 .
 .IP "" 0
 .
-.P
-cakey +++++
-.
-.P
+.SS "cakey"
 The CA private key\.
 .
 .IP "\(bu" 4
@@ -316,10 +274,7 @@ The CA private key\.
 .
 .IP "" 0
 .
-.P
-capass ++++++
-.
-.P
+.SS "capass"
 Where the CA stores the password for the private key
 .
 .IP "\(bu" 4
@@ -327,10 +282,7 @@ Where the CA stores the password for the private key
 .
 .IP "" 0
 .
-.P
-caprivatedir ++++++++++++
-.
-.P
+.SS "caprivatedir"
 Where the CA stores private certificate information\.
 .
 .IP "\(bu" 4
@@ -338,10 +290,7 @@ Where the CA stores private certificate information\.
 .
 .IP "" 0
 .
-.P
-capub +++++
-.
-.P
+.SS "capub"
 The CA public key\.
 .
 .IP "\(bu" 4
@@ -349,16 +298,10 @@ The CA public key\.
 .
 .IP "" 0
 .
-.P
-catalog_format ++++++++++++++
-.
-.P
+.SS "catalog_format"
 (Deprecated for \'preferred_serialization_format\') What format to use to dump the catalog\. Only supports \'marshal\' and \'yaml\'\. Only matters on the client, since it asks the server for a specific format\.
 .
-.P
-catalog_terminus ++++++++++++++++
-.
-.P
+.SS "catalog_terminus"
 Where to get node catalogs\. This is useful to change if, for instance, you\'d like to pre\-compile catalogs and store them in memcached or some other easily\-accessed store\.
 .
 .IP "\(bu" 4
@@ -366,10 +309,7 @@ Where to get node catalogs\. This is useful to change if, for instance, you\'d l
 .
 .IP "" 0
 .
-.P
-cert_inventory ++++++++++++++
-.
-.P
+.SS "cert_inventory"
 A Complete listing of all certificates
 .
 .IP "\(bu" 4
@@ -377,10 +317,7 @@ A Complete listing of all certificates
 .
 .IP "" 0
 .
-.P
-certdir +++++++
-.
-.P
+.SS "certdir"
 The certificate directory\.
 .
 .IP "\(bu" 4
@@ -388,16 +325,10 @@ The certificate directory\.
 .
 .IP "" 0
 .
-.P
-certdnsnames ++++++++++++
-.
-.P
+.SS "certdnsnames"
 The DNS names on the Server certificate as a colon\-separated list\. If it\'s anything other than an empty string, it will be used as an alias in the created certificate\. By default, only the server gets an alias set up, and only for \'puppet\'\.
 .
-.P
-certificate_revocation ++++++++++++++++++++++
-.
-.P
+.SS "certificate_revocation"
 Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL) to all clients\. If enabled, CA chaining will almost definitely not work\.
 .
 .IP "\(bu" 4
@@ -405,21 +336,15 @@ Whether certificate revocation should be supported by downloading a Certificate
 .
 .IP "" 0
 .
-.P
-certname ++++++++
-.
-.P
+.SS "certname"
 The name to use when handling certificates\. Defaults to the fully qualified domain name\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: pelin\.members\.linode\.com
+\fIDefault\fR: magpie\.puppetlabs\.lan
 .
 .IP "" 0
 .
-.P
-classfile +++++++++
-.
-.P
+.SS "classfile"
 The file in which puppet agent stores a list of the classes associated with the retrieved configuration\. Can be loaded in the separate \fBpuppet\fR executable using the \fB\-\-loadclasses\fR option\.
 .
 .IP "\(bu" 4
@@ -427,10 +352,7 @@ The file in which puppet agent stores a list of the classes associated with the
 .
 .IP "" 0
 .
-.P
-client_datadir ++++++++++++++
-.
-.P
+.SS "client_datadir"
 The directory in which serialized data is stored on the client\.
 .
 .IP "\(bu" 4
@@ -438,10 +360,7 @@ The directory in which serialized data is stored on the client\.
 .
 .IP "" 0
 .
-.P
-clientbucketdir +++++++++++++++
-.
-.P
+.SS "clientbucketdir"
 Where FileBucket files are stored locally\.
 .
 .IP "\(bu" 4
@@ -449,10 +368,7 @@ Where FileBucket files are stored locally\.
 .
 .IP "" 0
 .
-.P
-clientyamldir +++++++++++++
-.
-.P
+.SS "clientyamldir"
 The directory in which client\-side YAML data is stored\.
 .
 .IP "\(bu" 4
@@ -460,16 +376,10 @@ The directory in which client\-side YAML data is stored\.
 .
 .IP "" 0
 .
-.P
-code ++++
-.
-.P
+.SS "code"
 Code to parse directly\. This is essentially only used by \fBpuppet\fR, and should only be set if you\'re writing your own Puppet executable
 .
-.P
-color +++++
-.
-.P
+.SS "color"
 Whether to use colors when logging to the console\. Valid values are \fBansi\fR (equivalent to \fBtrue\fR), \fBhtml\fR (mostly used during testing with TextMate), and \fBfalse\fR, which produces no color\.
 .
 .IP "\(bu" 4
@@ -477,21 +387,15 @@ Whether to use colors when logging to the console\. Valid values are \fBansi\fR
 .
 .IP "" 0
 .
-.P
-confdir +++++++
-.
-.P
-The main Puppet configuration directory\. The default for this parameter is calculated based on the user\. If the process is running as root or the user that \fBpuppet master\fR is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in \fB~\fR\.
+.SS "confdir"
+The main Puppet configuration directory\. The default for this parameter is calculated based on the user\. If the process is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in the user\'s home directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: /etc/puppet
 .
 .IP "" 0
 .
-.P
-config ++++++
-.
-.P
+.SS "config"
 The configuration file for doc\.
 .
 .IP "\(bu" 4
@@ -499,22 +403,13 @@ The configuration file for doc\.
 .
 .IP "" 0
 .
-.P
-config_version ++++++++++++++
-.
-.P
+.SS "config_version"
 How to determine the configuration version\. By default, it will be the time that the configuration is parsed, but you can provide a shell script to override how the version is determined\. The output of this script will be added to every log message in the reports, allowing you to correlate changes on your hosts to the source version on the server\.
 .
-.P
-configprint +++++++++++
-.
-.P
+.SS "configprint"
 Print the value of a specific configuration parameter\. If a parameter is provided for this, then the value is printed and puppet exits\. Comma\-separate multiple values\. For a list of all values, specify \'all\'\. This feature is only available in Puppet versions higher than 0\.18\.4\.
 .
-.P
-configtimeout +++++++++++++
-.
-.P
+.SS "configtimeout"
 How long the client should wait for the configuration to be retrieved before considering it a failure\. This can help reduce flapping if too many clients contact the server at one time\.
 .
 .IP "\(bu" 4
@@ -522,10 +417,7 @@ How long the client should wait for the configuration to be retrieved before con
 .
 .IP "" 0
 .
-.P
-couchdb_url +++++++++++
-.
-.P
+.SS "couchdb_url"
 The url where the puppet couchdb database will be created
 .
 .IP "\(bu" 4
@@ -533,10 +425,7 @@ The url where the puppet couchdb database will be created
 .
 .IP "" 0
 .
-.P
-csrdir ++++++
-.
-.P
+.SS "csrdir"
 Where the CA stores certificate requests
 .
 .IP "\(bu" 4
@@ -544,10 +433,7 @@ Where the CA stores certificate requests
 .
 .IP "" 0
 .
-.P
-daemonize +++++++++
-.
-.P
+.SS "daemonize"
 Send the process into the background\. This is the default\.
 .
 .IP "\(bu" 4
@@ -555,10 +441,7 @@ Send the process into the background\. This is the default\.
 .
 .IP "" 0
 .
-.P
-dbadapter +++++++++
-.
-.P
+.SS "dbadapter"
 The type of database to use\.
 .
 .IP "\(bu" 4
@@ -566,21 +449,10 @@ The type of database to use\.
 .
 .IP "" 0
 .
-.P
-dbconnections +++++++++++++
-.
-.P
-The number of database connections\. Only used when networked databases are used\. Will be ignored if the value is an empty string or is less than 1\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: 0
-.
-.IP "" 0
+.SS "dbconnections"
+The number of database connections for networked databases\. Will be ignored unless the value is a positive integer\.
 .
-.P
-dblocation ++++++++++
-.
-.P
+.SS "dblocation"
 The database cache for client configurations\. Used for querying within the language\.
 .
 .IP "\(bu" 4
@@ -588,10 +460,7 @@ The database cache for client configurations\. Used for querying within the lang
 .
 .IP "" 0
 .
-.P
-dbmigrate +++++++++
-.
-.P
+.SS "dbmigrate"
 Whether to automatically migrate the database\.
 .
 .IP "\(bu" 4
@@ -599,10 +468,7 @@ Whether to automatically migrate the database\.
 .
 .IP "" 0
 .
-.P
-dbname ++++++
-.
-.P
+.SS "dbname"
 The name of the database to use\.
 .
 .IP "\(bu" 4
@@ -610,10 +476,7 @@ The name of the database to use\.
 .
 .IP "" 0
 .
-.P
-dbpassword ++++++++++
-.
-.P
+.SS "dbpassword"
 The database password for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
@@ -621,16 +484,10 @@ The database password for caching\. Only used when networked databases are used\
 .
 .IP "" 0
 .
-.P
-dbport ++++++
-.
-.P
+.SS "dbport"
 The database password for caching\. Only used when networked databases are used\.
 .
-.P
-dbserver ++++++++
-.
-.P
+.SS "dbserver"
 The database server for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
@@ -638,16 +495,10 @@ The database server for caching\. Only used when networked databases are used\.
 .
 .IP "" 0
 .
-.P
-dbsocket ++++++++
-.
-.P
+.SS "dbsocket"
 The database socket location\. Only used when networked databases are used\. Will be ignored if the value is an empty string\.
 .
-.P
-dbuser ++++++
-.
-.P
+.SS "dbuser"
 The database user for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
@@ -655,10 +506,7 @@ The database user for caching\. Only used when networked databases are used\.
 .
 .IP "" 0
 .
-.P
-diff ++++
-.
-.P
+.SS "diff"
 Which diff command to use when printing differences between files\.
 .
 .IP "\(bu" 4
@@ -666,10 +514,7 @@ Which diff command to use when printing differences between files\.
 .
 .IP "" 0
 .
-.P
-diff_args +++++++++
-.
-.P
+.SS "diff_args"
 Which arguments to pass to the diff command when printing differences between files\.
 .
 .IP "\(bu" 4
@@ -677,10 +522,7 @@ Which arguments to pass to the diff command when printing differences between fi
 .
 .IP "" 0
 .
-.P
-downcasefacts +++++++++++++
-.
-.P
+.SS "downcasefacts"
 Whether facts should be made all lowercase when sent to the server\.
 .
 .IP "\(bu" 4
@@ -688,10 +530,7 @@ Whether facts should be made all lowercase when sent to the server\.
 .
 .IP "" 0
 .
-.P
-dynamicfacts ++++++++++++
-.
-.P
+.SS "dynamicfacts"
 Facts that are dynamic; these facts will be ignored when deciding whether changed facts should result in a recompile\. Multiple facts should be comma\-separated\.
 .
 .IP "\(bu" 4
@@ -699,10 +538,7 @@ Facts that are dynamic; these facts will be ignored when deciding whether change
 .
 .IP "" 0
 .
-.P
-environment +++++++++++
-.
-.P
+.SS "environment"
 The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR) this determines the environment itself, which is used to find modules and much more\. For servers (i\.e\., \fBpuppet master\fR) this provides the default environment for nodes we know nothing about\.
 .
 .IP "\(bu" 4
@@ -710,10 +546,7 @@ The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR)
 .
 .IP "" 0
 .
-.P
-evaltrace +++++++++
-.
-.P
+.SS "evaltrace"
 Whether each resource should log when it is being evaluated\. This allows you to interactively see exactly what is being done\.
 .
 .IP "\(bu" 4
@@ -721,10 +554,7 @@ Whether each resource should log when it is being evaluated\. This allows you to
 .
 .IP "" 0
 .
-.P
-external_nodes ++++++++++++++
-.
-.P
+.SS "external_nodes"
 An external command that can produce node information\. The output must be a YAML dump of a hash, and that hash must have one or both of \fBclasses\fR and \fBparameters\fR, where \fBclasses\fR is an array and \fBparameters\fR is a hash\. For unknown nodes, the commands should exit with a non\-zero exit code\. This command makes it straightforward to store your node mapping information in other data sources like databases\.
 .
 .IP "\(bu" 4
@@ -732,10 +562,7 @@ An external command that can produce node information\. The output must be a YAM
 .
 .IP "" 0
 .
-.P
-factdest ++++++++
-.
-.P
+.SS "factdest"
 Where Puppet should store facts that it pulls down from the central server\.
 .
 .IP "\(bu" 4
@@ -743,10 +570,7 @@ Where Puppet should store facts that it pulls down from the central server\.
 .
 .IP "" 0
 .
-.P
-factpath ++++++++
-.
-.P
+.SS "factpath"
 Where Puppet should look for facts\. Multiple directories should be colon\-separated, like normal PATH variables\.
 .
 .IP "\(bu" 4
@@ -754,10 +578,7 @@ Where Puppet should look for facts\. Multiple directories should be colon\-separ
 .
 .IP "" 0
 .
-.P
-facts_terminus ++++++++++++++
-.
-.P
+.SS "facts_terminus"
 The node facts terminus\.
 .
 .IP "\(bu" 4
@@ -765,10 +586,7 @@ The node facts terminus\.
 .
 .IP "" 0
 .
-.P
-factsignore +++++++++++
-.
-.P
+.SS "factsignore"
 What files to ignore when pulling down facts\.
 .
 .IP "\(bu" 4
@@ -776,10 +594,7 @@ What files to ignore when pulling down facts\.
 .
 .IP "" 0
 .
-.P
-factsource ++++++++++
-.
-.P
+.SS "factsource"
 From where to retrieve facts\. The standard Puppet \fBfile\fR type is used for retrieval, so anything that is a valid file source can be used here\.
 .
 .IP "\(bu" 4
@@ -787,10 +602,7 @@ From where to retrieve facts\. The standard Puppet \fBfile\fR type is used for r
 .
 .IP "" 0
 .
-.P
-factsync ++++++++
-.
-.P
+.SS "factsync"
 Whether facts should be synced with the central server\.
 .
 .IP "\(bu" 4
@@ -798,10 +610,7 @@ Whether facts should be synced with the central server\.
 .
 .IP "" 0
 .
-.P
-fileserverconfig ++++++++++++++++
-.
-.P
+.SS "fileserverconfig"
 Where the fileserver configuration is stored\.
 .
 .IP "\(bu" 4
@@ -809,10 +618,7 @@ Where the fileserver configuration is stored\.
 .
 .IP "" 0
 .
-.P
-filetimeout +++++++++++
-.
-.P
+.SS "filetimeout"
 The minimum time to wait (in seconds) between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\.
 .
 .IP "\(bu" 4
@@ -820,10 +626,7 @@ The minimum time to wait (in seconds) between checking for updates in configurat
 .
 .IP "" 0
 .
-.P
-freeze_main +++++++++++
-.
-.P
+.SS "freeze_main"
 Freezes the \'main\' class, disallowing any code to be added to it\. This essentially means that you can\'t have any code outside of a node, class, or definition other than in the site manifest\.
 .
 .IP "\(bu" 4
@@ -831,10 +634,7 @@ Freezes the \'main\' class, disallowing any code to be added to it\. This essent
 .
 .IP "" 0
 .
-.P
-genconfig +++++++++
-.
-.P
+.SS "genconfig"
 Whether to just print a configuration to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
 .
 .IP "\(bu" 4
@@ -842,10 +642,7 @@ Whether to just print a configuration to stdout and exit\. Only makes sense when
 .
 .IP "" 0
 .
-.P
-genmanifest +++++++++++
-.
-.P
+.SS "genmanifest"
 Whether to just print a manifest to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
 .
 .IP "\(bu" 4
@@ -853,10 +650,7 @@ Whether to just print a manifest to stdout and exit\. Only makes sense when used
 .
 .IP "" 0
 .
-.P
-graph +++++
-.
-.P
+.SS "graph"
 Whether to create dot graph files for the different configuration graphs\. These dot files can be interpreted by tools like OmniGraffle or dot (which is part of ImageMagick)\.
 .
 .IP "\(bu" 4
@@ -864,10 +658,7 @@ Whether to create dot graph files for the different configuration graphs\. These
 .
 .IP "" 0
 .
-.P
-graphdir ++++++++
-.
-.P
+.SS "graphdir"
 Where to store dot\-outputted graphs\.
 .
 .IP "\(bu" 4
@@ -875,10 +666,7 @@ Where to store dot\-outputted graphs\.
 .
 .IP "" 0
 .
-.P
-group +++++
-.
-.P
+.SS "group"
 The group puppet master should run as\.
 .
 .IP "\(bu" 4
@@ -886,10 +674,7 @@ The group puppet master should run as\.
 .
 .IP "" 0
 .
-.P
-hostcert ++++++++
-.
-.P
+.SS "hostcert"
 Where individual hosts store and look for their certificates\.
 .
 .IP "\(bu" 4
@@ -897,10 +682,7 @@ Where individual hosts store and look for their certificates\.
 .
 .IP "" 0
 .
-.P
-hostcrl +++++++
-.
-.P
+.SS "hostcrl"
 Where the host\'s certificate revocation list can be found\. This is distinct from the certificate authority\'s CRL\.
 .
 .IP "\(bu" 4
@@ -908,10 +690,7 @@ Where the host\'s certificate revocation list can be found\. This is distinct fr
 .
 .IP "" 0
 .
-.P
-hostcsr +++++++
-.
-.P
+.SS "hostcsr"
 Where individual hosts store and look for their certificate requests\.
 .
 .IP "\(bu" 4
@@ -919,10 +698,7 @@ Where individual hosts store and look for their certificate requests\.
 .
 .IP "" 0
 .
-.P
-hostprivkey +++++++++++
-.
-.P
+.SS "hostprivkey"
 Where individual hosts store and look for their private key\.
 .
 .IP "\(bu" 4
@@ -930,10 +706,7 @@ Where individual hosts store and look for their private key\.
 .
 .IP "" 0
 .
-.P
-hostpubkey ++++++++++
-.
-.P
+.SS "hostpubkey"
 Where individual hosts store and look for their public key\.
 .
 .IP "\(bu" 4
@@ -941,10 +714,7 @@ Where individual hosts store and look for their public key\.
 .
 .IP "" 0
 .
-.P
-http_compression ++++++++++++++++
-.
-.P
+.SS "http_compression"
 Allow http compression in REST communication with the master\. This setting might improve performance for agent \-> master communications over slow WANs\. Your puppetmaster needs to support compression (usually by activating some settings in a reverse\-proxy in front of the puppetmaster, which rules out webrick)\. It is harmless to activate this settings if your master doesn\'t support compression, but if it supports it, this setting might reduce performance on high\-speed LANs\.
 .
 .IP "\(bu" 4
@@ -952,10 +722,7 @@ Allow http compression in REST communication with the master\. This setting migh
 .
 .IP "" 0
 .
-.P
-http_proxy_host +++++++++++++++
-.
-.P
+.SS "http_proxy_host"
 The HTTP proxy host to use for outgoing connections\. Note: You may need to use a FQDN for the server hostname when using a proxy\.
 .
 .IP "\(bu" 4
@@ -963,10 +730,7 @@ The HTTP proxy host to use for outgoing connections\. Note: You may need to use
 .
 .IP "" 0
 .
-.P
-http_proxy_port +++++++++++++++
-.
-.P
+.SS "http_proxy_port"
 The HTTP proxy port to use for outgoing connections
 .
 .IP "\(bu" 4
@@ -974,10 +738,7 @@ The HTTP proxy port to use for outgoing connections
 .
 .IP "" 0
 .
-.P
-httplog +++++++
-.
-.P
+.SS "httplog"
 Where the puppet agent web server logs\.
 .
 .IP "\(bu" 4
@@ -985,10 +746,7 @@ Where the puppet agent web server logs\.
 .
 .IP "" 0
 .
-.P
-ignorecache +++++++++++
-.
-.P
+.SS "ignorecache"
 Ignore cache and always recompile the configuration\. This is useful for testing new configurations, where the local cache may in fact be stale even if the timestamps are up to date \- if the facts change or if the server changes\.
 .
 .IP "\(bu" 4
@@ -996,10 +754,7 @@ Ignore cache and always recompile the configuration\. This is useful for testing
 .
 .IP "" 0
 .
-.P
-ignoreimport ++++++++++++
-.
-.P
+.SS "ignoreimport"
 A parameter that can be used in commit hooks, since it enables you to parse\-check a single file rather than requiring that all files exist\.
 .
 .IP "\(bu" 4
@@ -1007,10 +762,7 @@ A parameter that can be used in commit hooks, since it enables you to parse\-che
 .
 .IP "" 0
 .
-.P
-ignoreschedules +++++++++++++++
-.
-.P
+.SS "ignoreschedules"
 Boolean; whether puppet agent should ignore schedules\. This is useful for initial puppet agent runs\.
 .
 .IP "\(bu" 4
@@ -1018,10 +770,31 @@ Boolean; whether puppet agent should ignore schedules\. This is useful for initi
 .
 .IP "" 0
 .
-.P
-keylength +++++++++
+.SS "inventory_port"
+The port to communicate with the inventory_server\.
 .
-.P
+.IP "\(bu" 4
+\fIDefault\fR: $masterport
+.
+.IP "" 0
+.
+.SS "inventory_server"
+The server to send facts to\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: $server
+.
+.IP "" 0
+.
+.SS "inventory_terminus"
+Should usually be the same as the facts terminus
+.
+.IP "\(bu" 4
+\fIDefault\fR: $facts_terminus
+.
+.IP "" 0
+.
+.SS "keylength"
 The bit length of keys\.
 .
 .IP "\(bu" 4
@@ -1029,10 +802,23 @@ The bit length of keys\.
 .
 .IP "" 0
 .
-.P
-ldapattrs +++++++++
+.SS "lastrunfile"
+Where puppet agent stores the last run report summary in yaml format\.
 .
-.P
+.IP "\(bu" 4
+\fIDefault\fR: $statedir/last_run_summary\.yaml
+.
+.IP "" 0
+.
+.SS "lastrunreport"
+Where puppet agent stores the last run report in yaml format\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: $statedir/last_run_report\.yaml
+.
+.IP "" 0
+.
+.SS "ldapattrs"
 The LDAP attributes to include when querying LDAP for nodes\. All returned attributes are set as variables in the top\-level scope\. Multiple values should be comma\-separated\. The value \'all\' returns all attributes\.
 .
 .IP "\(bu" 4
@@ -1040,16 +826,10 @@ The LDAP attributes to include when querying LDAP for nodes\. All returned attri
 .
 .IP "" 0
 .
-.P
-ldapbase ++++++++
-.
-.P
+.SS "ldapbase"
 The search base for LDAP searches\. It\'s impossible to provide a meaningful default here, although the LDAP libraries might have one already set\. Generally, it should be the \'ou=Hosts\' branch under your main directory\.
 .
-.P
-ldapclassattrs ++++++++++++++
-.
-.P
+.SS "ldapclassattrs"
 The LDAP attributes to use to define Puppet classes\. Values should be comma\-separated\.
 .
 .IP "\(bu" 4
@@ -1057,10 +837,7 @@ The LDAP attributes to use to define Puppet classes\. Values should be comma\-se
 .
 .IP "" 0
 .
-.P
-ldapnodes +++++++++
-.
-.P
+.SS "ldapnodes"
 Whether to search for node configurations in LDAP\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/LDAP_Nodes for more information\.
 .
 .IP "\(bu" 4
@@ -1068,10 +845,7 @@ Whether to search for node configurations in LDAP\. See http://projects\.puppetl
 .
 .IP "" 0
 .
-.P
-ldapparentattr ++++++++++++++
-.
-.P
+.SS "ldapparentattr"
 The attribute to use to define the parent node\.
 .
 .IP "\(bu" 4
@@ -1079,16 +853,10 @@ The attribute to use to define the parent node\.
 .
 .IP "" 0
 .
-.P
-ldappassword ++++++++++++
-.
-.P
+.SS "ldappassword"
 The password to use to connect to LDAP\.
 .
-.P
-ldapport ++++++++
-.
-.P
+.SS "ldapport"
 The LDAP port\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "\(bu" 4
@@ -1096,10 +864,7 @@ The LDAP port\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "" 0
 .
-.P
-ldapserver ++++++++++
-.
-.P
+.SS "ldapserver"
 The LDAP server\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "\(bu" 4
@@ -1107,10 +872,7 @@ The LDAP server\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "" 0
 .
-.P
-ldapssl +++++++
-.
-.P
+.SS "ldapssl"
 Whether SSL should be used when searching for nodes\. Defaults to false because SSL usually requires certificates to be set up on the client side\.
 .
 .IP "\(bu" 4
@@ -1118,10 +880,7 @@ Whether SSL should be used when searching for nodes\. Defaults to false because
 .
 .IP "" 0
 .
-.P
-ldapstackedattrs ++++++++++++++++
-.
-.P
+.SS "ldapstackedattrs"
 The LDAP attributes that should be stacked to arrays by adding the values in all hierarchy elements of the tree\. Values should be comma\-separated\.
 .
 .IP "\(bu" 4
@@ -1129,10 +888,7 @@ The LDAP attributes that should be stacked to arrays by adding the values in all
 .
 .IP "" 0
 .
-.P
-ldapstring ++++++++++
-.
-.P
+.SS "ldapstring"
 The search string used to find an LDAP node\.
 .
 .IP "\(bu" 4
@@ -1140,10 +896,7 @@ The search string used to find an LDAP node\.
 .
 .IP "" 0
 .
-.P
-ldaptls +++++++
-.
-.P
+.SS "ldaptls"
 Whether TLS should be used when searching for nodes\. Defaults to false because TLS usually requires certificates to be set up on the client side\.
 .
 .IP "\(bu" 4
@@ -1151,16 +904,10 @@ Whether TLS should be used when searching for nodes\. Defaults to false because
 .
 .IP "" 0
 .
-.P
-ldapuser ++++++++
-.
-.P
+.SS "ldapuser"
 The user to use to connect to LDAP\. Must be specified as a full DN\.
 .
-.P
-lexical +++++++
-.
-.P
+.SS "lexical"
 Whether to use lexical scoping (vs\. dynamic)\.
 .
 .IP "\(bu" 4
@@ -1168,10 +915,7 @@ Whether to use lexical scoping (vs\. dynamic)\.
 .
 .IP "" 0
 .
-.P
-libdir ++++++
-.
-.P
+.SS "libdir"
 An extra search path for Puppet\. This is only useful for those files that Puppet will load on demand, and is only guaranteed to work for those cases\. In fact, the autoload mechanism is responsible for making sure this directory is in Ruby\'s search path
 .
 .IP "\(bu" 4
@@ -1179,10 +923,7 @@ An extra search path for Puppet\. This is only useful for those files that Puppe
 .
 .IP "" 0
 .
-.P
-listen ++++++
-.
-.P
+.SS "listen"
 Whether puppet agent should listen for connections\. If this is true, then by default only the \fBrunner\fR server is started, which allows remote authorized and authenticated nodes to connect and trigger \fBpuppet agent\fR runs\.
 .
 .IP "\(bu" 4
@@ -1190,10 +931,7 @@ Whether puppet agent should listen for connections\. If this is true, then by de
 .
 .IP "" 0
 .
-.P
-localcacert +++++++++++
-.
-.P
+.SS "localcacert"
 Where each client stores the CA certificate\.
 .
 .IP "\(bu" 4
@@ -1201,10 +939,7 @@ Where each client stores the CA certificate\.
 .
 .IP "" 0
 .
-.P
-localconfig +++++++++++
-.
-.P
+.SS "localconfig"
 Where puppet agent caches the local configuration\. An extension indicating the cache format is added automatically\.
 .
 .IP "\(bu" 4
@@ -1212,10 +947,7 @@ Where puppet agent caches the local configuration\. An extension indicating the
 .
 .IP "" 0
 .
-.P
-logdir ++++++
-.
-.P
+.SS "logdir"
 The Puppet log directory\.
 .
 .IP "\(bu" 4
@@ -1223,10 +955,7 @@ The Puppet log directory\.
 .
 .IP "" 0
 .
-.P
-manage_internal_file_permissions ++++++++++++++++++++++++++++++++
-.
-.P
+.SS "manage_internal_file_permissions"
 Whether Puppet should manage the owner, group, and mode of files it uses internally
 .
 .IP "\(bu" 4
@@ -1234,10 +963,7 @@ Whether Puppet should manage the owner, group, and mode of files it uses interna
 .
 .IP "" 0
 .
-.P
-manifest ++++++++
-.
-.P
+.SS "manifest"
 The entry\-point manifest for puppet master\.
 .
 .IP "\(bu" 4
@@ -1245,10 +971,7 @@ The entry\-point manifest for puppet master\.
 .
 .IP "" 0
 .
-.P
-manifestdir +++++++++++
-.
-.P
+.SS "manifestdir"
 Where puppet master looks for its manifests\.
 .
 .IP "\(bu" 4
@@ -1256,10 +979,7 @@ Where puppet master looks for its manifests\.
 .
 .IP "" 0
 .
-.P
-masterhttplog +++++++++++++
-.
-.P
+.SS "masterhttplog"
 Where the puppet master web server logs\.
 .
 .IP "\(bu" 4
@@ -1267,10 +987,7 @@ Where the puppet master web server logs\.
 .
 .IP "" 0
 .
-.P
-masterlog +++++++++
-.
-.P
+.SS "masterlog"
 Where puppet master logs\. This is generally not used, since syslog is the default log destination\.
 .
 .IP "\(bu" 4
@@ -1278,10 +995,7 @@ Where puppet master logs\. This is generally not used, since syslog is the defau
 .
 .IP "" 0
 .
-.P
-masterport ++++++++++
-.
-.P
+.SS "masterport"
 Which port puppet master listens on\.
 .
 .IP "\(bu" 4
@@ -1289,10 +1003,7 @@ Which port puppet master listens on\.
 .
 .IP "" 0
 .
-.P
-maximum_uid +++++++++++
-.
-.P
+.SS "maximum_uid"
 The maximum allowed UID\. Some platforms use negative UIDs but then ship with tools that do not know how to handle signed ints, so the UIDs show up as huge numbers that can then not be fed back into the system\. This is a hackish way to fail in a slightly more useful way when that happens\.
 .
 .IP "\(bu" 4
@@ -1300,10 +1011,7 @@ The maximum allowed UID\. Some platforms use negative UIDs but then ship with to
 .
 .IP "" 0
 .
-.P
-mkusers +++++++
-.
-.P
+.SS "mkusers"
 Whether to create the necessary user and group that puppet agent will run as\.
 .
 .IP "\(bu" 4
@@ -1311,10 +1019,7 @@ Whether to create the necessary user and group that puppet agent will run as\.
 .
 .IP "" 0
 .
-.P
-modulepath ++++++++++
-.
-.P
+.SS "modulepath"
 The search path for modules as a colon\-separated list of directories\.
 .
 .IP "\(bu" 4
@@ -1322,10 +1027,7 @@ The search path for modules as a colon\-separated list of directories\.
 .
 .IP "" 0
 .
-.P
-name ++++
-.
-.P
+.SS "name"
 The name of the application, if we are running as one\. The default is essentially $0 without the path or \fB\.rb\fR\.
 .
 .IP "\(bu" 4
@@ -1333,10 +1035,7 @@ The name of the application, if we are running as one\. The default is essential
 .
 .IP "" 0
 .
-.P
-node_name +++++++++
-.
-.P
+.SS "node_name"
 How the puppetmaster determines the client\'s identity and sets the \'hostname\', \'fqdn\' and \'domain\' facts for use in the manifest, in particular for determining which \'node\' statement applies to the client\. Possible values are \'cert\' (use the subject\'s CN in the client\'s certificate) and \'facter\' (use the hostname that the client reported in its facts)
 .
 .IP "\(bu" 4
@@ -1344,10 +1043,7 @@ How the puppetmaster determines the client\'s identity and sets the \'hostname\'
 .
 .IP "" 0
 .
-.P
-node_terminus +++++++++++++
-.
-.P
+.SS "node_terminus"
 Where to find information about nodes\.
 .
 .IP "\(bu" 4
@@ -1355,10 +1051,7 @@ Where to find information about nodes\.
 .
 .IP "" 0
 .
-.P
-noop ++++
-.
-.P
+.SS "noop"
 Whether puppet agent should be run in noop mode\.
 .
 .IP "\(bu" 4
@@ -1366,10 +1059,7 @@ Whether puppet agent should be run in noop mode\.
 .
 .IP "" 0
 .
-.P
-onetime +++++++
-.
-.P
+.SS "onetime"
 Run the configuration once, rather than as a long\-running daemon\. This is useful for interactively running puppetd\.
 .
 .IP "\(bu" 4
@@ -1377,10 +1067,7 @@ Run the configuration once, rather than as a long\-running daemon\. This is usef
 .
 .IP "" 0
 .
-.P
-parseonly +++++++++
-.
-.P
+.SS "parseonly"
 Just check the syntax of the manifests\.
 .
 .IP "\(bu" 4
@@ -1388,10 +1075,7 @@ Just check the syntax of the manifests\.
 .
 .IP "" 0
 .
-.P
-passfile ++++++++
-.
-.P
+.SS "passfile"
 Where puppet agent stores the password for its private key\. Generally unused\.
 .
 .IP "\(bu" 4
@@ -1399,10 +1083,7 @@ Where puppet agent stores the password for its private key\. Generally unused\.
 .
 .IP "" 0
 .
-.P
-path ++++
-.
-.P
+.SS "path"
 The shell search path\. Defaults to whatever is inherited from the parent process\.
 .
 .IP "\(bu" 4
@@ -1410,10 +1091,7 @@ The shell search path\. Defaults to whatever is inherited from the parent proces
 .
 .IP "" 0
 .
-.P
-pidfile +++++++
-.
-.P
+.SS "pidfile"
 The pid file
 .
 .IP "\(bu" 4
@@ -1421,10 +1099,7 @@ The pid file
 .
 .IP "" 0
 .
-.P
-plugindest ++++++++++
-.
-.P
+.SS "plugindest"
 Where Puppet should store plugins that it pulls down from the central server\.
 .
 .IP "\(bu" 4
@@ -1432,10 +1107,7 @@ Where Puppet should store plugins that it pulls down from the central server\.
 .
 .IP "" 0
 .
-.P
-pluginsignore +++++++++++++
-.
-.P
+.SS "pluginsignore"
 What files to ignore when pulling down plugins\.
 .
 .IP "\(bu" 4
@@ -1443,10 +1115,7 @@ What files to ignore when pulling down plugins\.
 .
 .IP "" 0
 .
-.P
-pluginsource ++++++++++++
-.
-.P
+.SS "pluginsource"
 From where to retrieve plugins\. The standard Puppet \fBfile\fR type is used for retrieval, so anything that is a valid file source can be used here\.
 .
 .IP "\(bu" 4
@@ -1454,10 +1123,7 @@ From where to retrieve plugins\. The standard Puppet \fBfile\fR type is used for
 .
 .IP "" 0
 .
-.P
-pluginsync ++++++++++
-.
-.P
+.SS "pluginsync"
 Whether plugins should be synced with the central server\.
 .
 .IP "\(bu" 4
@@ -1465,16 +1131,10 @@ Whether plugins should be synced with the central server\.
 .
 .IP "" 0
 .
-.P
-postrun_command +++++++++++++++
-.
-.P
+.SS "postrun_command"
 A command to run after every agent run\. If this command returns a non\-zero return code, the entire Puppet run will be considered to have failed, even though it might have performed work during the normal run\.
 .
-.P
-preferred_serialization_format ++++++++++++++++++++++++++++++
-.
-.P
+.SS "preferred_serialization_format"
 The preferred means of serializing ruby instances for passing over the wire\. This won\'t guarantee that all instances will be serialized using this method, since not all classes can be guaranteed to support this format, but it will be used for all classes that support it\.
 .
 .IP "\(bu" 4
@@ -1482,16 +1142,10 @@ The preferred means of serializing ruby instances for passing over the wire\. Th
 .
 .IP "" 0
 .
-.P
-prerun_command ++++++++++++++
-.
-.P
+.SS "prerun_command"
 A command to run before every agent run\. If this command returns a non\-zero return code, the entire Puppet run will fail\.
 .
-.P
-privatedir ++++++++++
-.
-.P
+.SS "privatedir"
 Where the client stores private certificate information\.
 .
 .IP "\(bu" 4
@@ -1499,10 +1153,7 @@ Where the client stores private certificate information\.
 .
 .IP "" 0
 .
-.P
-privatekeydir +++++++++++++
-.
-.P
+.SS "privatekeydir"
 The private key directory\.
 .
 .IP "\(bu" 4
@@ -1510,10 +1161,7 @@ The private key directory\.
 .
 .IP "" 0
 .
-.P
-publickeydir ++++++++++++
-.
-.P
+.SS "publickeydir"
 The public key directory\.
 .
 .IP "\(bu" 4
@@ -1521,10 +1169,7 @@ The public key directory\.
 .
 .IP "" 0
 .
-.P
-puppetdlockfile +++++++++++++++
-.
-.P
+.SS "puppetdlockfile"
 A lock file to temporarily stop puppet agent from doing anything\.
 .
 .IP "\(bu" 4
@@ -1532,10 +1177,7 @@ A lock file to temporarily stop puppet agent from doing anything\.
 .
 .IP "" 0
 .
-.P
-puppetdlog ++++++++++
-.
-.P
+.SS "puppetdlog"
 The log file for puppet agent\. This is generally not used\.
 .
 .IP "\(bu" 4
@@ -1543,10 +1185,7 @@ The log file for puppet agent\. This is generally not used\.
 .
 .IP "" 0
 .
-.P
-puppetport ++++++++++
-.
-.P
+.SS "puppetport"
 Which port puppet agent listens on\.
 .
 .IP "\(bu" 4
@@ -1554,10 +1193,7 @@ Which port puppet agent listens on\.
 .
 .IP "" 0
 .
-.P
-queue_source ++++++++++++
-.
-.P
+.SS "queue_source"
 Which type of queue to use for asynchronous processing\. If your stomp server requires authentication, you can include it in the URI as long as your stomp client library is at least 1\.1\.1
 .
 .IP "\(bu" 4
@@ -1565,10 +1201,7 @@ Which type of queue to use for asynchronous processing\. If your stomp server re
 .
 .IP "" 0
 .
-.P
-queue_type ++++++++++
-.
-.P
+.SS "queue_type"
 Which type of queue to use for asynchronous processing\.
 .
 .IP "\(bu" 4
@@ -1576,10 +1209,7 @@ Which type of queue to use for asynchronous processing\.
 .
 .IP "" 0
 .
-.P
-rails_loglevel ++++++++++++++
-.
-.P
+.SS "rails_loglevel"
 The log level for Rails connections\. The value must be a valid log level within Rails\. Production environments normally use \fBinfo\fR and other environments normally use \fBdebug\fR\.
 .
 .IP "\(bu" 4
@@ -1587,10 +1217,7 @@ The log level for Rails connections\. The value must be a valid log level within
 .
 .IP "" 0
 .
-.P
-railslog ++++++++
-.
-.P
+.SS "railslog"
 Where Rails\-specific logs are sent
 .
 .IP "\(bu" 4
@@ -1598,21 +1225,15 @@ Where Rails\-specific logs are sent
 .
 .IP "" 0
 .
-.P
-report ++++++
-.
-.P
+.SS "report"
 Whether to send reports after every transaction\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: true
 .
 .IP "" 0
 .
-.P
-report_port +++++++++++
-.
-.P
+.SS "report_port"
 The port to communicate with the report_server\.
 .
 .IP "\(bu" 4
@@ -1620,21 +1241,15 @@ The port to communicate with the report_server\.
 .
 .IP "" 0
 .
-.P
-report_server +++++++++++++
-.
-.P
-The server to which to send transaction reports\.
+.SS "report_server"
+The server to send transaction reports to\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
-.P
-reportdir +++++++++
-.
-.P
+.SS "reportdir"
 The directory in which to store reports received from the client\. Each client gets a separate subdirectory\.
 .
 .IP "\(bu" 4
@@ -1642,21 +1257,15 @@ The directory in which to store reports received from the client\. Each client g
 .
 .IP "" 0
 .
-.P
-reportfrom ++++++++++
-.
-.P
+.SS "reportfrom"
 The \'from\' email address for the reports\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: report at pelin\.members\.linode\.com
+\fIDefault\fR: report at magpie\.puppetlabs\.lan
 .
 .IP "" 0
 .
-.P
-reports +++++++
-.
-.P
+.SS "reports"
 The list of reports to generate\. All reports are looked for in \fBpuppet/reports/name\.rb\fR, and multiple report names should be comma\-separated (whitespace is okay)\.
 .
 .IP "\(bu" 4
@@ -1664,10 +1273,7 @@ The list of reports to generate\. All reports are looked for in \fBpuppet/report
 .
 .IP "" 0
 .
-.P
-reportserver ++++++++++++
-.
-.P
+.SS "reportserver"
 (Deprecated for \'report_server\') The server to which to send transaction reports\.
 .
 .IP "\(bu" 4
@@ -1675,10 +1281,7 @@ reportserver ++++++++++++
 .
 .IP "" 0
 .
-.P
-reporturl +++++++++
-.
-.P
+.SS "reporturl"
 The URL used by the http reports processor to send reports
 .
 .IP "\(bu" 4
@@ -1686,10 +1289,7 @@ The URL used by the http reports processor to send reports
 .
 .IP "" 0
 .
-.P
-req_bits ++++++++
-.
-.P
+.SS "req_bits"
 The bit length of the certificates\.
 .
 .IP "\(bu" 4
@@ -1697,10 +1297,7 @@ The bit length of the certificates\.
 .
 .IP "" 0
 .
-.P
-requestdir ++++++++++
-.
-.P
+.SS "requestdir"
 Where host certificate requests are stored\.
 .
 .IP "\(bu" 4
@@ -1708,10 +1305,7 @@ Where host certificate requests are stored\.
 .
 .IP "" 0
 .
-.P
-rest_authconfig +++++++++++++++
-.
-.P
+.SS "rest_authconfig"
 The configuration file that defines the rights to the different rest indirections\. This can be used as a fine\-grained authorization system for \fBpuppet master\fR\.
 .
 .IP "\(bu" 4
@@ -1719,10 +1313,7 @@ The configuration file that defines the rights to the different rest indirection
 .
 .IP "" 0
 .
-.P
-rrddir ++++++
-.
-.P
+.SS "rrddir"
 The directory where RRD database files are stored\. Directories for each reporting host will be created under this directory\.
 .
 .IP "\(bu" 4
@@ -1730,10 +1321,7 @@ The directory where RRD database files are stored\. Directories for each reporti
 .
 .IP "" 0
 .
-.P
-rrdinterval +++++++++++
-.
-.P
+.SS "rrdinterval"
 How often RRD should expect data\. This should match how often the hosts report back to the server\.
 .
 .IP "\(bu" 4
@@ -1741,10 +1329,7 @@ How often RRD should expect data\. This should match how often the hosts report
 .
 .IP "" 0
 .
-.P
-run_mode ++++++++
-.
-.P
+.SS "run_mode"
 The effective \'run mode\' of the application: master, agent, or user\.
 .
 .IP "\(bu" 4
@@ -1752,10 +1337,7 @@ The effective \'run mode\' of the application: master, agent, or user\.
 .
 .IP "" 0
 .
-.P
-rundir ++++++
-.
-.P
+.SS "rundir"
 Where Puppet PID files are kept\.
 .
 .IP "\(bu" 4
@@ -1763,10 +1345,7 @@ Where Puppet PID files are kept\.
 .
 .IP "" 0
 .
-.P
-runinterval +++++++++++
-.
-.P
+.SS "runinterval"
 How often puppet agent applies the client configuration; in seconds\.
 .
 .IP "\(bu" 4
@@ -1774,10 +1353,7 @@ How often puppet agent applies the client configuration; in seconds\.
 .
 .IP "" 0
 .
-.P
-sendmail ++++++++
-.
-.P
+.SS "sendmail"
 Where to find the sendmail binary with which to send email\.
 .
 .IP "\(bu" 4
@@ -1785,10 +1361,7 @@ Where to find the sendmail binary with which to send email\.
 .
 .IP "" 0
 .
-.P
-serial ++++++
-.
-.P
+.SS "serial"
 Where the serial number for certificates is stored\.
 .
 .IP "\(bu" 4
@@ -1796,10 +1369,7 @@ Where the serial number for certificates is stored\.
 .
 .IP "" 0
 .
-.P
-server ++++++
-.
-.P
+.SS "server"
 The server to which server puppet agent should connect
 .
 .IP "\(bu" 4
@@ -1807,10 +1377,7 @@ The server to which server puppet agent should connect
 .
 .IP "" 0
 .
-.P
-server_datadir ++++++++++++++
-.
-.P
+.SS "server_datadir"
 The directory in which serialized data is stored, usually in a subdirectory\.
 .
 .IP "\(bu" 4
@@ -1818,10 +1385,7 @@ The directory in which serialized data is stored, usually in a subdirectory\.
 .
 .IP "" 0
 .
-.P
-servertype ++++++++++
-.
-.P
+.SS "servertype"
 The type of server to use\. Currently supported options are webrick and mongrel\. If you use mongrel, you will need a proxy in front of the process or processes, since Mongrel cannot speak SSL\.
 .
 .IP "\(bu" 4
@@ -1829,10 +1393,7 @@ The type of server to use\. Currently supported options are webrick and mongrel\
 .
 .IP "" 0
 .
-.P
-show_diff +++++++++
-.
-.P
+.SS "show_diff"
 Whether to print a contextual diff when files are being replaced\. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively\. This feature currently requires the \fBdiff/lcs\fR Ruby library\.
 .
 .IP "\(bu" 4
@@ -1840,10 +1401,7 @@ Whether to print a contextual diff when files are being replaced\. The diff is p
 .
 .IP "" 0
 .
-.P
-signeddir +++++++++
-.
-.P
+.SS "signeddir"
 Where the CA stores signed certificates\.
 .
 .IP "\(bu" 4
@@ -1851,10 +1409,7 @@ Where the CA stores signed certificates\.
 .
 .IP "" 0
 .
-.P
-smtpserver ++++++++++
-.
-.P
+.SS "smtpserver"
 The server through which to send email reports\.
 .
 .IP "\(bu" 4
@@ -1862,10 +1417,7 @@ The server through which to send email reports\.
 .
 .IP "" 0
 .
-.P
-splay +++++
-.
-.P
+.SS "splay"
 Whether to sleep for a pseudo\-random (but consistent) amount of time before a run\.
 .
 .IP "\(bu" 4
@@ -1873,10 +1425,7 @@ Whether to sleep for a pseudo\-random (but consistent) amount of time before a r
 .
 .IP "" 0
 .
-.P
-splaylimit ++++++++++
-.
-.P
+.SS "splaylimit"
 The maximum time to delay before runs\. Defaults to being the same as the run interval\.
 .
 .IP "\(bu" 4
@@ -1884,10 +1433,7 @@ The maximum time to delay before runs\. Defaults to being the same as the run in
 .
 .IP "" 0
 .
-.P
-ssl_client_header +++++++++++++++++
-.
-.P
+.SS "ssl_client_header"
 The header containing an authenticated client\'s SSL DN\. Only used with Mongrel\. This header must be set by the proxy to the authenticated client\'s SSL DN (e\.g\., \fB/CN=puppet\.puppetlabs\.com\fR)\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/Using_Mongrel for more information\.
 .
 .IP "\(bu" 4
@@ -1895,10 +1441,7 @@ The header containing an authenticated client\'s SSL DN\. Only used with Mongrel
 .
 .IP "" 0
 .
-.P
-ssl_client_verify_header ++++++++++++++++++++++++
-.
-.P
+.SS "ssl_client_verify_header"
 The header containing the status message of the client verification\. Only used with Mongrel\. This header must be set by the proxy to \'SUCCESS\' if the client successfully authenticated, and anything else otherwise\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/Using_Mongrel for more information\.
 .
 .IP "\(bu" 4
@@ -1906,10 +1449,7 @@ The header containing the status message of the client verification\. Only used
 .
 .IP "" 0
 .
-.P
-ssldir ++++++
-.
-.P
+.SS "ssldir"
 Where SSL certificates are kept\.
 .
 .IP "\(bu" 4
@@ -1917,10 +1457,7 @@ Where SSL certificates are kept\.
 .
 .IP "" 0
 .
-.P
-statedir ++++++++
-.
-.P
+.SS "statedir"
 The directory where Puppet state is stored\. Generally, this directory can be removed without causing harm (although it might result in spurious service restarts)\.
 .
 .IP "\(bu" 4
@@ -1928,10 +1465,7 @@ The directory where Puppet state is stored\. Generally, this directory can be re
 .
 .IP "" 0
 .
-.P
-statefile +++++++++
-.
-.P
+.SS "statefile"
 Where puppet agent and puppet master store state associated with the running configuration\. In the case of puppet master, this file reflects the state discovered through interacting with clients\.
 .
 .IP "\(bu" 4
@@ -1939,10 +1473,7 @@ Where puppet agent and puppet master store state associated with the running con
 .
 .IP "" 0
 .
-.P
-storeconfigs ++++++++++++
-.
-.P
+.SS "storeconfigs"
 Whether to store each client\'s configuration\. This requires ActiveRecord from Ruby on Rails\.
 .
 .IP "\(bu" 4
@@ -1950,10 +1481,7 @@ Whether to store each client\'s configuration\. This requires ActiveRecord from
 .
 .IP "" 0
 .
-.P
-strict_hostname_checking ++++++++++++++++++++++++
-.
-.P
+.SS "strict_hostname_checking"
 Whether to only search for the complete hostname as it is in the certificate when searching for node information in the catalogs\.
 .
 .IP "\(bu" 4
@@ -1961,10 +1489,7 @@ Whether to only search for the complete hostname as it is in the certificate whe
 .
 .IP "" 0
 .
-.P
-summarize +++++++++
-.
-.P
+.SS "summarize"
 Whether to print a transaction summary\.
 .
 .IP "\(bu" 4
@@ -1972,10 +1497,7 @@ Whether to print a transaction summary\.
 .
 .IP "" 0
 .
-.P
-syslogfacility ++++++++++++++
-.
-.P
+.SS "syslogfacility"
 What syslog facility to use when logging to syslog\. Syslog has a fixed list of valid facilities, and you must choose one of those; you cannot just make one up\.
 .
 .IP "\(bu" 4
@@ -1983,10 +1505,7 @@ What syslog facility to use when logging to syslog\. Syslog has a fixed list of
 .
 .IP "" 0
 .
-.P
-tagmap ++++++
-.
-.P
+.SS "tagmap"
 The mapping between reporting tags and email addresses\.
 .
 .IP "\(bu" 4
@@ -1994,16 +1513,10 @@ The mapping between reporting tags and email addresses\.
 .
 .IP "" 0
 .
-.P
-tags ++++
-.
-.P
+.SS "tags"
 Tags to use to find resources\. If this is set, then only resources tagged with the specified tags will be applied\. Values must be comma\-separated\.
 .
-.P
-templatedir +++++++++++
-.
-.P
+.SS "templatedir"
 Where Puppet looks for template files\. Can be a list of colon\-seperated directories\.
 .
 .IP "\(bu" 4
@@ -2011,10 +1524,7 @@ Where Puppet looks for template files\. Can be a list of colon\-seperated direct
 .
 .IP "" 0
 .
-.P
-thin_storeconfigs +++++++++++++++++
-.
-.P
+.SS "thin_storeconfigs"
 Boolean; wether storeconfigs store in the database only the facts and exported resources\. If true, then storeconfigs performance will be higher and still allow exported/collected resources, but other usage external to Puppet might not work
 .
 .IP "\(bu" 4
@@ -2022,10 +1532,7 @@ Boolean; wether storeconfigs store in the database only the facts and exported r
 .
 .IP "" 0
 .
-.P
-trace +++++
-.
-.P
+.SS "trace"
 Whether to print stack traces on some errors
 .
 .IP "\(bu" 4
@@ -2033,10 +1540,7 @@ Whether to print stack traces on some errors
 .
 .IP "" 0
 .
-.P
-use_cached_catalog ++++++++++++++++++
-.
-.P
+.SS "use_cached_catalog"
 Whether to only use the cached catalog rather than compiling a new catalog on every run\. Puppet can be run with this enabled by default and then selectively disabled when a recompile is desired\.
 .
 .IP "\(bu" 4
@@ -2044,10 +1548,7 @@ Whether to only use the cached catalog rather than compiling a new catalog on ev
 .
 .IP "" 0
 .
-.P
-usecacheonfailure +++++++++++++++++
-.
-.P
+.SS "usecacheonfailure"
 Whether to use the cached configuration when the remote configuration will not compile\. This option is useful for testing new configurations, where you want to fix the broken configuration rather than reverting to a known\-good one\.
 .
 .IP "\(bu" 4
@@ -2055,10 +1556,7 @@ Whether to use the cached configuration when the remote configuration will not c
 .
 .IP "" 0
 .
-.P
-user ++++
-.
-.P
+.SS "user"
 The user puppet master should run as\.
 .
 .IP "\(bu" 4
@@ -2066,10 +1564,7 @@ The user puppet master should run as\.
 .
 .IP "" 0
 .
-.P
-vardir ++++++
-.
-.P
+.SS "vardir"
 Where Puppet stores dynamic and growing data\. The default for this parameter is calculated specially, like \fBconfdir\fR_\.
 .
 .IP "\(bu" 4
@@ -2077,10 +1572,7 @@ Where Puppet stores dynamic and growing data\. The default for this parameter is
 .
 .IP "" 0
 .
-.P
-yamldir +++++++
-.
-.P
+.SS "yamldir"
 The directory in which YAML data is stored, usually in a subdirectory\.
 .
 .IP "\(bu" 4
@@ -2088,10 +1580,7 @@ The directory in which YAML data is stored, usually in a subdirectory\.
 .
 .IP "" 0
 .
-.P
-zlib ++++
-.
-.P
+.SS "zlib"
 Boolean; whether to use the zlib library
 .
 .IP "\(bu" 4
@@ -2100,4 +1589,4 @@ Boolean; whether to use the zlib library
 .IP "" 0
 .
 .P
-\fIThis page autogenerated on Sat Aug 28 14:00:20 \-0700 2010\fR
+\fIThis page autogenerated on Wed Feb 16 17:06:38 \-0800 2011\fR
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index 59afc2e..7ff0da9 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -1,105 +1,81 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FILEBUCKET" "8" "August 2010" "" ""
-A stand\-alone Puppet filebucket client\.puppet filebucket [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose]
+.TH "PUPPET\-FILEBUCKET" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket
 .
-.nf
-
- [\-l|\-\-local] [\-r|\-\-remote]
- [\-s|\-\-server <server>] [\-b|\-\-bucket <directory>] <file> <file> \.\.\.
+.SH "SYNOPSIS"
+A stand\-alone Puppet filebucket client\.
 .
-.fi
-.
-.IP "" 0
-This is a stand\-alone filebucket client for sending files to a local or central filebucket\.This client can operate in three modes, with only one mode per call:
+.SH "USAGE"
+puppet filebucket \fImode\fR [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-l|\-\-local] [\-r|\-\-remote] [\-s|\-\-server \fIserver\fR] [\-b|\-\-bucket \fIdirectory\fR] \fIfile\fR \fIfile\fR \.\.\.
 .
 .P
-backup: Send one or more files to the specified file bucket\. Each sent
-.
-.IP "" 4
-.
-.nf
-
-     file is printed with its resulting md5 sum\.
-.
-.fi
-.
-.IP "" 0
+Puppet filebucket can operate in three modes, with only one mode per call:
 .
 .P
-get: Return the text associated with an md5 sum\. The text is printed
-.
-.IP "" 4
-.
-.nf
-
-     to stdout, and only one file can be retrieved at a time\.
-.
-.fi
-.
-.IP "" 0
+backup: Send one or more files to the specified file bucket\. Each sent file is printed with its resulting md5 sum\.
 .
 .P
-restore: Given a file path and an md5 sum, store the content associated
-.
-.IP "" 4
+get: Return the text associated with an md5 sum\. The text is printed to stdout, and only one file can be retrieved at a time\.
 .
-.nf
-
-     with the sum into the specified file path\. You can specify an
-     entirely new path to this argument; you are not restricted to
-     restoring the content to its original location\.
-.
-.fi
+.P
+restore: Given a file path and an md5 sum, store the content associated with the sum into the specified file path\. You can specify an entirely new path to this argument; you are not restricted to restoring the content to its original location\.
 .
-.IP "" 0
+.SH "DESCRIPTION"
+This is a stand\-alone filebucket client for sending files to a local or central filebucket\.
 .
 .P
-Note that +filebucket+ defaults to using a network\-based filebucket available on the server named +puppet+\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying +\-\-local+\.$ puppet filebucket backup /etc/passwd /etc/passwd: 429b225650b912a2ee067b0a4cf1e949 $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949 $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 \fIdirectory\fR\' as an argument\.
+Note that \'filebucket\' defaults to using a network\-based filebucket available on the server named \'puppet\'\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying \'\-\-local\'\.
+.
+.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 \fIdirectory\fR\' as an argument\.
 .
 .P
 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 puppet with \'\-\-genconfig\'\.
 .
-.P
-debug: Enable full debugging\.
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.P
-help: Print this help message
+.TP
+\-\-help
+Print this help message
 .
-.P
-local: Use the local filebucket\. This will use the default
+.TP
+\-\-local
+Use the local filebucket\. This will use the default configuration information\.
 .
-.IP "" 4
+.TP
+\-\-remote
+Use a remote filebucket\. This will use the default configuration information\.
 .
-.nf
-
-     configuration information\.
+.TP
+\-\-server
+The server to send the file to, instead of locally\.
 .
-.fi
+.TP
+\-\-verbose
+Print extra information\.
 .
-.IP "" 0
+.TP
+\-\-version
+Print version information\.
 .
-.P
-remote: Use a remote filebucket\. This will use the default
-.
-.IP "" 4
+.SH "EXAMPLE"
 .
 .nf
 
-     configuration information\.
+$ puppet filebucket backup /etc/passwd
+/etc/passwd: 429b225650b912a2ee067b0a4cf1e949
+$ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 .
 .fi
 .
-.IP "" 0
+.SH "AUTHOR"
+Luke Kanies
 .
-.P
-server: The server to send the file to, instead of locally\.
-.
-.P
-verbose: Print extra information\.
-.
-.P
-version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "COPYRIGHT"
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index b70a128..c54a7be 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -1,17 +1,51 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PI" "8" "August 2010" "" ""
-Print help about puppet types on the console\. Run with \'\-h\' to get detailed help\.puppet describe [\-h|\-\-help] [\-s|\-\-short] [\-p|\-\-providers] [\-l|\-\-list] [\-m|\-\-meta]Prints details of Puppet types, providers and metaparameters on the console\.help: Print this help text
+.TH "PUPPET\-DESCRIBE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.P
-providers: Describe providers in detail for each type
+.SH "NAME"
+\fBpuppet\-describe\fR \- Display help about resource types
 .
-.P
-list: List all types
+.SH "SYNOPSIS"
+Prints help about Puppet resource types, providers, and metaparameters\.
 .
-.P
-meta: List all metaparameters
+.SH "USAGE"
+puppet describe [\-h|\-\-help] [\-s|\-\-short] [\-p|\-\-providers] [\-l|\-\-list] [\-m|\-\-meta]
 .
-.P
-short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "OPTIONS"
+.
+.TP
+\-\-help
+Print this help text
+.
+.TP
+\-\-providers
+Describe providers in detail for each type
+.
+.TP
+\-\-list
+List all types
+.
+.TP
+\-\-meta
+List all metaparameters
+.
+.TP
+\-\-short
+List only parameters without detail
+.
+.SH "EXAMPLE"
+.
+.nf
+
+$ puppet describe \-\-list
+$ puppet describe file \-\-providers
+$ puppet describe user \-s \-m
+.
+.fi
+.
+.SH "AUTHOR"
+David Lutterkort
+.
+.SH "COPYRIGHT"
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppet.8 b/man/man8/puppet.8
index 513d453..f58a54d 100644
--- a/man/man8/puppet.8
+++ b/man/man8/puppet.8
@@ -1,10 +1,10 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "August 2010" "" ""
+.TH "PUPPET" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
 .
 .P
-Usage: puppet command \fIspace separated arguments\fR Available commands are: agent, apply, cert, describe, doc, filebucket, kick, master, queue, resource
+Usage: puppet command \fIspace separated arguments\fR Available commands are: agent, apply, cert, describe, doc, filebucket, inspect, kick, master, queue, resource
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index 62fa7a5..bea7596 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -1,169 +1,94 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCA" "8" "August 2010" "" ""
-Stand\-alone certificate authority\. Capable of generating certificates but mostly meant for signing certificate requests from puppet clients\.puppet cert [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose]
+.TH "PUPPET\-CERT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-cert\fR \- Manage certificates and requests
 .
-.nf
-
-          [\-g|\-\-generate] [\-l|\-\-list] [\-s|\-\-sign] [\-r|\-\-revoke]
-          [\-p|\-\-print] [\-c|\-\-clean] [\-\-verify] [\-\-digest DIGEST]
-          [\-\-fingerprint] [host]
-.
-.fi
-.
-.IP "" 0
-Because the puppetmasterd daemon defaults to not signing client certificate requests, this script is available for signing outstanding requests\. It can be used to list outstanding requests and then either sign them individually or sign all of them\.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 \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://reductivelabs\.com/projects/puppet/reference/configref\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet cert with \'\-\-genconfig\'\.
-.
-.P
-all: Operate on all items\. Currently only makes sense with
+.SH "SYNOPSIS"
+Standalone certificate authority\. Capable of generating certificates, but mostly used for signing certificate requests from puppet clients\.
 .
-.IP "" 4
+.SH "USAGE"
+puppet cert [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-g|\-\-generate] [\-l|\-\-list] [\-s|\-\-sign] [\-r|\-\-revoke] [\-p|\-\-print] [\-c|\-\-clean] [\-\-verify] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [host]
 .
-.nf
-
-         \'\-\-sign\', \'\-\-clean\', or \'\-\-list\'\.
+.SH "DESCRIPTION"
+Because the puppet master service defaults to not signing client certificate requests, this script is available for signing outstanding requests\. It can be used to list outstanding requests and then either sign them individually or sign all of them\.
 .
-.fi
-.
-.IP "" 0
+.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 \fIdirectory\fR\' as an argument\.
 .
 .P
-digest: Set the digest for fingerprinting (defaults to md5)\. Valid
-.
-.IP "" 4
-.
-.nf
-
-         values depends on your openssl and openssl ruby extension
-         version, but should contain at least md5, sha1, md2,
-         sha256\.
-.
-.fi
+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 puppet cert with \'\-\-genconfig\'\.
 .
-.IP "" 0
+.TP
+\-\-all
+Operate on all items\. Currently only makes sense with \'\-\-sign\', \'\-\-clean\', or \'\-\-list\'\.
 .
-.P
-clean: Remove all files related to a host from puppet cert\'s
+.TP
+\-\-digest
+Set the digest for fingerprinting (defaults to md5)\. Valid values depends on your openssl and openssl ruby extension version, but should contain at least md5, sha1, md2, sha256\.
 .
-.IP "" 4
+.TP
+\-\-clean
+Remove all files related to a host from puppet cert\'s storage\. This is useful when rebuilding hosts, since new certificate signing requests will only be honored if puppet cert does not have a copy of a signed certificate for that host\. The certificate of the host is also revoked\. If \'\-\-all\' is specified then all host certificates, both signed and unsigned, will be removed\.
 .
-.nf
-
-         storage\. This is useful when rebuilding hosts, since new
-         certificate signing requests will only be honored if puppet
-         cert does not have a copy of a signed certificate for that
-         host\. The certificate of the host remains valid\. If \'\-\-all\'
-         is specified then all host certificates, both signed and
-         unsigned, will be removed\.
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.fi
+.TP
+\-\-generate
+Generate a certificate for a named client\. A certificate/keypair will be generated for each client named on the command line\.
 .
-.IP "" 0
+.TP
+\-\-help
+Print this help message
 .
-.P
-debug: Enable full debugging\.
+.TP
+\-\-list
+List outstanding certificate requests\. If \'\-\-all\' is specified, signed certificates are also listed, prefixed by \'+\', and revoked or invalid certificates are prefixed by \'\-\' (the verification outcome is printed in parenthesis)\.
 .
-.P
-generate: Generate a certificate for a named client\. A
+.TP
+\-\-print
+Print the full\-text version of a host\'s certificate\.
 .
-.IP "" 4
+.TP
+\-\-fingerprint
+Print the DIGEST (defaults to md5) fingerprint of a host\'s certificate\.
 .
-.nf
-
-         certificate/keypair will be generated for each client named
-         on the command line\.
+.TP
+\-\-revoke
+Revoke the certificate of a client\. The certificate can be specified either by its serial number, given as a decimal number or a hexadecimal number prefixed by \'0x\', or by its hostname\. The certificate is revoked by adding it to the Certificate Revocation List given by the \'cacrl\' config parameter\. Note that the puppetmasterd needs to be restarted after revoking certificates\.
 .
-.fi
+.TP
+\-\-sign
+Sign an outstanding certificate request\. Unless \'\-\-all\' is specified, hosts must be listed after all flags\.
 .
-.IP "" 0
+.TP
+\-\-verbose
+Enable verbosity\.
 .
-.P
-help: Print this help message
+.TP
+\-\-version
+Print the puppet version number and exit\.
 .
-.P
-list: List outstanding certificate requests\. If \'\-\-all\' is
+.TP
+\-\-verify
+Verify the named certificate against the local CA certificate\.
 .
-.IP "" 4
+.SH "EXAMPLE"
 .
 .nf
 
-         specified, signed certificates are also listed, prefixed by
-         \'+\', and revoked or invalid certificates are prefixed by
-         \'\-\' (the verification outcome is printed in parenthesis)\.
+$ puppet cert \-l
+culain\.madstop\.com
+$ puppet cert \-s culain\.madstop\.com
 .
 .fi
 .
-.IP "" 0
-.
-.P
-print: Print the full\-text version of a host\'s certificate\.
-.
-.P
-fingerprint: Print the DIGEST (defaults to md5) fingerprint of a host\'s
-.
-.IP "" 4
-.
-.nf
-
-         certificate\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-revoke: Revoke the certificate of a client\. The certificate can be
-.
-.IP "" 4
-.
-.nf
-
-         specified either by its serial number, given as a decimal
-         number or a hexadecimal number prefixed by \'0x\', or by its
-         hostname\. The certificate is revoked by adding it to the
-         Certificate Revocation List given by the \'cacrl\' config
-         parameter\. Note that the puppetmasterd needs to be
-         restarted after revoking certificates\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-sign: Sign an outstanding certificate request\. Unless \'\-\-all\' is
-.
-.IP "" 4
-.
-.nf
-
-         specified, hosts must be listed after all flags\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-verbose: Enable verbosity\.
-.
-.P
-version: Print the puppet version number and exit\.
-.
-.P
-verify: Verify the named certificate against the local CA
-.
-.IP "" 4
-.
-.nf
-
-         certificate\.
-.
-.fi
+.SH "AUTHOR"
+Luke Kanies
 .
-.IP "" 0
-$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "COPYRIGHT"
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index 8611375..3fadd9d 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -1,283 +1,139 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETD" "8" "August 2010" "" ""
-puppet agent [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug]
+.TH "PUPPET\-AGENT" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-agent\fR \- The puppet agent daemon
 .
-.nf
-
-  [\-\-detailed\-exitcodes] [\-\-disable] [\-\-enable]
-  [\-h|\-\-help] [\-\-fqdn <host name>] [\-l|\-\-logdest syslog|<file>|console]
-  [\-o|\-\-onetime] [\-\-serve <handler>] [\-t|\-\-test] [\-\-noop]
-  [\-\-digest <digest>] [\-\-fingerprint] [\-V|\-\-version]
-  [\-v|\-\-verbose] [\-w|\-\-waitforcert <seconds>]
-.
-.fi
-.
-.IP "" 0
-This is the main puppet client\. Its job is to retrieve the local machine\'s configuration from a remote server and apply it\. In order to successfully communicate with the remote server, the client must have a certificate signed by a certificate authority that the server trusts; the recommended method for this, at the moment, is to run a certificate authority as part of the puppet server (which is the default)\. The client will connect and request a signed certificate, and will continue connecting until it receives one\.
-.
-.P
-Once the client has a signed certificate, it will retrieve its configuration and apply it\.+puppet agent+ does its best to find a compromise between interactive use and daemon use\. Run with no arguments and no configuration, it will go into the backgroun, attempt to get a signed certificate, and retrieve and apply its configuration every 30 minutes\.
-.
-.P
-Some flags are meant specifically for interactive use \-\- in particular, +test+, +tags+ or +fingerprint+ are useful\. +test+ enables verbose logging, causes the daemon to stay in the foreground, exits if the server\'s configuration is invalid (this happens if, for instance, you\'ve left a syntax error on the server), and exits after running the configuration once (rather than hanging around as a long\-running process)\.
-.
-.P
-+tags+ allows you to specify what portions of a configuration you want to apply\. Puppet elements are tagged with all of the class or definition names that contain them, and you can use the +tags+ flag to specify one of these names, causing only configuration elements contained within that class or definition to be applied\. This is very useful when you are testing new configurations \-\- for instance, if you are just starting to manage +ntpd+, you would put all of the new elements into an +ntpd+ class, and call puppet with +\-\-tags ntpd+, which would only apply that small portion of the configuration during your testing, rather than applying the whole thing\.
-.
-.P
-+fingerprint+ is a one\-time flag\. In this mode +puppet agent+ will run once and display on the console (and in the log) the current certificate (or certificate request) fingerprint\. Providing the +\-\-digest+ option allows to use a different digest algorithm to generate the fingerprint\. The main use is to verify that before signing a certificate request on the master, the certificate request the master received is the same as the one the client sent (to prevent against man\-in\-the\-middle attacks when signing certificates)\.Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
-.
-.P
-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 puppet agent with \'\-\-genconfig\'\.
-.
-.P
-daemonize: Send the process into the background\. This is the
-.
-.IP "" 4
-.
-.nf
-
-                default\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-no\-daemonize: Do not send the process into the background\.
-.
-.P
-debug: Enable full debugging\.
+.SH "SYNOPSIS"
+Retrieves the client configuration from the puppet master and applies it to the local host\.
 .
 .P
-digest: Change the certificate fingerprinting digest
-.
-.IP "" 4
-.
-.nf
-
-                algorithm\. The default is MD5\. Valid values depends
-                on the version of OpenSSL installed, but should
-                always at least contain MD5, MD2, SHA1 and SHA256\.
-.
-.fi
-.
-.IP "" 0
+This service may be run as a daemon, run periodically using cron (or something similar), or run interactively for testing purposes\.
 .
-.P
-detailed\-exitcodes: Provide transaction information via exit codes\. If
-.
-.IP "" 4
-.
-.nf
-
-                this is enabled, an exit code of \'2\' means there
-                were changes, and an exit code of \'4\' means that
-                there were failures during the transaction\. This
-                option only makes sense in conjunction with
-                \-\-onetime\.
-.
-.fi
+.SH "USAGE"
+puppet agent [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-disable] [\-\-enable] [\-h|\-\-help] [\-\-certname \fIhost name\fR] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-o|\-\-onetime] [\-\-serve \fIhandler\fR] [\-t|\-\-test] [\-\-noop] [\-\-digest \fIdigest\fR] [\-\-fingerprint] [\-V|\-\-version] [\-v|\-\-verbose] [\-w|\-\-waitforcert \fIseconds\fR]
 .
-.IP "" 0
+.SH "DESCRIPTION"
+This is the main puppet client\. Its job is to retrieve the local machine\'s configuration from a remote server and apply it\. In order to successfully communicate with the remote server, the client must have a certificate signed by a certificate authority that the server trusts; the recommended method for this, at the moment, is to run a certificate authority as part of the puppet server (which is the default)\. The client will connect and request a signed certificate, and will continue connecting until it receives one\.
 .
 .P
-disable: Disable working on the local system\. This puts a
-.
-.IP "" 4
-.
-.nf
-
-                lock file in place, causing +puppet agent+ not to
-                work on the system until the lock file is removed\.
-                This is useful if you are testing a configuration
-                and do not want the central configuration to
-                override the local state until everything is tested
-                and committed\.
-.
-.fi
+Once the client has a signed certificate, it will retrieve its configuration and apply it\.
 .
-.IP "" 0
+.SH "USAGE NOTES"
+\'puppet agent\' does its best to find a compromise between interactive use and daemon use\. Run with no arguments and no configuration, it will go into the background, attempt to get a signed certificate, and retrieve and apply its configuration every 30 minutes\.
 .
 .P
-+puppet agent+ uses the same lock file while it is running, so no more than one +puppet agent+ process is working at a time\.
+Some flags are meant specifically for interactive use \-\- in particular, \'test\', \'tags\' or \'fingerprint\' are useful\. \'test\' enables verbose logging, causes the daemon to stay in the foreground, exits if the server\'s configuration is invalid (this happens if, for instance, you\'ve left a syntax error on the server), and exits after running the configuration once (rather than hanging around as a long\-running process)\.
 .
 .P
-+puppet agent+ exits after executing this\.
+\'tags\' allows you to specify what portions of a configuration you want to apply\. Puppet elements are tagged with all of the class or definition names that contain them, and you can use the \'tags\' flag to specify one of these names, causing only configuration elements contained within that class or definition to be applied\. This is very useful when you are testing new configurations \-\- for instance, if you are just starting to manage \'ntpd\', you would put all of the new elements into an \'ntpd\' class, and call puppet with \'\-\-tags ntpd\', which would only apply that small portion of the configuration during your testing, rather than applying the whole thing\.
 .
 .P
-enable: Enable working on the local system\. This removes any
+\'fingerprint\' is a one\-time flag\. In this mode \'puppet agent\' will run once and display on the console (and in the log) the current certificate (or certificate request) fingerprint\. Providing the \'\-\-digest\' option allows to use a different digest algorithm to generate the fingerprint\. The main use is to verify that before signing a certificate request on the master, the certificate request the master received is the same as the one the client sent (to prevent against man\-in\-the\-middle attacks when signing certificates)\.
 .
-.IP "" 4
-.
-.nf
-
-                lock file, causing +puppet agent+ to start managing
-                the local system again (although it will continue to
-                use its normal scheduling, so it might not start for
-                another half hour)\.
-.
-.fi
-.
-.IP "" 0
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
 .
 .P
-+puppet agent+ exits after executing this\.
-.
-.P
-fqdn: Set the fully\-qualified domain name of the client\.
+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 puppet agent with \'\-\-genconfig\'\.
 .
-.IP "" 4
+.TP
+\-\-daemonize
+Send the process into the background\. This is the default\.
 .
-.nf
-
-                This is only used for certificate purposes, but can
-                be used to override the discovered hostname\. If you
-                need to use this flag, it is generally an indication
-                of a setup problem\.
+.TP
+\-\-no\-daemonize
+Do not send the process into the background\.
 .
-.fi
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.IP "" 0
+.TP
+\-\-digest
+Change the certificate fingerprinting digest algorithm\. The default is MD5\. Valid values depends on the version of OpenSSL installed, but should always at least contain MD5, MD2, SHA1 and SHA256\.
 .
-.P
-help: Print this help message
+.TP
+\-\-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 there were failures during the transaction\. This option only makes sense in conjunction with \-\-onetime\.
 .
-.P
-logdest: Where to send messages\. Choose between syslog, the
+.TP
+\-\-disable
+Disable working on the local system\. This puts a lock file in place, causing \'puppet agent\' not to work on the system until the lock file is removed\. This is useful if you are testing a configuration and do not want the central configuration to override the local state until everything is tested and committed\.
 .
-.IP "" 4
+.IP
+\'puppet agent\' uses the same lock file while it is running, so no more than one \'puppet agent\' process is working at a time\.
 .
-.nf
-
-                console, and a log file\. Defaults to sending
-                messages to syslog, or the console if debugging or
-                verbosity is enabled\.
+.IP
+\'puppet agent\' exits after executing this\.
 .
-.fi
+.TP
+\-\-enable
+Enable working on the local system\. This removes any lock file, causing \'puppet agent\' to start managing the local system again (although it will continue to use its normal scheduling, so it might not start for another half hour)\.
 .
-.IP "" 0
+.IP
+\'puppet agent\' exits after executing this\.
 .
-.P
-no\-client: Do not create a config client\. This will cause the
+.TP
+\-\-certname
+Set the certname (unique ID) of the client\. The master reads this unique identifying string, which is usually set to the node\'s fully\-qualified domain name, to determine which configurations the node will receive\. Use this option to debug setup problems or implement unusual node identification schemes\.
 .
-.IP "" 4
+.TP
+\-\-help
+Print this help message
 .
-.nf
-
-                daemon to run without ever checking for its
-                configuration automatically, and only makes sense
-                when used in conjunction with \-\-listen\.
+.TP
+\-\-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\.
 .
-.fi
+.TP
+\-\-no\-client
+Do not create a config client\. This will cause the daemon to run without ever checking for its configuration automatically, and only makes sense
 .
-.IP "" 0
+.TP
+\-\-onetime
+Run the configuration once\. Runs a single (normally daemonized) Puppet run\. Useful for interactively running puppet agent when used in conjunction with the \-\-no\-daemonize option\.
 .
-.P
-onetime: Run the configuration once\. Runs a single (normally
+.TP
+\-\-fingerprint
+Display the current certificate or certificate signing request fingerprint and then exit\. Use the \'\-\-digest\' option to change the digest algorithm used\.
 .
-.IP "" 4
+.TP
+\-\-serve
+Start another type of server\. By default, \'puppet agent\' will start a service handler that allows authenticated and authorized remote nodes to trigger the configuration to be pulled down and applied\. You can specify any handler here that does not require configuration, e\.g\., filebucket, ca, or resource\. The handlers are in \'lib/puppet/network/handler\', and the names must match exactly, both in the call to \'serve\' and in \'namespaceauth\.conf\'\.
 .
-.nf
-
-                daemonized) Puppet run\. Useful for interactively
-                running puppet agent when used in conjunction with
-                the \-\-no\-daemonize option\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-fingerprint: Display the current certificate or certificate
+.TP
+\-\-test
+Enable the most common options used for testing\. These are \'onetime\', \'verbose\', \'ignorecache\', \'no\-daemonize\', \'no\-usecacheonfailure\', \'detailed\-exit\-codes\', \'no\-splay\', and \'show_diff\'\.
 .
-.IP "" 4
+.TP
+\-\-noop
+Use \'noop\' mode where the daemon runs in a no\-op or dry\-run mode\. This is useful for seeing what changes Puppet will make without actually executing the changes\.
 .
-.nf
-
-                signing request fingerprint and then exit\. Use the
-                +\-\-digest+ option to change the digest algorithm
-                used\.
+.TP
+\-\-verbose
+Turn on verbose reporting\.
 .
-.fi
+.TP
+\-\-version
+Print the puppet version number and exit\.
 .
-.IP "" 0
+.TP
+\-\-waitforcert
+This option only matters for daemons that do not yet have certificates and it is enabled by default, with a value of 120 (seconds)\. This causes \'puppet agent\' to connect to the server every 2 minutes and ask it to sign a certificate request\. This is useful for the initial setup of a puppet client\. You can turn off waiting for certificates by specifying a time of 0\.
 .
-.P
-serve: Start another type of server\. By default, +puppet
-.
-.IP "" 4
+.SH "EXAMPLE"
 .
 .nf
 
-                agent+ will start a service handler that allows
-                authenticated and authorized remote nodes to trigger
-                the configuration to be pulled down and applied\. You
-                can specify any handler here that does not require
-                configuration, e\.g\., filebucket, ca, or resource\.
-                The handlers are in +lib/puppet/network/handler+,
-                and the names must match exactly, both in the call
-                to +serve+ and in +namespaceauth\.conf+\.
+$ puppet agent \-\-server puppet\.domain\.com
 .
 .fi
 .
-.IP "" 0
-.
-.P
-test: Enable the most common options used for testing\.
-.
-.IP "" 4
-.
-.nf
-
-                These are +onetime+, +verbose+, +ignorecache,
-                +no\-daemonize+, and +no\-usecacheonfailure+\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-noop: Use +noop+ mode where the daemon runs in a no\-op or
-.
-.IP "" 4
-.
-.nf
-
-                dry\-run mode\. This is useful for seeing what changes
-                Puppet will make without actually executing the
-                changes\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-verbose: Turn on verbose reporting\.
-.
-.P
-version: Print the puppet version number and exit\.
-.
-.P
-waitforcert: This option only matters for daemons that do not yet
-.
-.IP "" 4
-.
-.nf
-
-                have certificates and it is enabled by default, with
-                a value of 120 (seconds)\. This causes +puppet agent+
-                to connect to the server every 2 minutes and ask it
-                to sign a certificate request\. This is useful for
-                the initial setup of a puppet client\. You can turn
-                off waiting for certificates by specifying a time of
-                0\.
-.
-.fi
+.SH "AUTHOR"
+Luke Kanies
 .
-.IP "" 0
-puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "COPYRIGHT"
+Copyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
index 47df0e7..e0cabd5 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -1,108 +1,101 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETDOC" "8" "August 2010" "" ""
-Generate a reference for all Puppet types\. Largely meant for internal Puppet Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
+.TH "PUPPET\-DOC" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-doc\fR \- Generate Puppet documentation and references
 .
-.nf
-
-         [\-r|\-\-reference <[type]|configuration|\.\.>] [\-\-charset CHARSET] [manifest\-file]
+.SH "SYNOPSIS"
+Generates a reference for all Puppet types\. Largely meant for internal Puppet Labs use\.
 .
-.fi
+.SH "USAGE"
+puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc\-outputdir\fR] [\-m|\-\-mode text|pdf|rdoc] [\-r|\-\-reference \fIreference\-name\fR] [\-\-charset \fIcharset\fR] [\fImanifest\-file\fR]
 .
-.IP "" 0
+.SH "DESCRIPTION"
 If mode is not \'rdoc\', then this command generates a Markdown document describing all installed Puppet types or all allowable arguments to puppet executables\. It is largely meant for internal use and is used to generate the reference document available on the Puppet Labs web site\.
 .
 .P
 In \'rdoc\' mode, this command generates an html RDoc hierarchy describing the manifests that are in \'manifestdir\' and \'modulepath\' configuration directives\. The generated documentation directory is doc by default but can be changed with the \'outputdir\' option\.
 .
 .P
-If the command is started with \'manifest\-file\' command\-line arguments, puppet doc generate a single manifest documentation that is output on stdout\.all: Output the docs for all of the reference types\. In \'rdoc\'
+If the command is run with the name of a manifest file as an argument, puppet doc will output a single manifest\'s documentation on stdout\.
 .
-.IP "" 4
+.SH "OPTIONS"
 .
-.nf
-
-       modes, this also outputs documentation for all resources
+.TP
+\-\-all
+Output the docs for all of the reference types\. In \'rdoc\' modes, this also outputs documentation for all resources
 .
-.fi
+.TP
+\-\-help
+Print this help message
 .
-.IP "" 0
+.TP
+\-\-outputdir
+Specifies the directory where to output the rdoc documentation in \'rdoc\' mode\.
 .
-.P
-help: Print this help message
+.TP
+\-\-mode
+Determine the output mode\. Valid modes are \'text\', \'pdf\' and \'rdoc\'\. The \'pdf\' mode creates PDF formatted files in the /tmp directory\. The default mode is \'text\'\. In \'rdoc\' mode you must provide \'manifests\-path\'
 .
-.P
-outputdir: Specifies the directory where to output the rdoc
+.TP
+\-\-reference
+Build a particular reference\. Get a list of references by running \'puppet doc \-\-list\'\.
 .
-.IP "" 4
+.TP
+\-\-charset
+Used only in \'rdoc\' mode\. It sets the charset used in the html files produced\.
+.
+.SH "EXAMPLE"
 .
 .nf
 
-       documentation in \'rdoc\' mode\.
+$ puppet doc \-r type > /tmp/type_reference\.markdown
 .
 .fi
 .
-.IP "" 0
-.
 .P
-mode: Determine the output mode\. Valid modes are \'text\', \'trac\',
+or
 .
 .IP "" 4
 .
 .nf
 
-       \'pdf\' and \'rdoc\'\. The \'pdf\' mode creates PDF formatted files
-       in the /tmp directory\. The default mode is \'text\'\. In \'rdoc\'
-       mode you must provide \'manifests\-path\'
+$ puppet doc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
 .
 .fi
 .
 .IP "" 0
 .
 .P
-reference: Build a particular reference\. Get a list of references by
+or
 .
 .IP "" 4
 .
 .nf
 
-       running +puppet doc \-\-list+\.
+$ puppet doc /etc/puppet/manifests/site\.pp
 .
 .fi
 .
 .IP "" 0
 .
 .P
-charset: Used only in \'rdoc\' mode\. It sets the charset used in the
+or
 .
 .IP "" 4
 .
 .nf
 
-       html files produced\.
+$ puppet doc \-m pdf \-r configuration
 .
 .fi
 .
 .IP "" 0
-$ puppet doc \-r type > /tmp/type_reference\.rst
-.
-.P
-or
-.
-.P
-$ puppet doc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
 .
-.P
-or
-.
-.P
-$ puppet doc /etc/puppet/manifests/site\.pp
+.SH "AUTHOR"
+Luke Kanies
 .
-.P
-or
-.
-.P
-$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "COPYRIGHT"
+Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index dde93a3..9ed2a6a 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -1,52 +1,63 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETMASTERD" "8" "August 2010" "" ""
-The central puppet server\. Functions as a certificate authority by default\.puppet master [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help]
+.TH "PUPPET\-MASTER" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-master\fR \- The puppet master daemon
 .
-.nf
-
-  [\-l|\-\-logdest <file>|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version]
+.SH "SYNOPSIS"
+The central puppet server\. Functions as a certificate authority by default\.
 .
-.fi
+.SH "USAGE"
+puppet master [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help] [\-l|\-\-logdest \fIfile\fR|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version] [\-\-compile \fInode\-name\fR]
 .
-.IP "" 0
-This is the puppet central daemon\.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 \fIdirectory\fR\' as an argument\.
+.SH "DESCRIPTION"
+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\.
 .
-.P
-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\'\.
+.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 \fIdirectory\fR\' as an argument\.
 .
 .P
-daemonize: Send the process into the background\. This is the default\.
+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 puppet master with \'\-\-genconfig\'\.
 .
-.P
-no\-daemonize: Do not send the process into the background\.
+.TP
+\-\-daemonize
+Send the process into the background\. This is the default\.
 .
-.P
-debug: Enable full debugging\.
+.TP
+\-\-no\-daemonize
+Do not send the process into the background\.
 .
-.P
-help: Print this help message\.
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.P
-logdest: Where to send messages\. Choose between syslog, the
+.TP
+\-\-help
+Print this help message\.
 .
-.IP "" 4
+.TP
+\-\-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\.
 .
-.nf
-
-          console, and a log file\. Defaults to sending messages to
-          syslog, or the console if debugging or verbosity is
-          enabled\.
+.TP
+\-\-verbose
+Enable verbosity\.
 .
-.fi
+.TP
+\-\-version
+Print the puppet version number and exit\.
 .
-.IP "" 0
+.TP
+\-\-compile
+Compile a catalogue and output it in JSON from the puppet master\. Uses facts contained in the $vardir/yaml/ directory to compile the catalog\.
 .
-.P
-verbose: Enable verbosity\.
+.SH "EXAMPLE"
+puppet master
 .
-.P
-version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "AUTHOR"
+Luke Kanies
+.
+.SH "COPYRIGHT"
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index f630c74..7dbd683 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -1,20 +1,55 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETQD" "8" "August 2010" "" ""
-puppet queue [\-d|\-\-debug] [\-v|\-\-verbose]This is a simple application that just processes entities in a queue as they are recieved\.Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
+.TH "PUPPET\-QUEUE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.P
-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 puppetd with \'\-\-genconfig\'\.
+.SH "NAME"
+\fBpuppet\-queue\fR \- Queuing daemon for asynchronous storeconfigs
 .
-.P
-debug: Enable full debugging\.
+.SH "SYNOPSIS"
+Retrieves serialized storeconfigs records from a queue and processes them in order\.
 .
-.P
-help: Print this help message
+.SH "USAGE"
+puppet queue [\-d|\-\-debug] [\-v|\-\-verbose]
+.
+.SH "DESCRIPTION"
+This application runs as a daemon and processes storeconfigs data, retrieving the data from a stomp server message queue and writing it to a database\.
 .
 .P
-verbose: Turn on verbose reporting\.
+For more information, including instructions for properly setting up your puppet master and message queue, see the documentation on setting up asynchronous storeconfigs at: http://projects\.puppetlabs\.com/projects/1/wiki/Using_Stored_Configuration
+.
+.SH "OPTIONS"
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'server\' is a valid configuration parameter, so you can specify \'\-\-server \fIservername\fR\' as an argument\.
 .
 .P
-version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
+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 puppet queue with \'\-\-genconfig\'\.
+.
+.TP
+\-\-debug
+Enable full debugging\.
+.
+.TP
+\-\-help
+Print this help message
+.
+.TP
+\-\-verbose
+Turn on verbose reporting\.
+.
+.TP
+\-\-version
+Print the puppet version number and exit\.
+.
+.SH "EXAMPLE"
+.
+.nf
+
+$ puppet queue
+.
+.fi
+.
+.SH "AUTHOR"
+Luke Kanies
+.
+.SH "COPYRIGHT"
+Copyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index 09fa31b..b6a8689 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -1,32 +1,34 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETRUN" "8" "August 2010" "" ""
-Trigger a puppet agent run on a set of hosts\.puppet kick [\-a|\-\-all] [\-c|\-\-class \fIclass\fR] [\-d|\-\-debug] [\-f|\-\-foreground]
+.TH "PUPPET\-KICK" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-kick\fR \- Remotely control puppet agent
 .
-.nf
-
-  [\-h|\-\-help] [\-\-host <host>] [\-\-no\-fqdn] [\-\-ignoreschedules]
-  [\-t|\-\-tag <tag>] [\-\-test] [\-p|\-\-ping] <host> [<host> [\.\.\.]]
+.SH "SYNOPSIS"
+Trigger a puppet agent run on a set of hosts\.
 .
-.fi
+.SH "USAGE"
+puppet kick [\-a|\-\-all] [\-c|\-\-class \fIclass\fR] [\-d|\-\-debug] [\-f|\-\-foreground] [\-h|\-\-help] [\-\-host \fIhost\fR] [\-\-no\-fqdn] [\-\-ignoreschedules] [\-t|\-\-tag \fItag\fR] [\-\-test] [\-p|\-\-ping] \fIhost\fR [\fIhost\fR [\.\.\.]]
 .
-.IP "" 0
-This script can be used to connect to a set of machines running +puppet agent+ and trigger them to run their configurations\. The most common usage would be to specify a class of hosts and a set of tags, and +puppet kick+ would look up in LDAP all of the hosts matching that class, then connect to each host and trigger a run of all of the objects with the specified tags\.
+.SH "DESCRIPTION"
+This script can be used to connect to a set of machines running \'puppet agent\' and trigger them to run their configurations\. The most common usage would be to specify a class of hosts and a set of tags, and \'puppet kick\' would look up in LDAP all of the hosts matching that class, then connect to each host and trigger a run of all of the objects with the specified tags\.
 .
 .P
 If you are not storing your host configurations in LDAP, you can specify hosts manually\.
 .
 .P
-You will most likely have to run +puppet kick+ as root to get access to the SSL certificates\.
+You will most likely have to run \'puppet kick\' as root to get access to the SSL certificates\.
 .
 .P
-+puppet kick+ reads +puppet master+\'s configuration file, so that it can copy things like LDAP settings\.+puppet kick+ is useless unless +puppet agent+ is listening\. See its documentation for more information, but the gist is that you must enable +listen+ on the +puppet agent+ daemon, either using +\-\-listen+ on the command line or adding \'listen: true\' in its config file\. In addition, you need to set the daemons up to specifically allow connections by creating the +namespaceauth+ file, normally at \'/etc/puppet/namespaceauth\.conf\'\. This file specifies who has access to each namespace; if you create the file you must add every namespace you want any Puppet daemon to allow \-\- it is currently global to all Puppet daemons\.
+\'puppet kick\' reads \'puppet master\'\'s configuration file, so that it can copy things like LDAP settings\.
+.
+.SH "USAGE NOTES"
+\'puppet kick\' is useless unless \'puppet agent\' is listening\. See its documentation for more information, but the gist is that you must enable \'listen\' on the \'puppet agent\' daemon, either using \'\-\-listen\' on the command line or adding \'listen = true\' in its config file\. In addition, you need to set the daemons up to specifically allow connections by creating the \'namespaceauth\' file, normally at \'/etc/puppet/namespaceauth\.conf\'\. This file specifies who has access to each namespace; if you create the file you must add every namespace you want any Puppet daemon to allow \-\- it is currently global to all Puppet daemons\.
 .
 .P
-An example file looks like this::
+An example file looks like this:
 .
 .IP "" 4
 .
@@ -46,128 +48,68 @@ An example file looks like this::
 .IP "" 0
 .
 .P
-This is what you would install on your Puppet master; non\-master hosts could leave off the \'fileserver\' and \'puppetmaster\' namespaces\.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 \fIdirectory\fR\' as an argument\.
-.
-.P
-See the configuration file documentation at http://reductivelabs\.com/projects/puppet/reference/configref\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet master with \'\-\-genconfig\'\.
-.
-.P
-all: Connect to all available hosts\. Requires LDAP support
-.
-.IP "" 4
-.
-.nf
-
-             at this point\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-class: Specify a class of machines to which to connect\. This
-.
-.IP "" 4
-.
-.nf
-
-             only works if you have LDAP configured, at the moment\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-debug: Enable full debugging\.
-.
-.P
-foreground: Run each configuration in the foreground; that is, when
-.
-.IP "" 4
-.
-.nf
-
-             connecting to a host, do not return until the host has
-             finished its run\. The default is false\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-help: Print this help message
+This is what you would install on your Puppet master; non\-master hosts could leave off the \'fileserver\' and \'puppetmaster\' namespaces\.
 .
-.P
-host: A specific host to which to connect\. This flag can be
-.
-.IP "" 4
-.
-.nf
-
-             specified more than once\.
-.
-.fi
-.
-.IP "" 0
+.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 \fIdirectory\fR\' as an argument\.
 .
 .P
-ignoreschedules: Whether the client should ignore schedules when running
+See the configuration file documentation at http://docs\.puppetlabs\.com/references/latest/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet master with \'\-\-genconfig\'\.
 .
-.IP "" 4
+.TP
+\-\-all
+Connect to all available hosts\. Requires LDAP support at this point\.
 .
-.nf
-
-             its configuration\. This can be used to force the client
-             to perform work it would not normally perform so soon\.
-             The default is false\.
+.TP
+\-\-class
+Specify a class of machines to which to connect\. This only works if you have LDAP configured, at the moment\.
 .
-.fi
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.IP "" 0
+.TP
+\-\-foreground
+Run each configuration in the foreground; that is, when connecting to a host, do not return until the host has finished its run\. The default is false\.
 .
-.P
-parallel: How parallel to make the connections\. Parallelization
+.TP
+\-\-help
+Print this help message
 .
-.IP "" 4
+.TP
+\-\-host
+A specific host to which to connect\. This flag can be specified more than once\.
 .
-.nf
-
-             is provided by forking for each client to which to
-             connect\. The default is 1, meaning serial execution\.
-.
-.fi
-.
-.IP "" 0
-.
-.P
-tag: Specify a tag for selecting the objects to apply\. Does
-.
-.IP "" 4
+.TP
+\-\-ignoreschedules
+Whether the client should ignore schedules when running its configuration\. This can be used to force the client to perform work it would not normally perform so soon\. The default is false\.
 .
-.nf
-
-             not work with the \-\-test option\.
+.TP
+\-\-parallel
+How parallel to make the connections\. Parallelization is provided by forking for each client to which to connect\. The default is 1, meaning serial execution\.
 .
-.fi
+.TP
+\-\-tag
+Specify a tag for selecting the objects to apply\. Does not work with the \-\-test option\.
 .
-.IP "" 0
+.TP
+\-\-test
+Print the hosts you would connect to but do not actually connect\. This option requires LDAP support at this point\.
 .
-.P
-test: Print the hosts you would connect to but do not
+.TP
+\-\-ping
+Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.
 .
-.IP "" 4
+.SH "EXAMPLE"
 .
 .nf
 
-             actually connect\. This option requires LDAP support at
-             this point\.
+$ sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2
 .
 .fi
 .
-.IP "" 0
+.SH "AUTHOR"
+Luke Kanies
 .
-.P
-ping::
-.
-.P
-Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2Luke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
+.SH "COPYRIGHT"
+Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index bdc81e9..f1bc849 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -1,85 +1,84 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "RALSH" "8" "August 2010" "" ""
-Use the Puppet RAL to directly interact with the system\.puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit]
+.TH "PUPPET\-RESOURCE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
 .
-.IP "" 4
+.SH "NAME"
+\fBpuppet\-resource\fR \- The resource abstraction layer shell
 .
-.nf
-
-              [\-H|\-\-host <host>] [\-p|\-\-param <param>] [\-t|\-\-types]
-              type <name>
+.SH "SYNOPSIS"
+Uses the Puppet RAL to directly interact with the system\.
 .
-.fi
+.SH "USAGE"
+puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit] [\-H|\-\-host \fIhost\fR] [\-p|\-\-param] [\-t|\-\-types] \fItype\fR [\fIname\fR] [\fIattribute\fR=\fIvalue\fR \.\.\.]
 .
-.IP "" 0
-This command provides simple facilities for converting current system state into Puppet code, along with some ability to use Puppet to affect the current state\.
+.SH "DESCRIPTION"
+This command provides simple facilities for converting current system state into Puppet code, along with some ability to modify the current state using Puppet\'s RAL\.
 .
 .P
-By default, you must at least provide a type to list, which case puppet resource will tell you everything it knows about all instances of that type\. You can optionally specify an instance name, and puppet resource will only describe that single instance\.
+By default, you must at least provide a type to list, in which case puppet resource will tell you everything it knows about all resources of that type\. You can optionally specify an instance name, and puppet resource will only describe that single instance\.
 .
 .P
-You can also add +\-\-edit+ as an argument, and puppet resource will write its output to a file, open that file in an editor, and then apply the file as a Puppet transaction\. You can easily use this to use Puppet to make simple changes to a system\.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 \fIdirectory\fR\' as an argument\.
+If given a type, a name, and a series of \fIattribute\fR=\fIvalue\fR pairs, puppet resource will modify the state of the specified resource\. Alternately, if given a type, a name, and the \'\-\-edit\' flag, puppet resource will write its output to a file, open that file in an editor, and then apply the saved file as a Puppet transaction\.
 .
-.P
-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 puppet with \'\-\-genconfig\'\.
+.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 \fIdirectory\fR\' as an argument\.
 .
 .P
-debug: Enable full debugging\.
+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 puppet with \'\-\-genconfig\'\.
 .
-.P
-edit:
+.TP
+\-\-debug
+Enable full debugging\.
 .
-.P
+.TP
+\-\-edit
 Write the results of the query to a file, open the file in an editor, and read the file back in as an executable Puppet manifest\.
 .
-.P
-host:
-.
-.P
+.TP
+\-\-host
 When specified, connect to the resource server on the named host and retrieve the list of resouces of the type specified\.
 .
-.P
-help:
-.
-.P
+.TP
+\-\-help
 Print this help message\.
 .
-.P
-param:
-.
-.P
+.TP
+\-\-param
 Add more parameters to be outputted from queries\.
 .
-.P
-types:
-.
-.P
+.TP
+\-\-types
 List all available types\.
 .
-.P
-verbose:
+.TP
+\-\-verbose
+Print extra information\.
 .
-.P
-Print extra information\.This example uses \fBpuppet resource\fR to return Puppet configuration for the user \fBluke\fR:
+.SH "EXAMPLE"
+This example uses \fBpuppet resource\fR to return a Puppet configuration for the user \fBluke\fR:
 .
 .IP "" 4
 .
 .nf
 
- $ puppet resource user luke
- user { \'luke\':
-   home => \'/home/luke\',
-   uid => \'100\',
-   ensure => \'present\',
-   comment => \'Luke Kanies,,,\',
-   gid => \'1000\',
-   shell => \'/bin/bash\',
-   groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
- }
+$ puppet resource user luke
+user { \'luke\':
+ home => \'/home/luke\',
+ uid => \'100\',
+ ensure => \'present\',
+ comment => \'Luke Kanies,,,\',
+ gid => \'1000\',
+ shell => \'/bin/bash\',
+ groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
+}
 .
 .fi
 .
 .IP "" 0
-Luke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+.
+.SH "AUTHOR"
+Luke Kanies
+.
+.SH "COPYRIGHT"
+Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list