Index: puppet-0.24.5/man/man8/puppet.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppet.8
+++ puppet-0.24.5/man/man8/puppet.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH   puppet 8 "A network tool for managing many disparate systems" 
 .SH NAME
- \- 
+ puppet \- A network tool for managing many disparate systems
 
 .\" Man page generated from reStructeredText.
 
@@ -26,16 +26,16 @@ scripts, use +puppetd+ and +puppetmaster
 
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 with
-\'\-\-genconfig\'.
+'\-\-genconfig'.
 
 debug:       Enable full debugging.
 
Index: puppet-0.24.5/man/man8/filebucket.8
===================================================================
--- puppet-0.24.5.orig/man/man8/filebucket.8
+++ puppet-0.24.5/man/man8/filebucket.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH  filebucket 8 "A stand\-alone Puppet filebucket client." 
 .SH NAME
- \- 
+ filebucket \- A stand\-alone Puppet filebucket client.
 
 .\" Man page generated from reStructeredText.
 
@@ -46,7 +46,7 @@ entirely new path to this argument; you
 restoring the content to its original location.
 
 Note that +filebucket+ defaults to using a network\-based filebucket
-available on the server named +puppet+. To use this, you\'ll have to be
+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+.
 
@@ -63,16 +63,16 @@ $
 .\" depart_block_quote
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 with
-\'\-\-genconfig\'.
+'\-\-genconfig'.
 
 debug:   Enable full debugging.
 
Index: puppet-0.24.5/man/man8/pi.8
===================================================================
--- puppet-0.24.5.orig/man/man8/pi.8
+++ puppet-0.24.5/man/man8/pi.8
@@ -1,15 +1,21 @@
-.TH   "" "" ""
+.TH pi 8 ""
 .SH NAME
- \- 
+pi \- Print documentation for puppet types and their parameters
 
 .\" Man page generated from reStructeredText.
 
+.SH USAGE
+
 .TP
 .B bin/pi [options] [type]
 
+.SH DESCRIPTION
+
 .TP
 .B Print documentation for puppet types and their parameters
 
+.SH OPTIONS
+
 .TP
 .B \-l , \-\-list
 List all types
Index: puppet-0.24.5/man/man8/puppet.conf.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppet.conf.8
+++ puppet-0.24.5/man/man8/puppet.conf.8
@@ -1,12 +1,6 @@
-.TH Configuration Reference  "" "" ""
+.TH puppet.conf 8 "Configuration Reference"
 .SH NAME
-Configuration Reference \- 
-
-.\" Man page generated from reStructeredText.
-This page is autogenerated; any changes will get overwritten 
-.I (last generated on Mon May 05 09:33:01 +1000 2008)
-
-
+puppet.conf \- Configuration Reference
 
 .\" topic: Contents
 .\" 
@@ -157,7 +151,7 @@ so within curly braces on the same line:
 [main]
     myfile = /tmp/whatever {owner = root, mode = 644}
 .fi
-If you\'re starting out with a fresh configuration, you may wish to let
+If you're starting out with a fresh configuration, you may wish to let
 the executable generate a template configuration file for you by invoking
 the executable in question with the 
 .I \-\-genconfig
@@ -176,7 +170,7 @@ Note that this invocation will replace t
 valuable information.
 
 All parameters will be under a single section heading matching the name of
-the process used to generate the configuraiton (\'puppetd\', in this case).
+the process used to generate the configuraiton ('puppetd', in this case).
 
 Like the 
 .I \-\-genconfig
@@ -184,7 +178,7 @@ Like the
 .I \-\-genmanifest
 
 argument, which will generate a manifest that can be used to manage all of
-Puppet\'s directories and files and prints it to standard output.  This can
+Puppet's directories and files and prints it to standard output.  This can
 likewise be redirected to a file:
 
 
@@ -343,7 +337,7 @@ Default: $masterport
 
 
 .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.
+The server to use for certificate authority requests.  It's a separate server because it cannot and does not need to horizontally scale.
 
 
 .TP 2
@@ -352,7 +346,7 @@ Default: $server
 
 
 .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)
+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)
 
 
 .TP 2
@@ -370,7 +364,7 @@ Default: $cadir/ca_crt.pem
 
 
 .SS cacrl
-The certificate revocation list (CRL) for the CA. Set this to \'false\' if you do not want to use a CRL.
+The certificate revocation list (CRL) for the CA. Set this to 'false' if you do not want to use a CRL.
 
 
 .TP 2
@@ -451,7 +445,7 @@ Default: $ssldir/certs
 
 
 .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\'.
+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'.
 
 
 .SS certname
@@ -494,7 +488,7 @@ Code to parse directly.  This is essenti
 .\" visit_literal
 puppet
 .\" depart_literal
-, and should only be set if you\'re writing your own Puppet executable
+, and should only be set if you're writing your own Puppet executable
 
 
 .SS color
@@ -527,7 +521,7 @@ The main Puppet configuration directory.
 .\" visit_literal
 puppetmasterd
 .\" depart_literal
- 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 
+ 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 
 .\" visit_literal
 ~
 .\" depart_literal
@@ -549,7 +543,7 @@ Default: $confdir/puppet.conf
 
 
 .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.
+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.
 
 
 .SS configtimeout
@@ -958,7 +952,7 @@ Default: 1024
 
 
 .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.
+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.
 
 
 .TP 2
@@ -967,7 +961,7 @@ Default: all
 
 
 .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.
+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.
 
 
 .SS ldapclassattrs
@@ -1068,7 +1062,7 @@ Default: false
 
 
 .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
+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
 
 
 .TP 2
@@ -1206,7 +1200,7 @@ Default: puppetdoc
 
 
 .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)
+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)
 
 
 .TP 2
@@ -1420,7 +1414,7 @@ Default: $vardir/reports
 
 
 .SS reportfrom
-The \'from\' email address for the reports.
+The 'from' email address for the reports.
 
 
 .TP 2
@@ -1581,7 +1575,7 @@ Default: $runinterval
 
 
 .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., 
+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., 
 .\" visit_literal
 /CN=puppet.reductivelabs.com
 .\" depart_literal
@@ -1594,7 +1588,7 @@ Default: HTTP_X_CLIENT_DN
 
 
 .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://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information.
+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://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information.
 
 
 .TP 2
@@ -1630,7 +1624,7 @@ Default: $statedir/state.yaml
 
 
 .SS storeconfigs
-Whether to store each client\'s configuration.  This requires ActiveRecord from Ruby on Rails.
+Whether to store each client's configuration.  This requires ActiveRecord from Ruby on Rails.
 
 
 .TP 2
Index: puppet-0.24.5/man/man8/puppetca.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppetca.8
+++ puppet-0.24.5/man/man8/puppetca.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH  puppetca 8 "Stand\-alone certificate authority" 
 .SH NAME
- \- 
+puppet \- Stand\-alone certificate authority
 
 .\" Man page generated from reStructeredText.
 
@@ -29,29 +29,29 @@ sign them individually or sign all of th
 
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 puppetca with
-\'\-\-genconfig\'.
+'\-\-genconfig'.
 
 
 .TP
 .B all:      Operate on all items. Currently only makes sense with
-\'\-\-sign\', \'\-\-clean\', or \'\-\-list\'.
+'\-\-sign', '\-\-clean', or '\-\-list'.
 
 
 .TP
-.B clean:    Remove all files related to a host from puppetca\'s storage.
+.B clean:    Remove all files related to a host from puppetca's storage.
 This is useful when rebuilding hosts, since new certificate
 signing requests will only be honored if puppetca does not
 have a copy of a signed certificate for that host. The
-certificate of the host remains valid. If \'\-\-all\' is specified
+certificate of the host remains valid. If '\-\-all' is specified
 then all host certificates, both signed and unsigned, will be
 removed.
 
@@ -67,25 +67,25 @@ help:     Print this help message
 
 
 .TP
-.B list:     List outstanding certificate requests. If \'\-\-all\' is
+.B list:     List outstanding certificate requests. If '\-\-all' is
 specified, signed certificates are also listed, prefixed by
-\'+\'.
+'+'.
 
-print:    Print the full\-text version of a host\'s certificate.
+print:    Print the full\-text version of a host's certificate.
 
 
 .TP
 .B 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
+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
+Certificate Revocation List given by the 'cacrl' config
 parameter. Note that the puppetmasterd needs to be restarted
 after revoking certificates.
 
 
 .TP
-.B sign:     Sign an outstanding certificate request. Unless \'\-\-all\' is
+.B sign:     Sign an outstanding certificate request. Unless '\-\-all' is
 specified, hosts must be listed after all flags.
 
 verbose:  Enable verbosity.
Index: puppet-0.24.5/man/man8/puppetd.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppetd.8
+++ puppet-0.24.5/man/man8/puppetd.8
@@ -1,7 +1,8 @@
-.TH Synopsis  "" "" ""
+.TH puppetd 8 "Main puppet client"
 .SH NAME
-Synopsis \- 
+puppetd \- Main puppet client
 
+.SH SYNOPSIS
 .\" Man page generated from reStructeredText.
 Retrieve the client configuration from the central puppet server and
 apply it to the local host.
@@ -24,7 +25,7 @@ Currently must be run out periodically,
 
 .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
+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
@@ -44,8 +45,8 @@ apply its configuration every 30 minutes
 
 Some flags are meant specifically for interactive use \-\- in particular,
 +test+ and +tags+ 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
+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).
 
@@ -62,16 +63,16 @@ applying the whole thing.
 
 
 .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 <servername>\' as
+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 <servername>' as
 an argument.
 
 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 puppetd with
-\'\-\-genconfig\'.
+'\-\-genconfig'.
 
 daemonize:    Send the process into the background. This is the default.
 
Index: puppet-0.24.5/man/man8/puppetdoc.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppetdoc.8
+++ puppet-0.24.5/man/man8/puppetdoc.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH  puppetdoc 8 "Generate a reference for all Puppet types" 
 .SH NAME
- \- 
+puppetdoc \- Generate a reference for all Puppet types
 
 .\" Man page generated from reStructeredText.
 
@@ -31,9 +31,9 @@ help:      Print this help message
 
 
 .TP
-.B mode:      Determine the output mode. Valid modes are \'text\', \'trac\',
-and \'pdf\'. Note that \'trac\' mode only works on Reductive Labs
-servers. The default mode is \'text\'.
+.B mode:      Determine the output mode. Valid modes are 'text', 'trac',
+and 'pdf'. Note that 'trac' mode only works on Reductive Labs
+servers. The default mode is 'text'.
 
 
 .TP
Index: puppet-0.24.5/man/man8/puppetmasterd.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppetmasterd.8
+++ puppet-0.24.5/man/man8/puppetmasterd.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH  puppetmasterd 8 "The central puppet server" 
 .SH NAME
- \- 
+puppetmasterd \- The central puppet server
 
 .\" Man page generated from reStructeredText.
 
@@ -26,16 +26,16 @@ This is the puppet central daemon.
 
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 puppetmasterdd
-with \'\-\-genconfig\'.
+with '\-\-genconfig'.
 
 daemonize:    Send the process into the background. This is the default.
 
Index: puppet-0.24.5/man/man8/puppetrun.8
===================================================================
--- puppet-0.24.5.orig/man/man8/puppetrun.8
+++ puppet-0.24.5/man/man8/puppetrun.8
@@ -1,6 +1,6 @@
-.TH   "" "" ""
+.TH  puppetrun 8 "Trigger a puppetd run on a set of hosts"
 .SH NAME
- \- 
+puppetrun \- Trigger a puppetd run on a set of hosts
 
 .\" Man page generated from reStructeredText.
 
@@ -34,7 +34,7 @@ hosts manually.
 You will most likely have to run +puppetrun+ as root to get access to
 the SSL certificates.
 
-+puppetrun+ reads +puppetmaster+\'s configuration file, so that it can
++puppetrun+ reads +puppetmaster+'s configuration file, so that it can
 copy things like LDAP settings.
 
 
@@ -42,9 +42,9 @@ copy things like LDAP settings.
 +puppetrun+ is useless unless +puppetd+ is listening. See its
 documentation for more information, but the gist is that you must enable
 +listen+ on the +puppetd+ daemon, either using +\-\-listen+ on the command
-line or adding \'listen: true\' in its config file. In addition, you need
+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
++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.
@@ -63,22 +63,22 @@ An example file looks like this:
     allow culain.madstop.com
 .fi
 This is what you would install on your Puppet master; non\-master hosts
-could leave off the \'fileserver\' and \'puppetmaster\' namespaces.
+could leave off the 'fileserver' and 'puppetmaster' namespaces.
 
 Expect more documentation on this eventually.
 
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 puppetmasterdd
-with \'\-\-genconfig\'.
+with '\-\-genconfig'.
 
 
 .TP
Index: puppet-0.24.5/man/man8/ralsh.8
===================================================================
--- puppet-0.24.5.orig/man/man8/ralsh.8
+++ puppet-0.24.5/man/man8/ralsh.8
@@ -1,10 +1,8 @@
-.TH   "" "" ""
+.TH  ralsh 8 "Use the Puppet RAL to directly interact with the system" 
 .SH NAME
- \- 
+ralsh \- Use the Puppet RAL to directly interact with the system
 
 .\" Man page generated from reStructeredText.
-vim: softtabstop=4 shiftwidth=4 expandtab
-
 
 .SH SYNOPSIS
 Use the Puppet RAL to directly interact with the system.
@@ -38,16 +36,16 @@ simple changes to a system.
 
 
 .SH OPTIONS
-Note that any configuration parameter that\'s valid in the configuration
-file is also a valid long argument. For example, \'ssldir\' is a valid
-configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '\-\-ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
 http://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 with
-\'\-\-genconfig\'.
+'\-\-genconfig'.
 
 debug: Enable full debugging.
 
@@ -111,14 +109,14 @@ luke
 
 .nf
 $ ralsh user luke
-user { \'luke\':
-  home => \'/home/luke\',
-  uid => \'100\',
-  ensure => \'present\',
-  comment => \'Luke Kanies,,,\',
-  gid => \'1000\',
-  shell => \'/bin/bash\',
-  groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
+user { 'luke':
+  home => '/home/luke',
+  uid => '100',
+  ensure => 'present',
+  comment => 'Luke Kanies,,,',
+  gid => '1000',
+  shell => '/bin/bash',
+  groups => ['sysadmin','audio','video','puppet']
 }
 .fi
 
