diff --git a/ext/nagios/naggen b/ext/nagios/naggen
index a9e04c47a..c6ca15a55 100755
--- a/ext/nagios/naggen
+++ b/ext/nagios/naggen
@@ -1,302 +1,302 @@
 #!/usr/bin/env ruby
 #
 # = Synopsis
 #
 # Generate Nagios configurations from Puppet Resources in an ActiveRecord database
 #
 # = Usage
 #
 #   naggen [-h|--help] [-d|--debug] [-v|--verbose] [--compare]
 #
 # = Description
 #
 # This executable is a means of short-circuiting the process of generating nagios
 # configurations on your server using Puppet Exported Resources.  It skips any possible
 # naming conflicts resulting from Puppet's resource uniqueness requirements, and it
 # also skips the inefficiencies involved in converting and transporting large numbers
 # of Puppet resources.
 #
 # At the least, the machine that runs this will need ActiveRecord (2.0.2) installed,
 # along with any database libraries you use.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # You can add naggen-specific settings to your puppet.conf in a '[naggen]' section,
 # just like any other executable.
 #
 # 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'.
 #
 # compare::
 #   Compare new and old files and only backup and write if the files are different.
 #   Potentially expensive computationally, but idempotent.  Will exit with 0 if
 #   no changes were made and 1 if there were.
 #
 # debug::
 #   Enable full debugging.
 #
 # 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.
 #
 # help::
 #   Print this help message
 #
 # verbose::
 #   Print extra information.
 #
 # = Example
 #
 #   naggen --storeconfigs --confdir /foo --compare
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GPL 2
 
 require 'puppet'
 require 'puppet/rails'
 require 'puppet/rails/resource'
 require 'puppet/rails/param_value'
 require 'puppet/network/client'
 require 'puppet/parser/collector'
 require 'puppet/provider/naginator'
 require 'getoptlong'
 
 # Monkey-patch the rails resources so we can
 # easily convert them to nagios instances.
 class Puppet::Rails::Resource
     def to_param_hash
         values = @params_hash || Puppet::Rails::ParamValue.find_all_params_from_resource(self)
         if values.size == 0
             return {}
         end
         values.inject({}) do |hash, value|
             hash[value['name']] ||= []
             hash[value['name']] << value["value"]
             hash
         end
     end
 
     def to_nagios
         unless nagios_type = Nagios::Base.type(restype.sub("Nagios_", '').to_sym)
             raise Puppet::DevError, "Could not find nagios type '%s'" % restype
         end
 
         result = nagios_type.new
 
         to_param_hash.each do |param, value|
             next unless nagios_type.parameter?(param)
             result[param] = value
         end
 
         result[:name] = self.title
 
         result
     end
 end
 
 class NagiosWriter
     class FakeScope
         def debug(string)
             Puppet.debug string
         end
 
         def host
             "this host doesn't exist"
         end
     end
 
     attr_accessor :nagios_type, :bucket
 
     def backup(target)
         return unless FileTest.exist?(target) and File.stat(target).size > 0
 
         Puppet.info "Backing up %s" % target
         bucket.backup(target)
     end
 
     def collector
         collector = Puppet::Parser::Collector.new(FakeScope.new, "nagios_" + @nagios_type.to_s, nil, nil, :exported)
 
         # We don't have a scope, so we're stubbing everything out that would interact
         # with the scope.
         class << collector
             def collect_virtual(*args)
                 []
             end
 
             def exported_resource(res)
                 res
             end
         end
 
         collector
     end
 
     def default_target
         "/etc/nagios/nagios_#{nagios_type.to_s}.cfg"
     end
 
     def evaluate
         return unless resources = rails_resources()
 
         resources_by_target = resources.inject({}) do |hash, resource|
             target = resource["target"] || default_target
             hash[target] ||= []
             hash[target] << resource
             hash
         end
 
         changed = false
         resources_by_target.each do |target, resources|
             begin
                 result = write(target, resources)
             rescue => detail
                 $stderr.puts detail.backtrace
                 Puppet.err "Could not write to %s: %s" % [target, detail]
             end
 
             changed = true if result
         end
 
         changed
     end
 
     def initialize(nagios_type)
         @nagios_type = nagios_type
 
         @bucket = Puppet::FileBucket::Dipper.new(:Path => Puppet[:clientbucketdir])
     end
 
     def rails_resources
         collector.send(:collect_exported)
     end
 
     def write(target, resources)
         # Skip the nagios type when we have no resources and no existing
         # file.
         return if resources.empty? and ! FileTest.exist?(target)
 
         dir = File.dirname(target)
         unless FileTest.exist?(dir)
             FileUtils.mkdir_p(dir)
         end
 
         count = 0
 
         tempfile = target + ".tmp"
         File.open(tempfile, "w") do |file|
             resources.each do |resource|
                 count += 1
                 file.puts resource.to_nagios.to_s.gsub("_naginator_name", Puppet::Provider::Naginator::NAME_STRING)
             end
         end
 
         if $options[:compare]
             if FileTest.exist?(target) and File.read(tempfile) == File.read(target)
                 return false
             end
         end
 
         backup(target)
 
         # Atomic rename
         File.rename(tempfile, target)
 
         Puppet.notice "Wrote %s resources to %s" % [count, target]
 
         return true
     ensure
         File.unlink(tempfile) if tempfile and FileTest.exist?(tempfile)
     end
 end
 
 arguments = [
     [ "--compare", "-c", GetoptLong::NO_ARGUMENT ],
     [ "--debug",   "-d", GetoptLong::NO_ARGUMENT ],
     [ "--verbose", "-v", GetoptLong::NO_ARGUMENT ],
     [ "--help",    "-h", GetoptLong::NO_ARGUMENT ]
 ]
 
 Puppet.settings.addargs(arguments)
 
 result = GetoptLong.new(*arguments)
 
 $options = {}
 result.each { |opt,arg|
     case opt
         when "--help"
             begin
                 require 'rdoc/usage'
                 RDoc::usage && exit
             rescue LoadError
                 docs = []
                 File.readlines(__FILE__).each do |line|
                     next if line =~ /^#\!/
                     unless line =~ /^#/
                         next if docs.length == 0 # skip the first line or so
                         break # else, we've passed the docs, so just break
                     end
                     docs << line.sub(/^# ?/, '')
                 end
 
                 print docs
                 exit
             end
         when "--compare"
             $options[:compare] = true
         when "--verbose"
             $options[:verbose] = true
         when "--debug"
             $options[:debug] = true
         when "--debug"
             $options[:debug] = true
     else
             Puppet.settings.handlearg(opt, arg)
     end
 }
 
 # Read in Puppet settings, so we know how Puppet's configured.
 Puppet.parse_config
 
 Puppet::Util::Log.newdestination(:console)
 
 if $options[:debug]
     Puppet::Util::Log.level = :debug
 elsif $options[:verbose]
     Puppet::Util::Log.level = :info
 end
 
 # See if Naginator is installed directly, else load Puppet's version.
 begin
     require 'nagios'
 rescue LoadError
     require 'puppet/external/nagios'
 end
 
 changed = false
 Nagios::Base.eachtype do |name, type|
     writer = NagiosWriter.new(name)
 
     changed = true if writer.evaluate
 end
 
 if $options[:compare] and changed
     exit(1)
 else
     exit(0)
 end
 
diff --git a/ext/puppet-test b/ext/puppet-test
index 61397e74b..f2648c9ee 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -1,560 +1,560 @@
 #!/usr/bin/env ruby
 # == Synopsis
 #
 # Test individual client performance.  Can compile configurations, describe
 # files, or retrieve files.
 #
 # = Usage
 #
 #   puppet-test  [-c|--compile] [-D|--describe <file>] [-d|--debug]
 #       [--fork <num>] [-h|--help] [-H|--hostname <host name>] [-l|--list] [-r|--repeat <number=1>]
 #       [-R|--retrieve <file>] [-t|--test <test>] [-V|--version] [-v|--verbose]
 #
 # = Description
 #
 # This is a simple script meant for doing performance tests with Puppet.  By
 # default it pulls down a compiled configuration, but it supports multiple
 # other tests.
 #
 # = 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 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'.
 #
 # compile::
 #   Compile the client's configuration.  The default.
 #
 # debug::
 #   Enable full debugging.
 #
 # describe::
 #   Describe the file being tested.  This is a query to get information about
 #   the file from the server, to determine if it should be copied, and is the
 #   first half of every file transfer.
 #
 # fork::
 #   Fork the specified number of times, thus acting as multiple clients.
 #
 # fqdn::
 #   Set the fully-qualified domain name of the client.  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.
 #
 # help::
 #   Print this help message
 #
 # list::
 #   List all available tests.
 #
 # node::
 #  Specify the node to use.  This is useful for looking up cached yaml data
 #  in your :clientyaml directory, and forcing a specific host's configuration to
 #  get compiled.
 #
 # pause::
 #  Pause before starting test (useful for testing with dtrace).
 #
 # repeat::
 #  How many times to perform the test.
 #
 # retrieve::
 #   Test file retrieval performance.  Retrieves the specified file from the
 #   remote system.  Note that the server should be specified via --server,
 #   so the argument to this option is just the remote module name and path,
 #   e.g., "/dist/apps/myapp/myfile", where "dist" is the module and
 #   "apps/myapp/myfile" is the path to the file relative to the module.
 #
 # test::
 #   Specify the test to run.  You can see the list of tests by running this command with --list.
 #
 # verbose::
 #   Turn on verbose reporting.
 #
 # version::
 #   Print the puppet version number and exit.
 #
 # = Example
 #
 #   puppet-test --retrieve /module/path/to/file
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 # Do an initial trap, so that cancels don't get a stack trace.
 trap(:INT) do
     $stderr.puts "Cancelling startup"
     exit(1)
 end
 
 require 'puppet'
 require 'puppet/network/client'
 require 'getoptlong'
 
 class Suite
     attr_reader :name, :doc
 
     @@suites = {}
     @@tests = {}
 
     def self.[](name)
         @@suites[name]
     end
 
     # Run a test by first finding the suite then running the appropriate test.
     def self.run(test)
         unless suite_name = @@tests[test]
             raise "Unknown test %s" % test
 
         end
         unless suite = @@suites[suite_name]
             raise "Unknown test suite %s from test %s" % [suite_name, test]
         end
 
         suite.run(test)
     end
 
     # What suites are available?
     def self.suites
         @@suites.keys
     end
 
     def forked?
         defined? @forking
     end
 
     # Create a new test suite.
     def initialize(name, doc, &block)
         @name = name
         @doc = doc
 
         @tests = {}
 
         @@suites[name] = self
 
         raise "You must pass a block to the Test" unless block_given?
         instance_eval(&block)
     end
 
     # Define a new type of test on this suite.
     def newtest(name, doc, &block)
         @tests[name] = doc
 
         if @@tests[name]
             raise "Test names must be unique; cannot redefine %s" % name
         end
 
         @@tests[name] = @name
 
         meta_def(name, &block)
     end
 
     # Run the actual test.
     def run(test)
         unless doc = @tests[test]
             raise "Suite %s only supports tests %s; not %s" % [@name, @tests.keys.collect { |k| k.to_s }.join(","), test]
         end
         puts "Running %s %s test" % [@name, test]
 
         prepare() if respond_to?(:prepare)
 
         if $options[:pause]
             puts "Hit any key to continue"
             $stdin.readline
             puts "Continuing with test"
         end
 
         if $options[:fork] > 0
             @forking = true
             $options[:fork].times {
                 if pid = fork
                     $pids << pid
                 else
                     break
                 end
             }
         end
 
         $options[:repeat].times do |i|
             @count = i
             if forked?
                 msg = doc + " in PID %s" % Process.pid
             else
                 msg = doc
             end
             Puppet::Util.benchmark(:notice, msg) do
                 begin
                     send(test)
                 rescue => detail
                     puts detail.backtrace if Puppet[:trace]
                     Puppet.err "%s failed: %s" % [@name, detail.to_s]
                 end
             end
         end
     end
 
     # What tests are available on this suite?
     def tests
         @tests.keys
     end
 end
 
 Suite.new :parser, "Manifest parsing" do
     newtest :parse, "Parsed files" do
         @parser = Puppet::Parser::Parser.new(:environment => Puppet[:environment])
         @parser.file = Puppet[:manifest]
         @parser.parse
     end
 end
 
 Suite.new :local_catalog, "Local catalog handling" do
     def prepare
         @node = Puppet::Node.find($options[:nodes][0])
     end
 
     newtest :compile, "Compiled catalog" do
         Puppet::Resource::Catalog.find(@node)
     end
 end
 
 Suite.new :resource_type, "Managing resource types" do
     newtest :find, "Find a type" do
         Puppet::Resource::Type.terminus_class = :parser
         ARGV.each do |name|
             json = Puppet::Resource::Type.find(name).to_pson
             data = PSON.parse(json)
             p Puppet::Resource::Type.from_pson(data)
         end
     end
 
     newtest :search_types, "Find all types" do
         Puppet::Resource::Type.terminus_class = :rest
         result = Puppet::Resource::Type.search("*")
         result.each { |r| p r }
     end
 
     newtest :restful_type, "Find a type and return it via REST" do
         Puppet::Resource::Type.terminus_class = :rest
         ARGV.each do |name|
             p Puppet::Resource::Type.find(name)
         end
     end
 end
 
 Suite.new :remote_catalog, "Remote catalog handling" do
     def prepare
         $args[:cache] = false
         # Create a config client and pull the config down
         @client = Puppet::Network::Client.master.new($args)
         unless @client.read_cert
             fail "Could not read client certificate"
         end
 
         if tmp = Puppet::Node::Facts.find($options[:nodes][0])
             @facts = tmp.values
         else
             raise "Could not find facts for %s" % $optins[:nodes][0]
         end
 
         if host = $options[:fqdn]
             @facts["fqdn"] = host
             @facts["hostname"] = host.sub(/\..+/, '')
             @facts["domain"] = host.sub(/^[^.]+\./, '')
         end
 
         @facts = YAML.dump(@facts)
     end
 
     newtest :getconfig, "Compiled catalog" do
         @client.driver.getconfig(@facts, "yaml")
     end
 
     # This test will always force a false answer.
     newtest :fresh, "Checked freshness" do
         @client.driver.freshness
     end
 end
 
 Suite.new :file, "File interactions" do
     def prepare
         unless $options[:file]
             fail "You must specify a file (using --file <file>) to interact with on the server"
         end
         @client = Puppet::Network::Client.file.new($args)
         unless @client.read_cert
             fail "Could not read client certificate"
         end
     end
 
     newtest :describe, "Described file" do
         @client.describe($options[:file], :ignore)
     end
 
     newtest :retrieve, "Retrieved file" do
         @client.retrieve($options[:file], :ignore)
     end
 end
 
 Suite.new :filebucket, "Filebucket interactions" do
     def prepare
         require 'tempfile'
         @client = Puppet::FileBucket::Dipper.new($args)
     end
 
     newtest :backup, "Backed up file" do
         Tempfile.open("bucket_testing") do |f|
             f.print rand(1024)
             f.close
             @client.backup(f.path)
         end
     end
 end
 
 # Note that this uses an env variable to determine how many resources per
 # host to create (with a default of 10).  'repeat' determines how
 # many hosts to create.  You probably will get mad failures if you
 # use forking and sqlite.
 # Here's an example run of this test, using sqlite:
 #   RESOURCE_COUNT=50 ext/puppet-test --suite rails --test storage --confdir /tmp/storagetesting --vardir /tmp/storagetesting --repeat 10
 Suite.new :rails, "Rails Interactions" do
     def prepare
         Puppet::Rails.init
         @facts = Facter.to_hash
 
         if num = ENV["RESOURCECOUNT"]
             @resources = Integer(num)
         else
             @resources = 10
         end
     end
 
     Resource = Puppet::Parser::Resource
 
     def execute(test, msg)
         begin
             send(test)
         rescue => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "%s failed: %s" % [@name, detail.to_s]
         end
     end
 
     def mkresource(type, title, parameters)
         source = "fakesource"
         res = Resource.new(:type => type, :title => title, :source => source, :scope => "fakescope")
 
         parameters.each do |param, value|
             res.set(param, value, source)
         end
         res
     end
 
     def ref(type, title)
         Resource::Reference.new(:type => type, :title => title)
     end
 
     newtest :storage, "Stored resources" do
         hostname = "host%s" % @count
         @facts["hostname"] = hostname
         args = {:facts => @facts, :name => hostname}
 
         # Make all of the resources we want.  Make them at least slightly complex,
         # so we model real resources as close as we can.
         resources = []
         args[:resources] = resources
         @resources.times do |resnum|
             exec = mkresource("exec", "exec%s" % resnum, :command => "/bin/echo do something %s" % resnum)
             exec.tags = %w{exec one} << "exec%s" % resnum
             user = mkresource("user", "user%s" % resnum, :uid => resnum.to_s, :require => ref("exec", "exec%s" % resnum))
             user.tags = %w{user one two} << "user%s" % resnum
             file = mkresource("file", "/tmp/file%s" % resnum, :owner => resnum.to_s, :require => [ref("exec", "exec%s" % resnum), ref("user", "user%s" % resnum)])
             file.tags = %w{file one three} << "file%s" % resnum
             file.exported = true
             resources << exec << user << file
         end
         Puppet::Rails::Host.store(args)
     end
 end
 
 Suite.new :report, "Reports interactions" do
     def prepare
         Puppet::Transaction::Report.terminus_class = :rest
     end
 
     newtest :empty, "send empty report" do
         report = Puppet::Transaction::Report.new
         report.time = Time.now
         report.save
     end
 
     newtest :fake, "send fake report" do
         report = Puppet::Transaction::Report.new
 
         resourcemetrics = {
             :total => 12,
             :out_of_sync => 20,
             :applied => 45,
             :skipped => 1,
             :restarted => 23,
             :failed_restarts => 1,
             :scheduled => 10
         }
         report.newmetric(:resources, resourcemetrics)
 
         timemetrics = {
             :resource1 => 10,
             :resource2 => 50,
             :resource3 => 40,
             :resource4 => 20,
         }
         report.newmetric(:times, timemetrics)
 
         report.newmetric(:changes,
             :total => 20
         )
 
         report.time = Time.now
         report.save
     end
 end
 
 
 $cmdargs = [
     [ "--compile",  "-c", GetoptLong::NO_ARGUMENT       ],
     [ "--describe",       GetoptLong::REQUIRED_ARGUMENT ],
     [ "--retrieve", "-R", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--fork",           GetoptLong::REQUIRED_ARGUMENT ],
     [ "--fqdn",     "-F", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--suite",    "-s", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--test",     "-t", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--pause",    "-p", GetoptLong::NO_ARGUMENT       ],
     [ "--repeat",   "-r", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--node",     "-n", GetoptLong::REQUIRED_ARGUMENT ],
     [ "--debug",    "-d", GetoptLong::NO_ARGUMENT       ],
     [ "--help",     "-h", GetoptLong::NO_ARGUMENT       ],
     [ "--list",     "-l", GetoptLong::NO_ARGUMENT       ],
     [ "--verbose",  "-v", GetoptLong::NO_ARGUMENT       ],
     [ "--version",  "-V", GetoptLong::NO_ARGUMENT       ],
 ]
 
 # Add all of the config parameters as valid $options.
 Puppet.settings.addargs($cmdargs)
 Puppet::Util::Log.newdestination(:console)
 
 Puppet::Node.terminus_class = :plain
 Puppet::Node.cache_class = :yaml
 Puppet::Node::Facts.terminus_class = :facter
 Puppet::Node::Facts.cache_class = :yaml
 
 result = GetoptLong.new(*$cmdargs)
 
 $args = {}
 
 $options = {:repeat => 1, :fork => 0, :pause => false, :nodes => []}
 
 begin
     explicit_waitforcert = false
     result.each { |opt,arg|
         case opt
             # First check to see if the argument is a valid configuration parameter;
             # if so, set it.
             when "--compile"
                 $options[:suite] = :configuration
                 $options[:test] = :compile
             when "--retrieve"
                 $options[:suite] = :file
                 $options[:test] = :retrieve
                 $options[:file] = arg
             when "--fork"
                 begin
                     $options[:fork] = Integer(arg)
                 rescue => detail
                     $stderr.puts "The argument to 'fork' must be an integer"
                     exit(14)
                 end
             when "--describe"
                 $options[:suite] = :file
                 $options[:test] = :describe
                 $options[:file] = arg
             when "--fqdn"
                 $options[:fqdn] = arg
             when "--repeat"
                 $options[:repeat] = Integer(arg)
             when "--help"
                 if Puppet.features.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
             when "--version"
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
                 Puppet::Util::Log.level = :info
                 Puppet::Util::Log.newdestination(:console)
             when "--debug"
                 Puppet::Util::Log.level = :debug
                 Puppet::Util::Log.newdestination(:console)
             when "--suite"
                 $options[:suite] = arg.intern
             when "--test"
                 $options[:test] = arg.intern
             when "--file"
                 $options[:file] = arg
             when "--pause"
                 $options[:pause] = true
             when "--node"
                 $options[:nodes] << arg
             when "--list"
                 Suite.suites.sort { |a,b| a.to_s <=> b.to_s }.each do |suite_name|
                     suite = Suite[suite_name]
                     tests = suite.tests.sort { |a,b| a.to_s <=> b.to_s }.join(", ")
                     puts "%20s: %s" % [suite_name, tests]
                 end
                 exit(0)
             else
                 Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts detail
     $stderr.puts "Try '#{$0} --help'"
     exit(1)
 end
 
 # Now parse the config
 Puppet.parse_config
 
 $options[:nodes] << Puppet.settings[:certname] if $options[:nodes].empty?
 
 $args[:Server] = Puppet[:server]
 
 unless $options[:test]
     $options[:suite] = :remote_catalog
     $options[:test] = :getconfig
 end
 
 unless $options[:test]
     raise "A suite was specified without a test"
 end
 
 $pids = []
 
 Suite.run($options[:test])
 
 if $options[:fork] > 0
     Process.waitall
 end
diff --git a/lib/puppet/util/command_line/filebucket b/lib/puppet/util/command_line/filebucket
index 8302d7b12..34b01508e 100755
--- a/lib/puppet/util/command_line/filebucket
+++ b/lib/puppet/util/command_line/filebucket
@@ -1,97 +1,97 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # A stand-alone Puppet filebucket client.
 #
 # = Usage
 #
 #   puppet filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
 #      [-l|--local] [-r|--remote]
 #      [-s|--server <server>] [-b|--bucket <directory>] <file> <file> ...
 #
 # = Description
 #
 # This is a stand-alone filebucket client for sending files to a local
 # or central filebucket.
 #
 # = Usage
 #
 # This client can operate in three modes, with only one mode per call:
 #
 # backup::
 #   Send one or more files to the specified file bucket.  Each sent file
 #   is printed with its resulting md5 sum.
 #
 # 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.
 #
 # 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.
 #
 # 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+.
 #
 # = Example
 #
 #   $ puppet filebucket backup /etc/passwd
 #   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
 #   $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
 #   $
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
 #
 # help::
 #   Print this help message
 #
 # local::
 #   Use the local filebucket.  This will use the default configuration
 #   information.
 #
 # remote::
 #   Use a remote filebucket.  This will use the default configuration
 #   information.
 #
 # server::
 #   The server to send the file to, instead of locally.
 #
 # verbose::
 #   Print extra information.
 #
 # version::
 #   Print version information.
 #
 # = Example
 #
 #   puppet filebucket -b /tmp/filebucket /my/file
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:filebucket].run
diff --git a/lib/puppet/util/command_line/pi b/lib/puppet/util/command_line/pi
index ae3c46e9a..3d80eea8f 100755
--- a/lib/puppet/util/command_line/pi
+++ b/lib/puppet/util/command_line/pi
@@ -1,48 +1,48 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Print help about puppet types on the console. Run with '-h' to get detailed
 # help.
 # = Usage
 #
 #   puppet describe [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta]
 #
 # = Description
 #
 # Prints details of Puppet types, providers and metaparameters on the console.
 #
 # = Options
 #
 # help::
 #   Print this help text
 #
 # providers::
 #   Describe providers in detail for each type
 #
 # list::
 #   List all types
 #
 # meta::
 #   List all metaparameters
 #
 # short::
 #   List only parameters without detail 
 #
 # = Example
 #
 #   puppet describe --list
 #   puppet describe file --providers
 #   puppet describe user -s -m
 #
 # = Author
 #
 # David Lutterkort
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:describe].run
diff --git a/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet
index 7b6c0ae7f..e75b92af8 100755
--- a/lib/puppet/util/command_line/puppet
+++ b/lib/puppet/util/command_line/puppet
@@ -1,69 +1,69 @@
 
 #
 # = Synopsis
 #
 # Run a stand-alone +puppet+ manifest.
 #
 # = Usage
 #
 #   puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] [-e|--execute]
 #               [--detailed-exitcodes] [-l|--logdest <file>] <file>
 #
 # = Description
 #
 # This is the standalone puppet execution tool; use it to execute
 # individual manifests that you write.  If you need to execute site-wide
 # manifests, use 'puppet agent' and 'puppet master'.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
 #
 # 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.
 #
 # help::
 #   Print this help message
 #
 # loadclasses::
 #   Load any stored classes. 'puppet agent' caches configured classes (usually at
 #   /etc/puppet/classes.txt), and setting this option causes all of those classes
 #   to be set in your puppet manifest.
 #
 # logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
 #
 # execute::
 #   Execute a specific piece of Puppet code
 #
 # verbose::
 #   Print extra information.
 #
 # = Example
 #
 #   puppet -l /tmp/manifest.log manifest.pp
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:apply].run
diff --git a/lib/puppet/util/command_line/puppetca b/lib/puppet/util/command_line/puppetca
index 4f1a88da5..9aa7e907c 100755
--- a/lib/puppet/util/command_line/puppetca
+++ b/lib/puppet/util/command_line/puppetca
@@ -1,110 +1,110 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Stand-alone certificate authority.  Capable of generating certificates
 # but mostly meant for signing certificate requests from puppet clients.
 #
 # = 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 DIGEST]
 #               [--fingerprint] [host]
 #
 # = Description
 #
 # 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.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://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'.
 #
 # all::
 #   Operate on all items.  Currently only makes sense with '--sign',
 #   '--clean', or '--list'.
 #
 # 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.
 #
 # 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 remains valid.
 #    If '--all' is specified then all host certificates, both signed and
 #    unsigned, will be removed.
 #
 # debug::
 #   Enable full debugging.
 #
 # generate::
 #   Generate a certificate for a named client.  A certificate/keypair will be
 #   generated for each client named on the command line.
 #
 # help::
 #   Print this help message
 #
 # 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).
 #
 # print::
 #   Print the full-text version of a host's certificate.
 #
 # fingerprint::
 #   Print the DIGEST (defaults to md5) fingerprint of a host's certificate.
 #
 # 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.
 #
 # sign::
 #   Sign an outstanding certificate request.  Unless '--all' is specified,
 #   hosts must be listed after all flags.
 #
 # verbose::
 #   Enable verbosity.
 #
 # version::
 #   Print the puppet version number and exit.
 #
 # verify::
 #   Verify the named certificate against the local CA certificate.
 #
 # = Example
 #
 #   $ puppet cert -l
 #   culain.madstop.com
 #   $ puppet cert -s culain.madstop.com
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:cert].run
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd
index 571b15486..cb8589c5f 100755
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@ -1,186 +1,186 @@
 #!/usr/bin/env ruby
 
 # == Synopsis
 #
 # Retrieve the client configuration from the puppet master and apply
 # it to the local host.
 #
 # Currently must be run out periodically, using cron or something similar.
 #
 # = Usage
 #
 #   puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
 #       [--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>]
 #
 # = 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.
 #
 # Once the client has a signed certificate, it will retrieve its configuration
 # and apply it.
 #
 # = 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
 # backgroun, attempt to get a signed certificate, and retrieve and apply its
 # configuration every 30 minutes.
 #
 # 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).
 #
 # +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.
 #
 # +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).
 # 
 #
 # = 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 an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet agent with
 # '--genconfig'.
 #
 # daemonize::
 #   Send the process into the background.  This is the default.
 #
 # no-daemonize::
 #   Do not send the process into the background.
 #
 # debug::
 #   Enable full debugging.
 #
 # 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.
 #
 # 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.
 #
 # 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.
 #
 #   +puppet agent+ uses the same lock file while it is running, so no more than one
 #   +puppet agent+ process is working at a time.
 #
 #   +puppet agent+ exits after executing this.
 #
 # 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).
 #
 #   +puppet agent+ exits after executing this.
 #
 # fqdn::
 #   Set the fully-qualified domain name of the client.  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.
 #
 # help::
 #   Print this help message
 #
 # logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to syslog, or the console if debugging or
 #   verbosity is enabled.
 #
 # 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 when used in conjunction with --listen.
 #
 # 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.
 #
 # fingerprint::
 #   Display the current certificate or certificate signing request fingerprint
 #   and then exit. Use the +--digest+ option to change the digest algorithm used.
 #
 # 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+.
 #
 # test::
 #   Enable the most common options used for testing.  These are +onetime+,
 #   +verbose+, +ignorecache, +no-daemonize+, and +no-usecacheonfailure+.
 #
 # 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.
 #
 # verbose::
 #   Turn on verbose reporting.
 #
 # version::
 #   Print the puppet version number and exit.
 #
 # 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.
 #
 # = Example
 #
 #   puppet agent --server puppet.domain.com
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:agent].run
diff --git a/lib/puppet/util/command_line/puppetdoc b/lib/puppet/util/command_line/puppetdoc
index 0fa1830d6..8f24ea5ef 100755
--- a/lib/puppet/util/command_line/puppetdoc
+++ b/lib/puppet/util/command_line/puppetdoc
@@ -1,67 +1,67 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
-# Generate a reference for all Puppet types.  Largely meant for internal Reductive
+# Generate a reference for all Puppet types.  Largely meant for internal Puppet
 # Labs use.
 #
 # = Usage
 #
 #   puppet doc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|rdoc>]
 #              [-r|--reference <[type]|configuration|..>] [--charset CHARSET] [manifest-file]
 #
 # = 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.
 #
 # 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.
 #
 # If the command is started with 'manifest-file' command-line arguments, puppet doc generate a single
 # manifest documentation that is output on stdout.
 #
 # = Options
 #
 # all::
 #   Output the docs for all of the reference types. In 'rdoc' modes, this also outputs documentation for all resources
 #
 # help::
 #   Print this help message
 #
 # outputdir::
 #   Specifies the directory where to output the rdoc documentation in 'rdoc' mode.
 #
 # mode::
 #   Determine the output mode.  Valid modes are 'text', 'trac', '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'
 #
 # reference::
 #   Build a particular reference.  Get a list of references by running +puppet doc --list+.
 #
 # charset::
 #   Used only in 'rdoc' mode. It sets the charset used in the html files produced.
 #
 # = Example
 #
 #   $ puppet doc -r type > /tmp/type_reference.rst
 # or
 #   $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
 # or
 #   $ puppet doc /etc/puppet/manifests/site.pp
 # or
 #   $ puppet doc -m pdf -r configuration
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:doc].run
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd
index 74efb3818..baf8a7581 100755
--- a/lib/puppet/util/command_line/puppetmasterd
+++ b/lib/puppet/util/command_line/puppetmasterd
@@ -1,65 +1,65 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # The central puppet server.  Functions as a certificate authority by default.
 #
 # = Usage
 #
 #   puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
 #       [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
 #
 # = Description
 #
 # This is the puppet central daemon.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetmasterdd with
 # '--genconfig'.
 #
 # daemonize::
 #   Send the process into the background.  This is the default.
 #
 # no-daemonize::
 #   Do not send the process into the background.
 #
 # debug::
 #   Enable full debugging.
 #
 # help::
 #   Print this help message.
 #
 # logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to syslog, or the console
 #   if debugging or verbosity is enabled.
 #
 # verbose::
 #   Enable verbosity.
 #
 # version::
 #   Print the puppet version number and exit.
 #
 # = Example
 #
 #   puppet master
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:master].run
diff --git a/lib/puppet/util/command_line/puppetqd b/lib/puppet/util/command_line/puppetqd
index 48fc952bd..81963d537 100755
--- a/lib/puppet/util/command_line/puppetqd
+++ b/lib/puppet/util/command_line/puppetqd
@@ -1,53 +1,53 @@
 #!/usr/bin/env ruby
 
 # == Synopsis
 #
 # Retrieve serialized records from a queue and process them in order.
 #
 # = Usage
 #
 #   puppet queue [-d|--debug] [-v|--verbose]
 #
 # = Description
 #
 # This is a simple application that just processes entities in a queue as they
 # are recieved.
 #
 # = 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 an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppetd with
 # '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
 #
 # help::
 #   Print this help message
 #
 # verbose::
 #   Turn on verbose reporting.
 #
 # version::
 #   Print the puppet version number and exit.
 #
 # = Example
 #
 #   puppet queue
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:queue].run
diff --git a/lib/puppet/util/command_line/puppetrun b/lib/puppet/util/command_line/puppetrun
index 27cd775b9..7eba3b2c4 100755
--- a/lib/puppet/util/command_line/puppetrun
+++ b/lib/puppet/util/command_line/puppetrun
@@ -1,126 +1,126 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Trigger a puppet agent run on a set of hosts.
 #
 # = Usage
 #
 #   puppet kick [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground]
 #       [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules]
 #       [-t|--tag <tag>] [--test] [-p|--ping] <host> [<host> [...]]
 #
 # = 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.
 #
 # If you are not storing your host configurations in LDAP, you can specify
 # hosts manually.
 #
 # You will most likely have to run +puppet kick+ as root to get access to
 # the SSL certificates.
 #
 # +puppet kick+ reads +puppet master+'s configuration file, so that it can copy
 # things like LDAP settings.
 #
 # = 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.
 #
 # An example file looks like this::
 #
 #     [fileserver]
 #         allow *.madstop.com
 #
 #     [puppetmaster]
 #         allow *.madstop.com
 #
 #     [puppetrunner]
 #         allow culain.madstop.com
 #
 # This is what you would install on your Puppet master; non-master hosts could
 # leave off the 'fileserver' and 'puppetmaster' namespaces.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://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'.
 #
 #
 # all::
 #   Connect to all available hosts.  Requires LDAP support at this point.
 #
 # class::
 #   Specify a class of machines to which to connect.  This only works if you
 #   have LDAP configured, at the moment.
 #
 # debug::
 #   Enable full debugging.
 #
 # 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.
 #
 # help::
 #   Print this help message
 #
 # host::
 #   A specific host to which to connect.  This flag can be specified more
 #   than once.
 #
 # 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.
 #
 # 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.
 #
 # tag::
 #   Specify a tag for selecting the objects to apply. Does not work with the
 #   --test option.
 #
 #
 # test::
 #   Print the hosts you would connect to but do not actually connect. This
 #   option requires LDAP support at this point.
 #
 # ping::
 #
 #   Do a ICMP echo against the target host. Skip hosts that don't respond to ping.
 #
 # = Example
 #
 #   sudo puppet kick -p 10 -t remotefile -t webserver host1 host2
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:kick].run
diff --git a/lib/puppet/util/command_line/ralsh b/lib/puppet/util/command_line/ralsh
index 83338fcbc..5c1f719e2 100755
--- a/lib/puppet/util/command_line/ralsh
+++ b/lib/puppet/util/command_line/ralsh
@@ -1,89 +1,89 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Use the Puppet RAL to directly interact with the system.
 #
 # = Usage
 #
 #   puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit]
 #                   [-H|--host <host>] [-p|--param <param>] [-t|--types]
 #                   type <name>
 #
 # = Description
 #
 # 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.
 #
 # 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.
 #
 # 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.
 #
 # = Options
 #
 # Note that any configuration parameter that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
 # http://docs.puppetlabs.com/references/stable/configuration.html for
 # the full list of acceptable parameters. A commented list of all
 # configuration options can also be generated by running puppet with
 # '--genconfig'.
 #
 # debug::
 #   Enable full debugging.
 #
 # 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.
 #
 # host:
 #   When specified, connect to the resource server on the named host
 #   and retrieve the list of resouces of the type specified.
 #
 # help:
 #   Print this help message.
 #
 # param:
 #   Add more parameters to be outputted from queries.
 #
 # types:
 #   List all available types.
 #
 # verbose:
 #   Print extra information.
 #
 # = Example
 #
 # This example uses `puppet resource` to return Puppet configuration for the user `luke`:
 #
 #      $ 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']
 #      }
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Copyright (c) 2005-2007 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 #Puppet::Application[:resource].run
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index 60a6eb28e..59afc2ed3 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -1,105 +1,105 @@
 .\" 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]
 .
 .IP "" 4
 .
 .nf
 
  [\-l|\-\-local] [\-r|\-\-remote]
  [\-s|\-\-server <server>] [\-b|\-\-bucket <directory>] <file> <file> \.\.\.
 .
 .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:
 .
 .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
 .
 .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
 .
 .P
 restore: Given a file path and an md5 sum, store the content associated
 .
 .IP "" 4
 .
 .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
 .
 .IP "" 0
 .
 .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\.
 .
 .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\.
 .
 .P
 help: Print this help message
 .
 .P
 local: Use the local filebucket\. This will use the default
 .
 .IP "" 4
 .
 .nf
 
      configuration information\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 remote: Use a remote filebucket\. This will use the default
 .
 .IP "" 4
 .
 .nf
 
      configuration information\.
 .
 .fi
 .
 .IP "" 0
 .
 .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 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index e8f5ab531..b70a128e7 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -1,17 +1,17 @@
 .\" 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
 .
 .P
 providers: Describe providers in detail for each type
 .
 .P
 list: List all types
 .
 .P
 meta: List all metaparameters
 .
 .P
-short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+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
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index 17369aa20..62fa7a5bf 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -1,169 +1,169 @@
 .\" 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]
 .
 .IP "" 4
 .
 .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
 .
 .IP "" 4
 .
 .nf
 
          \'\-\-sign\', \'\-\-clean\', or \'\-\-list\'\.
 .
 .fi
 .
 .IP "" 0
 .
 .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
 .
 .IP "" 0
 .
 .P
 clean: Remove all files related to a host from puppet cert\'s
 .
 .IP "" 4
 .
 .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\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 debug: Enable full debugging\.
 .
 .P
 generate: Generate a certificate for a named client\. A
 .
 .IP "" 4
 .
 .nf
 
          certificate/keypair will be generated for each client named
          on the command line\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 help: Print this help message
 .
 .P
 list: List outstanding certificate requests\. If \'\-\-all\' is
 .
 .IP "" 4
 .
 .nf
 
          specified, signed certificates are also listed, prefixed by
          \'+\', and revoked or invalid certificates are prefixed by
          \'\-\' (the verification outcome is printed in parenthesis)\.
 .
 .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
 .
 .IP "" 0
-$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index 32aede791..861137553 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -1,283 +1,283 @@
 .\" 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]
 .
 .IP "" 4
 .
 .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\.
 .
 .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
 .
 .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
 .
 .IP "" 0
 .
 .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
 .
 .IP "" 0
 .
 .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\.
 .
 .P
 +puppet agent+ exits after executing this\.
 .
 .P
 enable: Enable working on the local system\. This removes any
 .
 .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
 .
 .P
 +puppet agent+ exits after executing this\.
 .
 .P
 fqdn: Set the fully\-qualified domain name of the client\.
 .
 .IP "" 4
 .
 .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\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 help: Print this help message
 .
 .P
 logdest: Where to send messages\. Choose between syslog, the
 .
 .IP "" 4
 .
 .nf
 
                 console, and a log file\. Defaults to sending
                 messages to syslog, or the console if debugging or
                 verbosity is enabled\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 no\-client: Do not create a config client\. This will cause the
 .
 .IP "" 4
 .
 .nf
 
                 daemon to run without ever checking for its
                 configuration automatically, and only makes sense
                 when used in conjunction with \-\-listen\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 onetime: Run the configuration once\. Runs a single (normally
 .
 .IP "" 4
 .
 .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
 .
 .IP "" 4
 .
 .nf
 
                 signing request fingerprint and then exit\. Use the
                 +\-\-digest+ option to change the digest algorithm
                 used\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 serve: Start another type of server\. By default, +puppet
 .
 .IP "" 4
 .
 .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+\.
 .
 .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
 .
 .IP "" 0
-puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU Public License
+puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (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 5fc01c2ba..47df0e764 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -1,108 +1,108 @@
 .\" 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 Reductive Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
+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]
 .
 .IP "" 4
 .
 .nf
 
          [\-r|\-\-reference <[type]|configuration|\.\.>] [\-\-charset CHARSET] [manifest\-file]
 .
 .fi
 .
 .IP "" 0
 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\'
 .
 .IP "" 4
 .
 .nf
 
        modes, this also outputs documentation for all resources
 .
 .fi
 .
 .IP "" 0
 .
 .P
 help: Print this help message
 .
 .P
 outputdir: Specifies the directory where to output the rdoc
 .
 .IP "" 4
 .
 .nf
 
        documentation in \'rdoc\' mode\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 mode: Determine the output mode\. Valid modes are \'text\', \'trac\',
 .
 .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\'
 .
 .fi
 .
 .IP "" 0
 .
 .P
 reference: Build a particular reference\. Get a list of references by
 .
 .IP "" 4
 .
 .nf
 
        running +puppet doc \-\-list+\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 charset: Used only in \'rdoc\' mode\. It sets the charset used in the
 .
 .IP "" 4
 .
 .nf
 
        html files produced\.
 .
 .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
 .
 .P
 or
 .
 .P
-$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (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 3ae567a69..dde93a3d6 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -1,52 +1,52 @@
 .\" 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]
 .
 .IP "" 4
 .
 .nf
 
   [\-l|\-\-logdest <file>|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version]
 .
 .fi
 .
 .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\.
 .
 .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\'\.
 .
 .P
 daemonize: Send the process into the background\. This is the default\.
 .
 .P
 no\-daemonize: Do not send the process into the background\.
 .
 .P
 debug: Enable full debugging\.
 .
 .P
 help: Print this help message\.
 .
 .P
 logdest: Where to send messages\. Choose between syslog, the
 .
 .IP "" 4
 .
 .nf
 
           console, and a log file\. Defaults to sending messages to
           syslog, or the console if debugging or verbosity is
           enabled\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 verbose: Enable verbosity\.
 .
 .P
-version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index 137a13af3..f630c74a5 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -1,20 +1,20 @@
 .\" 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\.
 .
 .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\'\.
 .
 .P
 debug: Enable full debugging\.
 .
 .P
 help: Print this help message
 .
 .P
 verbose: Turn on verbose reporting\.
 .
 .P
-version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index b3c27c3a7..09fa31b15 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -1,173 +1,173 @@
 .\" 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]
 .
 .IP "" 4
 .
 .nf
 
   [\-h|\-\-help] [\-\-host <host>] [\-\-no\-fqdn] [\-\-ignoreschedules]
   [\-t|\-\-tag <tag>] [\-\-test] [\-p|\-\-ping] <host> [<host> [\.\.\.]]
 .
 .fi
 .
 .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\.
 .
 .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\.
 .
 .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\.
 .
 .P
 An example file looks like this::
 .
 .IP "" 4
 .
 .nf
 
 [fileserver]
     allow *\.madstop\.com
 
 [puppetmaster]
     allow *\.madstop\.com
 
 [puppetrunner]
     allow culain\.madstop\.com
 .
 .fi
 .
 .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
 .
 .P
 host: A specific host to which to connect\. This flag can be
 .
 .IP "" 4
 .
 .nf
 
              specified more than once\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 ignoreschedules: Whether the client should ignore schedules when running
 .
 .IP "" 4
 .
 .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\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 parallel: How parallel to make the connections\. Parallelization
 .
 .IP "" 4
 .
 .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
 .
 .nf
 
              not work with the \-\-test option\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
 test: Print the hosts you would connect to but do not
 .
 .IP "" 4
 .
 .nf
 
              actually connect\. This option requires LDAP support at
              this point\.
 .
 .fi
 .
 .IP "" 0
 .
 .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 Reductive Labs, LLC Licensed under the GNU Public License
+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
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index e387e2324..bdc81e90a 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -1,85 +1,85 @@
 .\" 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]
 .
 .IP "" 4
 .
 .nf
 
               [\-H|\-\-host <host>] [\-p|\-\-param <param>] [\-t|\-\-types]
               type <name>
 .
 .fi
 .
 .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\.
 .
 .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\.
 .
 .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\.
 .
 .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\.
 .
 .P
 edit:
 .
 .P
 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
 When specified, connect to the resource server on the named host and retrieve the list of resouces of the type specified\.
 .
 .P
 help:
 .
 .P
 Print this help message\.
 .
 .P
 param:
 .
 .P
 Add more parameters to be outputted from queries\.
 .
 .P
 types:
 .
 .P
 List all available types\.
 .
 .P
 verbose:
 .
 .P
 Print extra information\.This example uses \fBpuppet resource\fR to return 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\']
  }
 .
 .fi
 .
 .IP "" 0
-Luke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+Luke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/test/test b/test/test
index 097885751..c8b9b08ef 100755
--- a/test/test
+++ b/test/test
@@ -1,241 +1,241 @@
 #!/usr/bin/env ruby
 
 #
 # = Synopsis
 #
 # Run unit tests, usually with the goal of resolving some conflict
 # between tests.
 #
 # = Usage
 #
 #   test [-d|--debug] [-f|--files] [-h|--help] [-n method] [-v|--verbose] <file> [file] ...
 #
 # = Description
 #
 # This script is useful for running a specific subset of unit tests, especially
 # when attempting to find a conflict between tests.  By default, it will take
 # the first argument you pass it and run that test or test directory with each
 # test directory in turn, looking for a failure.  If any tests fail, then
 # the script will drill into that test directory, looking for the specific conflict.
 #
 # In this way, when you have deduced you have two conflicting unit tests (tests which
 # pass in isolation but fail when run together), you can tell this script where
 # the failure is and leave it alone to find the conflict.
 #
 # This script is different from the Rakefile because it will run all tests in
 # a single process, whereas if you ask the Rakefile to run multiple tests, it will
 # run them in separate processes thus making it impossible to find conflicts.
 #
 # = Examples
 #
 # Attempt to resolve a conflict between a single test suite that could be anywhere:
 #
 #   ./test ral/providers/user.rb
 #
 # Determine whether two individual files conflict:
 #
 #   ./test --files language/functions.rb ral/providers/provider.rb
 #
 # Run the same test, but only run a specific unit test:
 #
 #   ./test -d -n test_search --files language/functions.rb ral/providers/provider.rb
 #
 # = Options
 #
 # debug::
 #   Enable full debugging.
 #
 # files::
 #   Specify exactly which files to test.
 #
 # help::
 #   Print this help message
 #
 # n::
 #   Specify a single unit test to run.  You can still specify as many files
 #   as you want.
 #
 # verbose::
 #   Print extra information.
 #
 # = Example
 #
 #   puppet -l /tmp/script.log script.pp
 #
 # = Author
 #
 # Luke Kanies
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'find'
 require 'getoptlong'
 include Find
 
 result = GetoptLong.new(
     [ "--debug",    "-d", GetoptLong::NO_ARGUMENT       ],
     [ "--verbose",  "-v", GetoptLong::NO_ARGUMENT       ],
     [ "-n",               GetoptLong::REQUIRED_ARGUMENT ],
     [ "--files",    "-f", GetoptLong::NO_ARGUMENT       ],
     [ "--help",     "-h", GetoptLong::NO_ARGUMENT       ]
 )
 
 usage = "USAGE: %s [--help] suite" % $0
 
 $options = {}
 keep = []
 
 result.each { |opt,arg|
     case opt
     when "--verbose"
         $options[:verbose] = true
     when "--files"
         $options[:files] = true
     when "--debug"
         $options[:debug] = true
         $options[:verbose] = true
     when "--help"
         puts usage
         exit
     else
         keep << opt
         keep << arg if arg
     end
 }
 
 def dirs
     Dir.glob("*").find_all { |d| FileTest.directory?(d) }.reject { |d|
         ["lib", "data"].include?(d)
     }
 end
 
 def rake(*args)
     print "trying %s..." % args.join(" ")
     output = %x{rake %s} % args.join(" ")
 
     if $?.exitstatus == 0
         puts "succeeded"
         return true
     else
         puts "failed"
         return false
     end
 end
 
 def resolve(dir)
     dirs = dirs()
 
     # If the passed dir is a subdir or file, put the basedir last
     if dir.include?(File::SEPARATOR)
         basedir = dir.split(File::SEPARATOR)[0]
         if dirs.include?(basedir)
             dirs.delete(basedir)
             dirs << basedir
         end
     end
 
     failed = nil
     dirs.each do |d|
         next if d == dir
         unless run([d, dir])
             failed = d
             break
         end
     end
     puts "%s failed" % failed
 
     files = ruby_files(failed)
 
     files.each do |file|
         unless run([file, dir])
             puts file
             exit(0)
         end
     end
 
     exit(1)
 end
 
 def ruby_files(dir)
     files = []
     # First collect the entire file list.
     begin
         find(dir) { |f| files << f if f =~ /\.rb$/ }
     rescue => detail
         puts "could not find on %s: %s" % [dir.inspect, detail]
     end
     files
 end
 
 def run(files, flags = nil)
     args = %w{ruby}
     args << "-Ilib:../lib"
     args << "lib/rake/puppet_test_loader.rb"
     if flags
         args += flags
     end
     args += ARGV
 
     print files.join(" ") + "... "
     $stdout.flush
 
     files.each do |file|
         case File.stat(file).ftype
         when "file"; args << file
         when "directory"; args += ruby_files(file)
         else
             $stderr.puts "Skipping %s; can't handle %s" %
                 [file, File.stat(file).ftype]
         end
     end
     args = args.join(" ")
     if $options[:verbose]
         p args
     end
     output = %x{#{args} 2>&1}
     if $options[:debug]
         print output
     end
 
     if $?.exitstatus == 0
         puts "succeeded"
         return true
     else
         puts "failed"
         puts output
         return false
     end
 end
 
 if $options[:files]
     run(ARGV, keep)
 else
     dir = ARGV.shift
 
     unless dir
         $stderr.puts usage
         exit(1)
     end
     resolve(dir)
 end
 #
 #
 #files = []
 #
 #args.each do |test|
 #    if FileTest.directory?(test)
 #        files += ruby_files(test)
 #    end
 #end
 
 ## Now load all of our files.
 #files.each do |file|
 #    load file unless file =~ /^-/
 #end
 #
 #runner = Test::Unit::AutoRunner.new(false)
 #runner.process_args
 #runner.run