diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index 317a61436..fc8616817 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -1,477 +1,481 @@
 require 'puppet/application'
 
 class Puppet::Application::Agent < Puppet::Application
 
   should_parse_config
   run_mode :agent
 
   attr_accessor :args, :agent, :daemon, :host
 
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     Signal.trap(:INT) do
       $stderr.puts "Cancelling startup"
       exit(0)
     end
 
     {
       :waitforcert => nil,
       :detailed_exitcodes => false,
       :verbose => false,
       :debug => false,
       :centrallogs => false,
       :setdest => false,
       :enable => false,
       :disable => false,
       :client => true,
       :fqdn => nil,
       :serve => [],
       :digest => :MD5,
       :fingerprint => false,
     }.each do |opt,val|
       options[opt] = val
     end
 
     @args = {}
     require 'puppet/daemon'
     @daemon = Puppet::Daemon.new
     @daemon.argv = ARGV.dup
   end
 
   option("--centrallogging")
   option("--disable")
   option("--enable")
   option("--debug","-d")
   option("--fqdn FQDN","-f")
   option("--test","-t")
   option("--verbose","-v")
 
   option("--fingerprint")
   option("--digest DIGEST")
 
   option("--serve HANDLER", "-s") do |arg|
     if Puppet::Network::Handler.handler(arg)
       options[:serve] << arg.to_sym
     else
       raise "Could not find handler for #{arg}"
     end
   end
 
   option("--no-client") do |arg|
     options[:client] = false
   end
 
   option("--detailed-exitcodes") do |arg|
     options[:detailed_exitcodes] = true
   end
 
   option("--logdest DEST", "-l DEST") do |arg|
     begin
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
       puts detail.backtrace if Puppet[:debug]
       $stderr.puts detail.to_s
     end
   end
 
   option("--waitforcert WAITFORCERT", "-w") do |arg|
     options[:waitforcert] = arg.to_i
   end
 
   option("--port PORT","-p") do |arg|
     @args[:Port] = arg
   end
 
   def help
     <<-HELP
 
 puppet-agent(8) -- The puppet agent daemon
 ========
 
 SYNOPSIS
 --------
 Retrieves the client configuration from the puppet master and applies it to
 the local host.
 
 This service may be run as a daemon, run periodically using cron (or something
 similar), or run interactively for testing purposes.
 
 
 USAGE
 -----
 puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
   [--detailed-exitcodes] [--disable] [--enable] [-h|--help]
   [--certname <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 background, 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.
 
 * --certname:
   Set the certname (unique ID) of the client. The master reads this
   unique identifying string, which is usually set to the node's
   fully-qualified domain name, to determine which configurations the
   node will receive. Use this option to debug setup problems or
   implement unusual node identification schemes.
 
 * --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
 
 * --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', 'no-usecacheonfailure',
   'detailed-exit-codes', 'no-splay', and 'show_diff'.
 
 * --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) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     HELP
   end
 
   def run_command
     return fingerprint if options[:fingerprint]
     return onetime if Puppet[:onetime]
     main
   end
 
   def fingerprint
     unless cert = host.certificate || host.certificate_request
       $stderr.puts "Fingerprint asked but no certificate nor certificate request have yet been issued"
       exit(1)
       return
     end
     unless fingerprint = cert.fingerprint(options[:digest])
       raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'"
     end
     Puppet.notice fingerprint
   end
 
   def onetime
     unless options[:client]
       $stderr.puts "onetime is specified but there is no client"
       exit(43)
       return
     end
 
     @daemon.set_signal_traps
 
     begin
       report = @agent.run
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       Puppet.err detail.to_s
     end
 
     if not report
       exit(1)
     elsif options[:detailed_exitcodes] then
       exit(report.exit_status)
     else
       exit(0)
     end
   end
 
   def main
     Puppet.notice "Starting Puppet client version #{Puppet.version}"
 
     @daemon.start
   end
 
   # Enable all of the most common test options.
   def setup_test
     Puppet.settings.handlearg("--ignorecache")
     Puppet.settings.handlearg("--no-usecacheonfailure")
     Puppet.settings.handlearg("--no-splay")
     Puppet.settings.handlearg("--show_diff")
     Puppet.settings.handlearg("--no-daemonize")
     options[:verbose] = true
     Puppet[:onetime] = true
     options[:detailed_exitcodes] = true
   end
 
   # Handle the logging settings.
   def setup_logs
     if options[:debug] or options[:verbose]
       Puppet::Util::Log.newdestination(:console)
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
     end
 
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
   def enable_disable_client(agent)
     if options[:enable]
       agent.enable
     elsif options[:disable]
       agent.disable
     end
     exit(0)
   end
 
   def setup_listen
     unless FileTest.exists?(Puppet[:authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}"
       exit(14)
     end
 
     handlers = nil
 
     if options[:serve].empty?
       handlers = [:Runner]
     else
       handlers = options[:serve]
     end
 
     require 'puppet/network/server'
     # No REST handlers yet.
     server = Puppet::Network::Server.new(:xmlrpc_handlers => handlers, :port => Puppet[:puppetport])
 
     @daemon.server = server
   end
 
   def setup_host
     @host = Puppet::SSL::Host.new
     waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : 120)
     cert = @host.wait_for_cert(waitforcert) unless options[:fingerprint]
   end
 
   def setup
     setup_test if options[:test]
 
     setup_logs
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     # If noop is set, then also enable diffs
     Puppet[:show_diff] = true if Puppet[:noop]
 
     args[:Server] = Puppet[:server]
     if options[:fqdn]
       args[:FQDN] = options[:fqdn]
       Puppet[:certname] = options[:fqdn]
     end
 
     if options[:centrallogs]
       logdest = args[:Server]
 
       logdest += ":" + args[:Port] if args.include?(:Port)
       Puppet::Util::Log.newdestination(logdest)
     end
 
     Puppet.settings.use :main, :agent, :ssl
 
+    # Always ignoreimport for agent. It really shouldn't even try to import,
+    # but this is just a temporary band-aid.
+    Puppet[:ignoreimport] = true
+
     # We need to specify a ca location for all of the SSL-related i
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.
     Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 
     # Override the default; puppetd needs this, usually.
     # You can still override this on the command-line with, e.g., :compiler.
     Puppet[:catalog_terminus] = :rest
 
     # Override the default.
     Puppet[:facts_terminus] = :facter
 
     Puppet::Resource::Catalog.indirection.cache_class = :yaml
 
     # We need tomake the client either way, we just don't start it
     # if --no-client is set.
     require 'puppet/agent'
     require 'puppet/configurer'
     @agent = Puppet::Agent.new(Puppet::Configurer)
 
     enable_disable_client(@agent) if options[:enable] or options[:disable]
 
     @daemon.agent = agent if options[:client]
 
     # It'd be nice to daemonize later, but we have to daemonize before the
     # waitforcert happens.
     @daemon.daemonize if Puppet[:daemonize]
 
     setup_host
 
     @objects = []
 
     # This has to go after the certs are dealt with.
     if Puppet[:listen]
       unless Puppet[:onetime]
         setup_listen
       else
         Puppet.notice "Ignoring --listen on onetime run"
       end
     end
   end
 end
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index a63c2ddae..5779e799c 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -1,248 +1,243 @@
 require 'puppet/application'
 
 class Puppet::Application::Apply < Puppet::Application
 
   should_parse_config
 
   option("--debug","-d")
   option("--execute EXECUTE","-e") do |arg|
     options[:code] = arg
   end
   option("--loadclasses","-L")
   option("--verbose","-v")
   option("--use-nodes")
   option("--detailed-exitcodes")
 
   option("--apply catalog",  "-a catalog") do |arg|
     options[:catalog] = arg
   end
 
   option("--logdest LOGDEST", "-l") do |arg|
     begin
       Puppet::Util::Log.newdestination(arg)
       options[:logset] = true
     rescue => detail
       $stderr.puts detail.to_s
     end
   end
 
   option("--parseonly") do
     puts "--parseonly has been removed. Please use 'puppet parser validate <manifest>'"
     exit 1
   end
 
-  option("--ignoreimport") do
-    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
-    exit 1
-  end
-
   def help
     <<-HELP
 
 puppet-apply(8) -- Apply Puppet manifests locally
 ========
 
 SYNOPSIS
 --------
 Applies a standalone Puppet manifest to the local system.
 
 
 USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
   [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>]
   [--apply <catalog>] <file>
 
 
 DESCRIPTION
 -----------
 This is the standalone puppet execution tool; use it to apply
 individual manifests.
 
 When provided with a modulepath, via command line or config file, puppet
 apply can effectively mimic the catalog that would be served by puppet
 master with access to the same modules, although there are some subtle
 differences. When combined with scheduling and an automated system for
 pushing manifests, this can be used to implement a serverless Puppet
 site.
 
 Most users should use 'puppet agent' and 'puppet master' for site-wide
 manifests.
 
 
 OPTIONS
 -------
 Note that any configuration parameter that's valid in the configuration
 file is also a valid long argument. For example, 'modulepath' is a
 valid configuration parameter, so you can specify '--tags <class>,<tag>'
 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.
 
 * --apply:
   Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
   either specify a JSON file or pipe in JSON from standard input.
 
 
 EXAMPLE
 -------
     $ puppet apply -l /tmp/manifest.log manifest.pp
     $ puppet apply --modulepath=/root/dev/modules -e "include ntpd::server"
 
 
 AUTHOR
 ------
 Luke Kanies
 
 
 COPYRIGHT
 ---------
 Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     HELP
   end
 
   def run_command
     if options[:catalog]
       apply
     else
       main
     end
   end
 
   def apply
     if options[:catalog] == "-"
       text = $stdin.read
     else
       text = File.read(options[:catalog])
     end
 
     begin
       catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
       catalog = Puppet::Resource::Catalog.pson_create(catalog) unless catalog.is_a?(Puppet::Resource::Catalog)
     rescue => detail
       raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}"
     end
 
     catalog = catalog.to_ral
 
     require 'puppet/configurer'
     configurer = Puppet::Configurer.new
     configurer.run :catalog => catalog
   end
 
   def main
     # Set our code or file to use.
     if options[:code] or command_line.args.length == 0
       Puppet[:code] = options[:code] || STDIN.read
     else
       manifest = command_line.args.shift
       raise "Could not find file #{manifest}" unless File.exist?(manifest)
       Puppet.warning("Only one file can be applied per run.  Skipping #{command_line.args.join(', ')}") if command_line.args.size > 0
       Puppet[:manifest] = manifest
     end
 
     # Collect our facts.
     unless facts = Puppet::Node::Facts.indirection.find(Puppet[:certname])
       raise "Could not find facts for #{Puppet[:certname]}"
     end
 
     # Find our Node
     unless node = Puppet::Node.indirection.find(Puppet[:certname])
       raise "Could not find node #{Puppet[:certname]}"
     end
 
     # Merge in the facts.
     node.merge(facts.values)
 
     # Allow users to load the classes that puppet agent creates.
     if options[:loadclasses]
       file = Puppet[:classfile]
       if FileTest.exists?(file)
         unless FileTest.readable?(file)
           $stderr.puts "#{file} is not readable"
           exit(63)
         end
         node.classes = File.read(file).split(/[\s\n]+/)
       end
     end
 
     begin
       # Compile our catalog
       starttime = Time.now
       catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
 
       # Translate it to a RAL catalog
       catalog = catalog.to_ral
 
       catalog.finalize
 
       catalog.retrieval_duration = Time.now - starttime
 
       require 'puppet/configurer'
       configurer = Puppet::Configurer.new
       report = configurer.run(:skip_plugin_download => true, :catalog => catalog)
 
       exit( options[:detailed_exitcodes] ? report.exit_status : 0 )
     rescue => detail
       puts detail.backtrace if Puppet[:trace]
       $stderr.puts detail.message
       exit(1)
     end
   end
 
   def setup
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     # If noop is set, then also enable diffs
     Puppet[:show_diff] = true if Puppet[:noop]
 
     Puppet::Util::Log.newdestination(:console) unless options[:logset]
     client = nil
     server = nil
 
     Signal.trap(:INT) do
       $stderr.puts "Exiting"
       exit(1)
     end
 
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 
     if options[:debug]
       Puppet::Util::Log.level = :debug
     elsif options[:verbose]
       Puppet::Util::Log.level = :info
     end
   end
 end
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 924e671fb..a90829ae0 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -1,236 +1,231 @@
 require 'puppet/application'
 
 class Puppet::Application::Master < Puppet::Application
 
   should_parse_config
   run_mode :master
 
   option("--debug", "-d")
   option("--verbose", "-v")
 
   # internal option, only to be used by ext/rack/config.ru
   option("--rack")
 
   option("--compile host",  "-c host") do |arg|
     options[:node] = arg
   end
 
   option("--logdest DEST",  "-l DEST") do |arg|
     begin
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
       puts detail.backtrace if Puppet[:debug]
       $stderr.puts detail.to_s
     end
   end
 
   option("--parseonly") do
     puts "--parseonly has been removed. Please use 'puppet parser validate <manifest>'"
     exit 1
   end
 
-  option("--ignoreimport") do
-    puts "--ignoreimport has been removed. Please use 'puppet parser validate <manifest>'"
-    exit 1
-  end
-
   def help
     <<-HELP
 
 puppet-master(8) -- The puppet master daemon
 ========
 
 SYNOPSIS
 --------
 The central puppet server. Functions as a certificate authority by
 default.
 
 
 USAGE
 -----
 puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
   [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
   [--compile <node-name>]
 
 
 DESCRIPTION
 -----------
 This command starts an instance of puppet master, running as a daemon
 and using Ruby's built-in Webrick webserver. Puppet master can also be
 managed by other application servers; when this is the case, this
 executable is not used.
 
 
 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 master
 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.
 
 * --compile:
   Compile a catalogue and output it in JSON from the puppet master. Uses
   facts contained in the $vardir/yaml/ directory to compile the catalog.
 
 
 EXAMPLE
 -------
   puppet master
 
 
 AUTHOR
 ------
 Luke Kanies
 
 
 COPYRIGHT
 ---------
 Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     HELP
   end
 
   def preinit
     Signal.trap(:INT) do
       $stderr.puts "Cancelling startup"
       exit(0)
     end
 
     # Create this first-off, so we have ARGV
     require 'puppet/daemon'
     @daemon = Puppet::Daemon.new
     @daemon.argv = ARGV.dup
   end
 
   def run_command
     if options[:node]
       compile
     else
       main
     end
   end
 
   def compile
     Puppet::Util::Log.newdestination :console
     raise ArgumentError, "Cannot render compiled catalogs without pson support" unless Puppet.features.pson?
     begin
       unless catalog = Puppet::Resource::Catalog.indirection.find(options[:node])
         raise "Could not compile catalog for #{options[:node]}"
       end
 
       jj catalog.to_resource
     rescue => detail
       $stderr.puts detail
       exit(30)
     end
     exit(0)
   end
 
   def main
     require 'etc'
     require 'puppet/file_serving/content'
     require 'puppet/file_serving/metadata'
 
     xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket]
 
     xmlrpc_handlers << :CA if Puppet[:ca]
 
     # Make sure we've got a localhost ssl cert
     Puppet::SSL::Host.localhost
 
     # And now configure our server to *only* hit the CA for data, because that's
     # all it will have write access to.
     Puppet::SSL::Host.ca_location = :only if Puppet::SSL::CertificateAuthority.ca?
 
     if Puppet.features.root?
       begin
         Puppet::Util.chuser
       rescue => detail
         puts detail.backtrace if Puppet[:trace]
         $stderr.puts "Could not change user to #{Puppet[:user]}: #{detail}"
         exit(39)
       end
     end
 
     unless options[:rack]
       require 'puppet/network/server'
       @daemon.server = Puppet::Network::Server.new(:xmlrpc_handlers => xmlrpc_handlers)
       @daemon.daemonize if Puppet[:daemonize]
     else
       require 'puppet/network/http/rack'
       @app = Puppet::Network::HTTP::Rack.new(:xmlrpc_handlers => xmlrpc_handlers, :protocols => [:rest, :xmlrpc])
     end
 
     Puppet.notice "Starting Puppet master version #{Puppet.version}"
 
     unless options[:rack]
       @daemon.start
     else
       return @app
     end
   end
 
   def setup
     # Handle the logging settings.
     if options[:debug] or options[:verbose]
       if options[:debug]
         Puppet::Util::Log.level = :debug
       else
         Puppet::Util::Log.level = :info
       end
 
       unless Puppet[:daemonize] or options[:rack]
         Puppet::Util::Log.newdestination(:console)
         options[:setdest] = true
       end
     end
 
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     Puppet.settings.use :main, :master, :ssl, :metrics
 
     # Cache our nodes in yaml.  Currently not configurable.
     Puppet::Node.indirection.cache_class = :yaml
 
     # Configure all of the SSL stuff.
     if Puppet::SSL::CertificateAuthority.ca?
       Puppet::SSL::Host.ca_location = :local
       Puppet.settings.use :ca
       Puppet::SSL::CertificateAuthority.instance
     else
       Puppet::SSL::Host.ca_location = :none
     end
   end
 end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 47e625815..680762b94 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1,829 +1,832 @@
 # The majority of the system configuration parameters are set in this file.
 module Puppet
   setdefaults(:main,
     :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process
     is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it's running as any other user,
     it defaults to being in the user's home directory."],
     :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this parameter is calculated specially, like `confdir`_."],
     :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
       default is essentially $0 without the path or `.rb`."],
     :run_mode => [Puppet.run_mode.name.to_s, "The effective 'run mode' of the application: master, agent, or user."]
   )
 
   setdefaults(:main, :logdir => Puppet.run_mode.logopts)
 
   setdefaults(:main,
     :trace => [false, "Whether to print stack traces on some errors"],
     :autoflush => {
       :default => false,
       :desc    => "Whether log files should always flush to disk.",
       :hook    => proc { |value| Log.autoflush = value }
     },
     :syslogfacility => ["daemon", "What syslog facility to use when logging to
       syslog.  Syslog has a fixed list of valid facilities, and you must
       choose one of those; you cannot just make one up."],
     :statedir => { :default => "$vardir/state",
       :mode => 01755,
       :desc => "The directory where Puppet state is stored.  Generally,
         this directory can be removed without causing harm (although it
         might result in spurious service restarts)."
     },
     :rundir => {
       :default => Puppet.run_mode.run_dir,
       :mode => 01777,
       :desc => "Where Puppet PID files are kept."
     },
     :genconfig => [false,
       "Whether to just print a configuration to stdout and exit.  Only makes
       sense when used interactively.  Takes into account arguments specified
       on the CLI."],
     :genmanifest => [false,
       "Whether to just print a manifest to stdout and exit.  Only makes
       sense when used interactively.  Takes into account arguments specified
       on the CLI."],
     :configprint => ["",
       "Print the value of a specific configuration parameter.  If a
       parameter is provided for this, then the value is printed and puppet
       exits.  Comma-separate multiple values.  For a list of all values,
       specify 'all'.  This feature is only available in Puppet versions
       higher than 0.18.4."],
     :color => ["ansi", "Whether to use colors when logging to the console.
       Valid values are `ansi` (equivalent to `true`), `html` (mostly
       used during testing with TextMate), and `false`, which produces
       no color."],
     :mkusers => [false,
       "Whether to create the necessary user and group that puppet agent will
       run as."],
     :manage_internal_file_permissions => [true,
       "Whether Puppet should manage the owner, group, and mode of files
       it uses internally"
       ],
     :onetime => {:default => false,
       :desc => "Run the configuration once, rather than as a long-running
       daemon. This is useful for interactively running puppetd.",
       :short => 'o'
       },
     :path => {:default => "none",
       :desc => "The shell search path.  Defaults to whatever is inherited
         from the parent process.",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         ENV["PATH"] = "" if ENV["PATH"].nil?
         ENV["PATH"] = value unless value == "none"
         paths = ENV["PATH"].split(File::PATH_SEPARATOR)
         %w{/usr/sbin /sbin}.each do |path|
           ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
         end
         value
       end
     },
     :libdir => {:default => "$vardir/lib",
       :desc => "An extra search path for Puppet.  This is only useful
         for those files that Puppet will load on demand, and is only
         guaranteed to work for those cases.  In fact, the autoload
         mechanism is responsible for making sure this directory
         is in Ruby's search path",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         $LOAD_PATH.delete(@oldlibdir) if defined?(@oldlibdir) and $LOAD_PATH.include?(@oldlibdir)
         @oldlibdir = value
         $LOAD_PATH << value
       end
     },
+    :ignoreimport => [false, "A parameter that can be used in commit
+      hooks, since it enables you to parse-check a single file rather
+      than requiring that all files exist."],
     :authconfig => [ "$confdir/namespaceauth.conf",
       "The configuration file that defines the rights to the different
       namespaces and methods.  This can be used as a coarse-grained
       authorization system for both `puppet agent` and `puppet master`."
     ],
     :environment => {:default => "production", :desc => "The environment Puppet is running in.  For clients
       (e.g., `puppet agent`) this determines the environment itself, which
       is used to find modules and much more.  For servers (i.e., `puppet master`) this provides the default environment for nodes
       we know nothing about."
     },
     :diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."],
     :diff => ["diff", "Which diff command to use when printing differences between files."],
     :show_diff => [false, "Whether to print a contextual diff when files are being replaced.  The diff
       is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
       This feature currently requires the `diff/lcs` Ruby library."],
     :daemonize => { :default => true,
       :desc => "Send the process into the background.  This is the default.",
       :short => "D"
     },
     :maximum_uid => [4294967290, "The maximum allowed UID.  Some platforms use negative UIDs
       but then ship with tools that do not know how to handle signed ints, so the UIDs show up as
       huge numbers that can then not be fed back into the system.  This is a hackish way to fail in a
       slightly more useful way when that happens."],
     :route_file => ["$confdir/routes.yaml", "The YAML file containing indirector route configuration."],
     :node_terminus => ["plain", "Where to find information about nodes."],
     :catalog_terminus => ["compiler", "Where to get node catalogs.  This is useful to change if, for instance,
       you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
     :facts_terminus => {
       :default => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter',
       :desc => "The node facts terminus.",
       :hook => proc do |value|
         require 'puppet/node/facts'
         if value.to_s == "rest"
           Puppet::Node::Facts.indirection.cache_class = :yaml
         end
       end
     },
     :inventory_terminus => [ "$facts_terminus", "Should usually be the same as the facts terminus" ],
     :httplog => { :default => "$logdir/http.log",
       :owner => "root",
       :mode => 0640,
       :desc => "Where the puppet agent web server logs."
     },
     :http_proxy_host => ["none",
       "The HTTP proxy host to use for outgoing connections.  Note: You
       may need to use a FQDN for the server hostname when using a proxy."],
     :http_proxy_port => [3128, "The HTTP proxy port to use for outgoing connections"],
     :filetimeout => [ 15,
       "The minimum time to wait (in seconds) between checking for updates in
       configuration files.  This timeout determines how quickly Puppet checks whether
       a file (such as manifests or templates) has changed on disk."
     ],
     :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
     :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
     :queue_source => ["stomp://localhost:61613/", "Which type of queue to use for asynchronous processing.  If your stomp server requires
       authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1"],
     :async_storeconfigs => {:default => false, :desc => "Whether to use a queueing system to provide asynchronous database integration.
       Requires that `puppetqd` be running and that 'PSON' support for ruby be installed.",
       :hook => proc do |value|
         if value
           # This reconfigures the terminii for Node, Facts, and Catalog
           Puppet.settings[:storeconfigs] = true
 
           # But then we modify the configuration
           Puppet::Resource::Catalog.indirection.cache_class = :queue
         else
           raise "Cannot disable asynchronous storeconfigs in a running process"
         end
       end
     },
     :thin_storeconfigs => {:default => false, :desc =>
       "Boolean; wether storeconfigs store in the database only the facts and exported resources.
       If true, then storeconfigs performance will be higher and still allow exported/collected
       resources, but other usage external to Puppet might not work",
       :hook => proc do |value|
         Puppet.settings[:storeconfigs] = true if value
         end
       },
     :config_version => ["", "How to determine the configuration version.  By default, it will be the
       time that the configuration is parsed, but you can provide a shell script to override how the
       version is determined.  The output of this script will be added to every log message in the
       reports, allowing you to correlate changes on your hosts to the source version on the server."],
     :zlib => [true,
       "Boolean; whether to use the zlib library",
     ],
     :prerun_command => ["", "A command to run before every agent run.  If this command returns a non-zero
       return code, the entire Puppet run will fail."],
     :postrun_command => ["", "A command to run after every agent run.  If this command returns a non-zero
       return code, the entire Puppet run will be considered to have failed, even though it might have
       performed work during the normal run."],
     :freeze_main => [false, "Freezes the 'main' class, disallowing any code to be added to it.  This
       essentially means that you can't have any code outside of a node, class, or definition other
       than in the site manifest."]
   )
 
   hostname = Facter["hostname"].value
   domain = Facter["domain"].value
   if domain and domain != ""
     fqdn = [hostname, domain].join(".")
   else
     fqdn = hostname
   end
 
 
     Puppet.setdefaults(
     :main,
 
     # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for
     # manipulating naming.
     :certname => {:default => fqdn.downcase, :desc => "The name to use when handling certificates.  Defaults
       to the fully qualified domain name.",
       :call_on_define => true, # Call our hook with the default value, so we're always downcased
       :hook => proc { |value| raise(ArgumentError, "Certificate names must be lower case; see #1168") unless value == value.downcase }},
     :certdnsnames => ['', "The DNS names on the Server certificate as a colon-separated list.
       If it's anything other than an empty string, it will be used as an alias in the created
       certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],
     :certdir => {
       :default => "$ssldir/certs",
       :owner => "service",
       :desc => "The certificate directory."
     },
     :ssldir => {
       :default => "$confdir/ssl",
       :mode => 0771,
       :owner => "service",
       :desc => "Where SSL certificates are kept."
     },
     :publickeydir => {
       :default => "$ssldir/public_keys",
       :owner => "service",
       :desc => "The public key directory."
     },
     :requestdir => {
       :default => "$ssldir/certificate_requests",
       :owner => "service",
       :desc => "Where host certificate requests are stored."
     },
     :privatekeydir => { :default => "$ssldir/private_keys",
       :mode => 0750,
       :owner => "service",
       :desc => "The private key directory."
     },
     :privatedir => { :default => "$ssldir/private",
       :mode => 0750,
       :owner => "service",
       :desc => "Where the client stores private certificate information."
     },
     :passfile => { :default => "$privatedir/password",
       :mode => 0640,
       :owner => "service",
       :desc => "Where puppet agent stores the password for its private key.
         Generally unused."
     },
     :hostcsr => { :default => "$ssldir/csr_$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificate requests."
     },
     :hostcert => { :default => "$certdir/$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificates."
     },
     :hostprivkey => { :default => "$privatekeydir/$certname.pem",
       :mode => 0600,
       :owner => "service",
       :desc => "Where individual hosts store and look for their private key."
     },
     :hostpubkey => { :default => "$publickeydir/$certname.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their public key."
     },
     :localcacert => { :default => "$certdir/ca.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where each client stores the CA certificate."
     },
     :hostcrl => { :default => "$ssldir/crl.pem",
       :mode => 0644,
       :owner => "service",
       :desc => "Where the host's certificate revocation list can be found.
         This is distinct from the certificate authority's CRL."
     },
     :certificate_revocation => [true, "Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL)
       to all clients.  If enabled, CA chaining will almost definitely not work."]
   )
 
     setdefaults(
     :ca,
     :ca_name => ["Puppet CA: $certname", "The name to use the Certificate Authority certificate."],
     :cadir => {  :default => "$ssldir/ca",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "The root directory for the certificate authority."
     },
     :cacert => { :default => "$cadir/ca_crt.pem",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA certificate."
     },
     :cakey => { :default => "$cadir/ca_key.pem",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA private key."
     },
     :capub => { :default => "$cadir/ca_pub.pem",
       :owner => "service",
       :group => "service",
       :desc => "The CA public key."
     },
     :cacrl => { :default => "$cadir/ca_crl.pem",
       :owner => "service",
       :group => "service",
       :mode => 0664,
 
       :desc => "The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored.",
       :hook => proc do |value|
         if value == 'false'
           Puppet.warning "Setting the :cacrl to 'false' is deprecated; Puppet will just ignore the crl if yours is missing"
         end
       end
     },
     :caprivatedir => { :default => "$cadir/private",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores private certificate information."
     },
     :csrdir => { :default => "$cadir/requests",
       :owner => "service",
       :group => "service",
       :desc => "Where the CA stores certificate requests"
     },
     :signeddir => { :default => "$cadir/signed",
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores signed certificates."
     },
     :capass => { :default => "$caprivatedir/ca.pass",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "Where the CA stores the password for the private key"
     },
     :serial => { :default => "$cadir/serial",
       :owner => "service",
       :group => "service",
       :mode => 0644,
       :desc => "Where the serial number for certificates is stored."
     },
     :autosign => { :default => "$confdir/autosign.conf",
       :mode => 0644,
       :desc => "Whether to enable autosign.  Valid values are true (which
         autosigns any key request, and is a very bad idea), false (which
         never autosigns any key request), and the path to a file, which
         uses that configuration file to determine which keys to sign."},
     :allow_duplicate_certs => [false, "Whether to allow a new certificate
       request to overwrite an existing certificate."],
     :ca_days => ["", "How long a certificate should be valid.
       This parameter is deprecated, use ca_ttl instead"],
     :ca_ttl => ["5y", "The default TTL for new certificates; valid values
       must be an integer, optionally followed by one of the units
       'y' (years of 365 days), 'd' (days), 'h' (hours), or
       's' (seconds). The unit defaults to seconds. If this parameter
       is set, ca_days is ignored. Examples are '3600' (one hour)
       and '1825d', which is the same as '5y' (5 years) "],
     :ca_md => ["md5", "The type of hash used in certificates."],
     :req_bits => [2048, "The bit length of the certificates."],
     :keylength => [1024, "The bit length of keys."],
     :cert_inventory => {
       :default => "$cadir/inventory.txt",
       :mode => 0644,
       :owner => "service",
       :group => "service",
       :desc => "A Complete listing of all certificates"
     }
   )
 
   # Define the config default.
 
     setdefaults(
     Puppet.settings[:name],
     :config => ["$confdir/puppet.conf",
       "The configuration file for #{Puppet[:name]}."],
     :pidfile => ["$rundir/$name.pid", "The pid file"],
     :bindaddress => ["", "The address a listening server should bind to.  Mongrel servers
       default to 127.0.0.1 and WEBrick defaults to 0.0.0.0."],
     :servertype => {:default => "webrick", :desc => "The type of server to use.  Currently supported
       options are webrick and mongrel.  If you use mongrel, you will need
       a proxy in front of the process or processes, since Mongrel cannot
       speak SSL.",
 
       :call_on_define => true, # Call our hook with the default value, so we always get the correct bind address set.
       :hook => proc { |value|  value == "webrick" ? Puppet.settings[:bindaddress] = "0.0.0.0" : Puppet.settings[:bindaddress] = "127.0.0.1" if Puppet.settings[:bindaddress] == "" }
     }
   )
 
   setdefaults(:master,
     :user => ["puppet", "The user puppet master should run as."],
     :group => ["puppet", "The group puppet master should run as."],
     :manifestdir => ["$confdir/manifests", "Where puppet master looks for its manifests."],
     :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppet master."],
     :code => ["", "Code to parse directly.  This is essentially only used
       by `puppet`, and should only be set if you're writing your own Puppet
       executable"],
     :masterlog => { :default => "$logdir/puppetmaster.log",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "Where puppet master logs.  This is generally not used,
         since syslog is the default log destination."
     },
     :masterhttplog => { :default => "$logdir/masterhttp.log",
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :create => true,
       :desc => "Where the puppet master web server logs."
     },
     :masterport => [8140, "Which port puppet master listens on."],
     :node_name => ["cert", "How the puppetmaster determines the client's identity
       and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
       in particular for determining which 'node' statement applies to the client.
       Possible values are 'cert' (use the subject's CN in the client's
       certificate) and 'facter' (use the hostname that the client
       reported in its facts)"],
     :bucketdir => {
       :default => "$vardir/bucket",
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "Where FileBucket files are stored."
     },
     :rest_authconfig => [ "$confdir/auth.conf",
       "The configuration file that defines the rights to the different
       rest indirections.  This can be used as a fine-grained
       authorization system for `puppet master`."
     ],
     :ca => [true, "Wether the master should function as a certificate authority."],
     :modulepath => {:default => "$confdir/modules:/usr/share/puppet/modules",
       :desc => "The search path for modules as a colon-separated list of
       directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
     :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
       client's SSL DN.  Only used with Mongrel.  This header must be set by the proxy
       to the authenticated client's SSL DN (e.g., `/CN=puppet.puppetlabs.com`).
       See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information."],
     :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
       message of the client verification. Only used with Mongrel.  This header must be set by the proxy
       to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
       See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information."],
     # To make sure this directory is created before we try to use it on the server, we need
     # it to be in the server section (#1138).
     :yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
       :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
     :server_datadir => {:default => "$vardir/server_data", :owner => "service", :group => "service", :mode => "750",
       :desc => "The directory in which serialized data is stored, usually in a subdirectory."},
     :reports => ["store",
       "The list of reports to generate.  All reports are looked for
       in `puppet/reports/name.rb`, and multiple report names should be
       comma-separated (whitespace is okay)."
     ],
     :reportdir => {:default => "$vardir/reports",
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "The directory in which to store reports
         received from the client.  Each client gets a separate
         subdirectory."},
     :reporturl => ["http://localhost:3000/reports",
       "The URL used by the http reports processor to send reports"],
     :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."],
     :strict_hostname_checking => [false, "Whether to only search for the complete
       hostname as it is in the certificate when searching for node information
       in the catalogs."]
   )
 
   setdefaults(:metrics,
     :rrddir => {:default => "$vardir/rrd",
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "The directory where RRD database files are stored.
         Directories for each reporting host will be created under
         this directory."
     },
     :rrdinterval => ["$runinterval", "How often RRD should expect data.
       This should match how often the hosts report back to the server."]
   )
 
   setdefaults(:agent,
     :localconfig => { :default => "$statedir/localconfig",
       :owner => "root",
       :mode => 0660,
       :desc => "Where puppet agent caches the local configuration.  An
         extension indicating the cache format is added automatically."},
     :statefile => { :default => "$statedir/state.yaml",
       :mode => 0660,
       :desc => "Where puppet agent and puppet master store state associated
         with the running configuration.  In the case of puppet master,
         this file reflects the state discovered through interacting
         with clients."
       },
     :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750", :desc => "The directory in which client-side YAML data is stored."},
     :client_datadir => {:default => "$vardir/client_data", :mode => "750", :desc => "The directory in which serialized data is stored on the client."},
     :classfile => { :default => "$statedir/classes.txt",
       :owner => "root",
       :mode => 0644,
       :desc => "The file in which puppet agent stores a list of the classes
         associated with the retrieved configuration.  Can be loaded in
         the separate `puppet` executable using the `--loadclasses`
         option."},
     :puppetdlog => { :default => "$logdir/puppetd.log",
       :owner => "root",
       :mode => 0640,
       :desc => "The log file for puppet agent.  This is generally not used."
     },
     :server => ["puppet", "The server to which server puppet agent should connect"],
     :ignoreschedules => [false,
       "Boolean; whether puppet agent should ignore schedules.  This is useful
       for initial puppet agent runs."],
     :puppetport => [8139, "Which port puppet agent listens on."],
     :noop => [false, "Whether puppet agent should be run in noop mode."],
     :runinterval => [1800, # 30 minutes
       "How often puppet agent applies the client configuration; in seconds."],
     :listen => [false, "Whether puppet agent should listen for
       connections.  If this is true, then by default only the
       `runner` server is started, which allows remote authorized
       and authenticated nodes to connect and trigger `puppet agent`
       runs."],
     :ca_server => ["$server", "The server to use for certificate
       authority requests.  It's a separate server because it cannot
       and does not need to horizontally scale."],
     :ca_port => ["$masterport", "The port to use for the certificate authority."],
     :catalog_format => {
       :default => "",
       :desc => "(Deprecated for 'preferred_serialization_format') What format to
         use to dump the catalog.  Only supports 'marshal' and 'yaml'.  Only
         matters on the client, since it asks the server for a specific format.",
       :hook => proc { |value|
         if value
           Puppet.warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
           Puppet.settings[:preferred_serialization_format] = value
         end
       }
     },
     :preferred_serialization_format => ["pson", "The preferred means of serializing
       ruby instances for passing over the wire.  This won't guarantee that all
       instances will be serialized using this method, since not all classes
       can be guaranteed to support this format, but it will be used for all
       classes that support it."],
     :puppetdlockfile => [ "$statedir/puppetdlock", "A lock file to temporarily stop puppet agent from doing anything."],
     :usecacheonfailure => [true,
       "Whether to use the cached configuration when the remote
       configuration will not compile.  This option is useful for testing
       new configurations, where you want to fix the broken configuration
       rather than reverting to a known-good one."
     ],
     :use_cached_catalog => [false,
       "Whether to only use the cached catalog rather than compiling a new catalog
       on every run.  Puppet can be run with this enabled by default and then selectively
       disabled when a recompile is desired."],
     :ignorecache => [false,
       "Ignore cache and always recompile the configuration.  This is
       useful for testing new configurations, where the local cache may in
       fact be stale even if the timestamps are up to date - if the facts
       change or if the server changes."
     ],
     :downcasefacts => [false, "Whether facts should be made all lowercase when sent to the server."],
     :dynamicfacts => ["memorysize,memoryfree,swapsize,swapfree",
       "Facts that are dynamic; these facts will be ignored when deciding whether
       changed facts should result in a recompile.  Multiple facts should be
       comma-separated."],
     :splaylimit => ["$runinterval",
       "The maximum time to delay before runs.  Defaults to being the same as the
       run interval."],
     :splay => [false,
       "Whether to sleep for a pseudo-random (but consistent) amount of time before
       a run."],
     :clientbucketdir => {
       :default => "$vardir/clientbucket",
       :mode => 0750,
       :desc => "Where FileBucket files are stored locally."
     },
     :configtimeout => [120,
       "How long the client should wait for the configuration to be retrieved
       before considering it a failure.  This can help reduce flapping if too
       many clients contact the server at one time."
     ],
     :reportserver => {
       :default => "$server",
       :call_on_define => false,
       :desc => "(Deprecated for 'report_server') The server to which to send transaction reports.",
       :hook => proc do |value|
         Puppet.settings[:report_server] = value if value
       end
     },
     :report_server => ["$server",
       "The server to send transaction reports to."
     ],
     :report_port => ["$masterport",
       "The port to communicate with the report_server."
     ],
     :inventory_server => ["$server",
       "The server to send facts to."
     ],
     :inventory_port => ["$masterport",
       "The port to communicate with the inventory_server."
     ],
     :report => [true,
       "Whether to send reports after every transaction."
     ],
     :lastrunfile =>  { :default => "$statedir/last_run_summary.yaml",
       :mode => 0660,
       :desc => "Where puppet agent stores the last run report summary in yaml format."
     },
     :lastrunreport =>  { :default => "$statedir/last_run_report.yaml",
       :mode => 0660,
       :desc => "Where puppet agent stores the last run report in yaml format."
     },
     :graph => [false, "Whether to create dot graph files for the different
       configuration graphs.  These dot files can be interpreted by tools
       like OmniGraffle or dot (which is part of ImageMagick)."],
     :graphdir => ["$statedir/graphs", "Where to store dot-outputted graphs."],
     :http_compression => [false, "Allow http compression in REST communication with the master.
       This setting might improve performance for agent -> master communications over slow WANs.
       Your puppetmaster needs to support compression (usually by activating some settings in a reverse-proxy
       in front of the puppetmaster, which rules out webrick).
       It is harmless to activate this settings if your master doesn't support
       compression, but if it supports it, this setting might reduce performance on high-speed LANs."]
   )
 
   setdefaults(:inspect,
       :archive_files => [false, "During an inspect run, whether to archive files whose contents are audited to a file bucket."],
       :archive_file_server => ["$server", "During an inspect run, the file bucket server to archive files to if archive_files is set."]
   )
 
   # Plugin information.
 
     setdefaults(
     :main,
     :plugindest => ["$libdir",
       "Where Puppet should store plugins that it pulls down from the central
       server."],
     :pluginsource => ["puppet://$server/plugins",
       "From where to retrieve plugins.  The standard Puppet `file` type
       is used for retrieval, so anything that is a valid file source can
       be used here."],
     :pluginsync => [false, "Whether plugins should be synced with the central server."],
 
     :pluginsignore => [".svn CVS .git", "What files to ignore when pulling down plugins."]
   )
 
   # Central fact information.
 
     setdefaults(
     :main,
     :factpath => {:default => "$vardir/lib/facter:$vardir/facts",
       :desc => "Where Puppet should look for facts.  Multiple directories should
         be colon-separated, like normal PATH variables.",
 
       :call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.
       :type => :setting, # Don't consider it a file, because it could be multiple colon-separated files
       :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }},
     :factdest => ["$vardir/facts/",
       "Where Puppet should store facts that it pulls down from the central
       server."],
     :factsource => ["puppet://$server/facts/",
       "From where to retrieve facts.  The standard Puppet `file` type
       is used for retrieval, so anything that is a valid file source can
       be used here."],
     :factsync => [false, "Whether facts should be synced with the central server."],
     :factsignore => [".svn CVS", "What files to ignore when pulling down facts."]
   )
 
 
     setdefaults(
     :tagmail,
     :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."],
     :sendmail => [which('sendmail') || '', "Where to find the sendmail binary with which to send email."],
 
     :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."), "The 'from' email address for the reports."],
     :smtpserver => ["none", "The server through which to send email reports."]
   )
 
     setdefaults(
     :rails,
     :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
       :mode => 0660,
       :owner => "service",
       :group => "service",
       :desc => "The database cache for client configurations.  Used for
         querying within the language."
     },
     :dbadapter => [ "sqlite3", "The type of database to use." ],
     :dbmigrate => [ false, "Whether to automatically migrate the database." ],
     :dbname => [ "puppet", "The name of the database to use." ],
     :dbserver => [ "localhost", "The database server for caching. Only
       used when networked databases are used."],
     :dbport => [ "", "The database password for caching. Only
       used when networked databases are used."],
     :dbuser => [ "puppet", "The database user for caching. Only
       used when networked databases are used."],
     :dbpassword => [ "puppet", "The database password for caching. Only
       used when networked databases are used."],
     :dbconnections => [ '', "The number of database connections for networked
       databases.  Will be ignored unless the value is a positive integer."],
     :dbsocket => [ "", "The database socket location. Only used when networked
       databases are used.  Will be ignored if the value is an empty string."],
     :railslog => {:default => "$logdir/rails.log",
       :mode => 0600,
       :owner => "service",
       :group => "service",
       :desc => "Where Rails-specific logs are sent"
     },
 
     :rails_loglevel => ["info", "The log level for Rails connections.  The value must be
       a valid log level within Rails.  Production environments normally use `info`
       and other environments normally use `debug`."]
   )
 
     setdefaults(
     :couchdb,
 
     :couchdb_url => ["http://127.0.0.1:5984/puppet", "The url where the puppet couchdb database will be created"]
   )
 
     setdefaults(
     :transaction,
     :tags => ["", "Tags to use to find resources.  If this is set, then
       only resources tagged with the specified tags will be applied.
       Values must be comma-separated."],
     :evaltrace => [false, "Whether each resource should log when it is
       being evaluated.  This allows you to interactively see exactly
       what is being done."],
     :summarize => [false,
 
       "Whether to print a transaction summary."
     ]
   )
 
     setdefaults(
     :main,
     :external_nodes => ["none",
 
       "An external command that can produce node information.  The output
       must be a YAML dump of a hash, and that hash must have one or both of
       `classes` and `parameters`, where `classes` is an array and
       `parameters` is a hash.  For unknown nodes, the commands should
       exit with a non-zero exit code.
 
       This command makes it straightforward to store your node mapping
       information in other data sources like databases."])
 
         setdefaults(
         :ldap,
     :ldapnodes => [false,
       "Whether to search for node configurations in LDAP.  See
       http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information."],
     :ldapssl => [false,
       "Whether SSL should be used when searching for nodes.
       Defaults to false because SSL usually requires certificates
       to be set up on the client side."],
     :ldaptls => [false,
       "Whether TLS should be used when searching for nodes.
       Defaults to false because TLS usually requires certificates
       to be set up on the client side."],
     :ldapserver => ["ldap",
       "The LDAP server.  Only used if `ldapnodes` is enabled."],
     :ldapport => [389,
       "The LDAP port.  Only used if `ldapnodes` is enabled."],
 
     :ldapstring => ["(&(objectclass=puppetClient)(cn=%s))",
       "The search string used to find an LDAP node."],
     :ldapclassattrs => ["puppetclass",
       "The LDAP attributes to use to define Puppet classes.  Values
       should be comma-separated."],
     :ldapstackedattrs => ["puppetvar",
       "The LDAP attributes that should be stacked to arrays by adding
       the values in all hierarchy elements of the tree.  Values
       should be comma-separated."],
     :ldapattrs => ["all",
       "The LDAP attributes to include when querying LDAP for nodes.  All
       returned attributes are set as variables in the top-level scope.
       Multiple values should be comma-separated.  The value 'all' returns
       all attributes."],
     :ldapparentattr => ["parentnode",
       "The attribute to use to define the parent node."],
     :ldapuser => ["",
       "The user to use to connect to LDAP.  Must be specified as a
       full DN."],
     :ldappassword => ["", "The password to use to connect to LDAP."],
     :ldapbase => ["",
       "The search base for LDAP searches.  It's impossible to provide
       a meaningful default here, although the LDAP libraries might
       have one already set.  Generally, it should be the 'ou=Hosts'
       branch under your main directory."]
   )
 
   setdefaults(:master,
     :storeconfigs => {:default => false, :desc => "Whether to store each client's configuration.  This
       requires ActiveRecord from Ruby on Rails.",
       :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
       :hook => proc do |value|
         require 'puppet/node'
         require 'puppet/node/facts'
         if value
           require 'puppet/rails'
           raise "StoreConfigs not supported without ActiveRecord 2.1 or higher" unless Puppet.features.rails?
           Puppet::Resource::Catalog.indirection.cache_class = :active_record unless Puppet.settings[:async_storeconfigs]
           Puppet::Node::Facts.indirection.cache_class = :active_record
           Puppet::Node.indirection.cache_class = :active_record
         end
       end
     }
   )
 
   # This doesn't actually work right now.
 
     setdefaults(
     :parser,
 
     :lexical => [false, "Whether to use lexical scoping (vs. dynamic)."],
     :templatedir => ["$vardir/templates",
       "Where Puppet looks for template files.  Can be a list of colon-seperated
       directories."
     ]
   )
   setdefaults(
     :puppetdoc,
     :document_all => [false, "Document all resources"]
   )
 end
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb
index 4589ea64c..dc631979e 100644
--- a/lib/puppet/node/environment.rb
+++ b/lib/puppet/node/environment.rb
@@ -1,177 +1,178 @@
 require 'puppet/util/cacher'
 require 'monitor'
 
 # Just define it, so this class has fewer load dependencies.
 class Puppet::Node
 end
 
 # Model the environment that a node can operate in.  This class just
 # provides a simple wrapper for the functionality around environments.
 class Puppet::Node::Environment
   module Helper
     def environment
       Puppet::Node::Environment.new(@environment)
     end
 
     def environment=(env)
       if env.is_a?(String) or env.is_a?(Symbol)
         @environment = env
       else
         @environment = env.name
       end
     end
   end
 
   include Puppet::Util::Cacher
 
   @seen = {}
 
   # Return an existing environment instance, or create a new one.
   def self.new(name = nil)
     return name if name.is_a?(self)
     name ||= Puppet.settings.value(:environment)
 
     raise ArgumentError, "Environment name must be specified" unless name
 
     symbol = name.to_sym
 
     return @seen[symbol] if @seen[symbol]
 
     obj = self.allocate
     obj.send :initialize, symbol
     @seen[symbol] = obj
   end
 
   def self.current
     Thread.current[:environment] || root
   end
 
   def self.current=(env)
     Thread.current[:environment] = new(env)
   end
 
   def self.root
     @root
   end
 
   # This is only used for testing.
   def self.clear
     @seen.clear
   end
 
   attr_reader :name
 
   # Return an environment-specific setting.
   def [](param)
     Puppet.settings.value(param, self.name)
   end
 
   def initialize(name)
     @name = name
     extend MonitorMixin
   end
 
   def known_resource_types
     # This makes use of short circuit evaluation to get the right thread-safe
     # per environment semantics with an efficient most common cases; we almost
     # always just return our thread's known-resource types.  Only at the start
     # of a compilation (after our thread var has been set to nil) or when the
     # environment has changed do we delve deeper.
     Thread.current[:known_resource_types] = nil if (krt = Thread.current[:known_resource_types]) && krt.environment != self
     Thread.current[:known_resource_types] ||= synchronize {
       if @known_resource_types.nil? or @known_resource_types.require_reparse?
         @known_resource_types = Puppet::Resource::TypeCollection.new(self)
         @known_resource_types.import_ast(perform_initial_import, '')
       end
       @known_resource_types
     }
   end
 
   def module(name)
     mod = Puppet::Module.new(name, self)
     return nil unless mod.exist?
     mod
   end
 
   # Cache the modulepath, so that we aren't searching through
   # all known directories all the time.
   cached_attr(:modulepath, :ttl => Puppet[:filetimeout]) do
     dirs = self[:modulepath].split(File::PATH_SEPARATOR)
     dirs = ENV["PUPPETLIB"].split(File::PATH_SEPARATOR) + dirs if ENV["PUPPETLIB"]
     validate_dirs(dirs)
   end
 
   # Return all modules from this environment.
   # Cache the list, because it can be expensive to create.
   cached_attr(:modules, :ttl => Puppet[:filetimeout]) do
     module_names = modulepath.collect { |path| Dir.entries(path) }.flatten.uniq
     module_names.collect do |path|
       begin
         Puppet::Module.new(path, self)
       rescue Puppet::Module::Error => e
         nil
       end
     end.compact
   end
 
   # Cache the manifestdir, so that we aren't searching through
   # all known directories all the time.
   cached_attr(:manifestdir, :ttl => Puppet[:filetimeout]) do
     validate_dirs(self[:manifestdir].split(File::PATH_SEPARATOR))
   end
 
   def to_s
     name.to_s
   end
 
   def to_sym
     to_s.to_sym
   end
 
   # The only thing we care about when serializing an environment is its
   # identity; everything else is ephemeral and should not be stored or
   # transmitted.
   def to_zaml(z)
     self.to_s.to_zaml(z)
   end
 
   def validate_dirs(dirs)
     dirs.collect do |dir|
       if dir !~ /^#{File::SEPARATOR}/
         File.join(Dir.getwd, dir)
       else
         dir
       end
     end.find_all do |p|
       p =~ /^#{File::SEPARATOR}/ && FileTest.directory?(p)
     end
   end
 
   private
 
   def perform_initial_import
+    return empty_parse_result if Puppet.settings[:ignoreimport]
     parser = Puppet::Parser::Parser.new(self)
     if code = Puppet.settings.uninterpolated_value(:code, name.to_s) and code != ""
       parser.string = code
     else
       file = Puppet.settings.value(:manifest, name.to_s)
       parser.file = file
     end
     parser.parse
   rescue => detail
     known_resource_types.parse_failed = true
 
     msg = "Could not parse for environment #{self}: #{detail}"
     error = Puppet::Error.new(msg)
     error.set_backtrace(detail.backtrace)
     raise error
   end
 
   def empty_parse_result
     # Return an empty toplevel hostclass to use as the result of
     # perform_initial_import when no file was actually loaded.
     return Puppet::Parser::AST::Hostclass.new('')
   end
 
   @root = new(:'*root*')
 end
diff --git a/lib/puppet/parser/type_loader.rb b/lib/puppet/parser/type_loader.rb
index 23fb78c0a..1fba73d0b 100644
--- a/lib/puppet/parser/type_loader.rb
+++ b/lib/puppet/parser/type_loader.rb
@@ -1,171 +1,173 @@
 require 'puppet/node/environment'
 
 class Puppet::Parser::TypeLoader
   include Puppet::Node::Environment::Helper
 
   # Helper class that makes sure we don't try to import the same file
   # more than once from either the same thread or different threads.
   class Helper
     include MonitorMixin
     def initialize
       super
       # These hashes are indexed by filename
       @state = {} # :doing or :done
       @thread = {} # if :doing, thread that's doing the parsing
       @cond_var = {} # if :doing, condition var that will be signaled when done.
     end
 
     # Execute the supplied block exactly once per file, no matter how
     # many threads have asked for it to run.  If another thread is
     # already executing it, wait for it to finish.  If this thread is
     # already executing it, return immediately without executing the
     # block.
     #
     # Note: the reason for returning immediately if this thread is
     # already executing the block is to handle the case of a circular
     # import--when this happens, we attempt to recursively re-parse a
     # file that we are already in the process of parsing.  To prevent
     # an infinite regress we need to simply do nothing when the
     # recursive import is attempted.
     def do_once(file)
       need_to_execute = synchronize do
         case @state[file]
         when :doing
           if @thread[file] != Thread.current
             @cond_var[file].wait
           end
           false
         when :done
           false
         else
           @state[file] = :doing
           @thread[file] = Thread.current
           @cond_var[file] = new_cond
           true
         end
       end
       if need_to_execute
         begin
           yield
         ensure
           synchronize do
             @state[file] = :done
             @thread.delete(file)
             @cond_var.delete(file).broadcast
           end
         end
       end
     end
   end
 
   # Import our files.
   def import(file, current_file = nil)
+    return if Puppet[:ignoreimport]
+
     # use a path relative to the file doing the importing
     if current_file
       dir = current_file.sub(%r{[^/]+$},'').sub(/\/$/, '')
     else
       dir = "."
     end
     if dir == ""
       dir = "."
     end
 
     pat = file
     modname, files = Puppet::Parser::Files.find_manifests(pat, :cwd => dir, :environment => environment)
     if files.size == 0
       raise Puppet::ImportError.new("No file(s) found for import of '#{pat}'")
     end
 
     loaded_asts = []
     files.each do |file|
       unless file =~ /^#{File::SEPARATOR}/
         file = File.join(dir, file)
       end
       @loading_helper.do_once(file) do
         loaded_asts << parse_file(file)
       end
     end
     loaded_asts.inject([]) do |loaded_types, ast|
       loaded_types + known_resource_types.import_ast(ast, modname)
     end
   end
 
   def import_all
     require 'find'
 
     module_names = []
     # Collect the list of all known modules
     environment.modulepath.each do |path|
       Dir.chdir(path) do
         Dir.glob("*").each do |dir|
           next unless FileTest.directory?(dir)
           module_names << dir
         end
       end
     end
 
     module_names.uniq!
     # And then load all files from each module, but (relying on system
     # behavior) only load files from the first module of a given name.  E.g.,
     # given first/foo and second/foo, only files from first/foo will be loaded.
     module_names.each do |name|
       mod = Puppet::Module.new(name, environment)
       Find.find(File.join(mod.path, "manifests")) do |path|
         if path =~ /\.pp$/ or path =~ /\.rb$/
           import(path)
         end
       end
     end
   end
 
   def known_resource_types
     environment.known_resource_types
   end
 
   def initialize(env)
     self.environment = env
     @loading_helper = Helper.new
   end
 
   # Try to load the object with the given fully qualified name.
   def try_load_fqname(type, fqname)
     return nil if fqname == "" # special-case main.
     name2files(fqname).each do |filename|
       begin
         imported_types = import(filename)
         if result = imported_types.find { |t| t.type == type and t.name == fqname }
           Puppet.debug "Automatically imported #{fqname} from #{filename} into #{environment}"
           return result
         end
       rescue Puppet::ImportError => detail
         # We couldn't load the item
         # I'm not convienced we should just drop these errors, but this
         # preserves existing behaviours.
       end
     end
     # Nothing found.
     return nil
   end
 
   def parse_file(file)
     Puppet.debug("importing '#{file}' in environment #{environment}")
     parser = Puppet::Parser::Parser.new(environment)
     parser.file = file
     return parser.parse
   end
 
   private
 
   # Return a list of all file basenames that should be tried in order
   # to load the object with the given fully qualified name.
   def name2files(fqname)
     result = []
     ary = fqname.split("::")
     while ary.length > 0
       result << ary.join(File::SEPARATOR)
       ary.pop
     end
     return result
   end
 
 end
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb
index 2a6dbdfa5..c00bc6f85 100644
--- a/lib/puppet/util/rdoc.rb
+++ b/lib/puppet/util/rdoc.rb
@@ -1,83 +1,86 @@
 
 module Puppet::Util::RDoc
 
   module_function
 
   # launch a rdoc documenation process
   # with the files/dir passed in +files+
   def rdoc(outputdir, files, charset = nil)
+      Puppet[:ignoreimport] = true
+
       # then rdoc
       require 'rdoc/rdoc'
       require 'rdoc/options'
 
       # load our parser
       require 'puppet/util/rdoc/parser'
 
       r = RDoc::RDoc.new
 
       RDoc::RDoc::GENERATORS["puppet"] = RDoc::RDoc::Generator.new(
           "puppet/util/rdoc/generators/puppet_generator.rb",
           "PuppetGenerator".intern,
           "puppet")
 
       # specify our own format & where to output
       options = [ "--fmt", "puppet",
         "--quiet",
         "--exclude", "/modules/[^/]*/files/.*\.pp$",
         "--op", outputdir ]
 
       options << "--force-update" if Options::OptionList.options.any? { |o| o[0] == "--force-update" }
       options += [ "--charset", charset] if charset
       options += files
       #TODO dedup file paths (not strict duplication sense, parents, children, etc
 
       # launch the documentation process
       r.document(options)
   rescue RDoc::RDocError => e
       raise Puppet::ParseError.new("RDoc error #{e}")
   end
 
   # launch a output to console manifest doc
   def manifestdoc(files)
+    Puppet[:ignoreimport] = true
     files.select { |f| FileTest.file?(f) }.each do |f|
       parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new(Puppet[:environment]))
       parser.file = f
       ast = parser.parse
       output(f, ast)
     end
   end
 
   # Ouputs to the console the documentation
   # of a manifest
   def output(file, ast)
     astobj = []
     ast.instantiate('').each do |resource_type|
       astobj << resource_type if resource_type.file == file
     end
 
     astobj.sort! {|a,b| a.line <=> b.line }.each do |k|
       output_astnode_doc(k)
     end
   end
 
   def output_astnode_doc(ast)
     puts ast.doc if !ast.doc.nil? and !ast.doc.empty?
     if Puppet.settings[:document_all]
       # scan each underlying resources to produce documentation
       code = ast.code.children if ast.code.is_a?(Puppet::Parser::AST::ASTArray)
       code ||= ast.code
       output_resource_doc(code) unless code.nil?
     end
   end
 
   def output_resource_doc(code)
     code.sort { |a,b| a.line <=> b.line }.each do |stmt|
       output_resource_doc(stmt.children) if stmt.is_a?(Puppet::Parser::AST::ASTArray)
 
       if stmt.is_a?(Puppet::Parser::AST::Resource)
         puts stmt.doc if !stmt.doc.nil? and !stmt.doc.empty?
       end
     end
   end
 
 end
diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
index cf6cb4715..930cec533 100644
--- a/man/man5/puppet.conf.5
+++ b/man/man5/puppet.conf.5
@@ -1,1600 +1,1608 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
 .TH "PUPPETCONF" "5" "April 2011" "Puppet Labs, LLC" "Puppet manual"
-\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Apr 13 14:37:15 \-0700 2011)\fR
+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Apr 13 14:24:43 \-0700 2011)\fR
 .
 .SH "Specifying Configuration Parameters"
 .
 .SS "On The Command\-Line"
 Every Puppet executable (with the exception of \fBpuppetdoc\fR) accepts all of the parameters below, but not all of the arguments make sense for every executable\.
 .
 .P
 I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not\.
 .
 .P
 These parameters can be supplied to the executables either as command\-line options or in the configuration file\. For instance, the command\-line invocation below would set the configuration directory to \fB/private/puppet\fR:
 .
 .IP "" 4
 .
 .nf
 
 $ puppet agent \-\-confdir=/private/puppet
 .
 .fi
 .
 .IP "" 0
 .
 .P
 Note that boolean options are turned on and off with a slightly different syntax on the command line:
 .
 .IP "" 4
 .
 .nf
 
 $ puppet agent \-\-storeconfigs
 
 $ puppet agent \-\-no\-storeconfigs
 .
 .fi
 .
 .IP "" 0
 .
 .P
 The invocations above will enable and disable, respectively, the storage of the client configuration\.
 .
 .SS "Configuration Files"
 As mentioned above, the configuration parameters can also be stored in a configuration file, located in the configuration directory\. As root, the default configuration directory is \fB/etc/puppet\fR, and as a regular user, the default configuration directory is \fB~user/\.puppet\fR\. As of 0\.23\.0, all executables look for \fBpuppet\.conf\fR in their configuration directory (although they previously looked for separate files)\. For example, \fBpuppet\.conf\fR is located at \fB/etc/puppet/puppet\.conf\fR as \fBroot\fR and \fB~user/\.puppet/puppet\.conf\fR as a regular user by default\.
 .
 .P
 All executables will set any parameters set within the \fB[main]\fR section, and each executable will also use one of the \fB[master]\fR, \fB[agent]\fR\.
 .
 .P
 The file follows INI\-style formatting\. Here is an example of a very simple \fBpuppet\.conf\fR file:
 .
 .IP "" 4
 .
 .nf
 
 [main]
   confdir = /private/puppet
   storeconfigs = true
 .
 .fi
 .
 .IP "" 0
 .
 .P
 Note that boolean parameters must be explicitly specified as \fBtrue\fR or \fBfalse\fR as seen above\.
 .
 .P
 If you need to change file or directory parameters (e\.g\., reset the mode or owner), do so within curly braces on the same line:
 .
 .IP "" 4
 .
 .nf
 
 [main]
   vardir = /new/vardir {owner = root, mode = 644}
 .
 .fi
 .
 .IP "" 0
 .
 .P
 If you\'re starting out with a fresh configuration, you may wish to let the executable generate a template configuration file for you by invoking the executable in question with the \fB\-\-genconfig\fR command\. The executable will print a template configuration to standard output, which can be redirected to a file like so:
 .
 .IP "" 4
 .
 .nf
 
 $ puppet agent \-\-genconfig > /etc/puppet/puppet\.conf
 .
 .fi
 .
 .IP "" 0
 .
 .P
 Note that this invocation will replace the contents of any pre\-existing \fBpuppet\.conf\fR file, so make a backup of your present config if it contains valuable information\.
 .
 .P
 Like the \fB\-\-genconfig\fR argument, the executables also accept a \fB\-\-genmanifest\fR argument, which will generate a manifest that can be used to manage all of Puppet\'s directories and files and prints it to standard output\. This can likewise be redirected to a file:
 .
 .IP "" 4
 .
 .nf
 
 $ puppet agent \-\-genmanifest > /etc/puppet/manifests/site\.pp
 .
 .fi
 .
 .IP "" 0
 .
 .P
 Puppet can also create user and group accounts for itself (one \fBpuppet\fR group and one \fBpuppet\fR user) if it is invoked as \fBroot\fR with the \fB\-\-mkusers\fR argument:
 .
 .IP "" 4
 .
 .nf
 
 $ puppet master \-\-mkusers
 .
 .fi
 .
 .IP "" 0
 .
 .SH "Signals"
 The \fBpuppet agent\fR and \fBpuppet master\fR executables catch some signals for special handling\. Both daemons catch (\fBSIGHUP\fR), which forces the server to restart tself\. Predictably, interrupt and terminate (\fBSIGINT\fR and \fBSIGTERM\fR) will shut down the server, whether it be an instance of \fBpuppet agent\fR or \fBpuppet master\fR\.
 .
 .P
 Sending the \fBSIGUSR1\fR signal to an instance of \fBpuppet agent\fR will cause it to immediately begin a new configuration transaction with the server\. This signal has no effect on \fBpuppet master\fR\.
 .
 .SH "Configuration Parameter Reference"
 Below is a list of all documented parameters\. Not all of them are valid with all Puppet executables, but the executables will ignore any inappropriate values\.
 .
 .SS "allow_duplicate_certs"
 Whether to allow a new certificate request to overwrite an existing certificate\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "archive_file_server"
 During an inspect run, the file bucket server to archive files to if archive_files is set\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
 .SS "archive_files"
 During an inspect run, whether to archive files whose contents are audited to a file bucket\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "async_storeconfigs"
 Whether to use a queueing system to provide asynchronous database integration\. Requires that \fBpuppetqd\fR be running and that \'PSON\' support for ruby be installed\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "authconfig"
 The configuration file that defines the rights to the different namespaces and methods\. This can be used as a coarse\-grained authorization system for both \fBpuppet agent\fR and \fBpuppet master\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/namespaceauth\.conf
 .
 .IP "" 0
 .
 .SS "autoflush"
 Whether log files should always flush to disk\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "autosign"
 Whether to enable autosign\. Valid values are true (which autosigns any key request, and is a very bad idea), false (which never autosigns any key request), and the path to a file, which uses that configuration file to determine which keys to sign\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/autosign\.conf
 .
 .IP "" 0
 .
 .SS "bindaddress"
 The address a listening server should bind to\. Mongrel servers default to 127\.0\.0\.1 and WEBrick defaults to 0\.0\.0\.0\.
 .
 .SS "bucketdir"
 Where FileBucket files are stored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/bucket
 .
 .IP "" 0
 .
 .SS "ca"
 Wether the master should function as a certificate authority\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "ca_days"
 How long a certificate should be valid\. This parameter is deprecated, use ca_ttl instead
 .
 .SS "ca_md"
 The type of hash used in certificates\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: md5
 .
 .IP "" 0
 .
 .SS "ca_name"
 The name to use the Certificate Authority certificate\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: Puppet CA: $certname
 .
 .IP "" 0
 .
 .SS "ca_port"
 The port to use for the certificate authority\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $masterport
 .
 .IP "" 0
 .
 .SS "ca_server"
 The server to use for certificate authority requests\. It\'s a separate server because it cannot and does not need to horizontally scale\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
 .SS "ca_ttl"
 The default TTL for new certificates; valid values must be an integer, optionally followed by one of the units \'y\' (years of 365 days), \'d\' (days), \'h\' (hours), or \'s\' (seconds)\. The unit defaults to seconds\. If this parameter is set, ca_days is ignored\. Examples are \'3600\' (one hour) and \'1825d\', which is the same as \'5y\' (5 years)
 .
 .IP "\(bu" 4
 \fIDefault\fR: 5y
 .
 .IP "" 0
 .
 .SS "cacert"
 The CA certificate\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/ca_crt\.pem
 .
 .IP "" 0
 .
 .SS "cacrl"
 The certificate revocation list (CRL) for the CA\. Will be used if present but otherwise ignored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/ca_crl\.pem
 .
 .IP "" 0
 .
 .SS "cadir"
 The root directory for the certificate authority\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/ca
 .
 .IP "" 0
 .
 .SS "cakey"
 The CA private key\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/ca_key\.pem
 .
 .IP "" 0
 .
 .SS "capass"
 Where the CA stores the password for the private key
 .
 .IP "\(bu" 4
 \fIDefault\fR: $caprivatedir/ca\.pass
 .
 .IP "" 0
 .
 .SS "caprivatedir"
 Where the CA stores private certificate information\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/private
 .
 .IP "" 0
 .
 .SS "capub"
 The CA public key\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/ca_pub\.pem
 .
 .IP "" 0
 .
 .SS "catalog_format"
 (Deprecated for \'preferred_serialization_format\') What format to use to dump the catalog\. Only supports \'marshal\' and \'yaml\'\. Only matters on the client, since it asks the server for a specific format\.
 .
 .SS "catalog_terminus"
 Where to get node catalogs\. This is useful to change if, for instance, you\'d like to pre\-compile catalogs and store them in memcached or some other easily\-accessed store\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: compiler
 .
 .IP "" 0
 .
 .SS "cert_inventory"
 A Complete listing of all certificates
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/inventory\.txt
 .
 .IP "" 0
 .
 .SS "certdir"
 The certificate directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/certs
 .
 .IP "" 0
 .
 .SS "certdnsnames"
 The DNS names on the Server certificate as a colon\-separated list\. If it\'s anything other than an empty string, it will be used as an alias in the created certificate\. By default, only the server gets an alias set up, and only for \'puppet\'\.
 .
 .SS "certificate_revocation"
 Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL) to all clients\. If enabled, CA chaining will almost definitely not work\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "certname"
 The name to use when handling certificates\. Defaults to the fully qualified domain name\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: nick\-lewiss\-macbook\-pro\.local
 .
 .IP "" 0
 .
 .SS "classfile"
 The file in which puppet agent stores a list of the classes associated with the retrieved configuration\. Can be loaded in the separate \fBpuppet\fR executable using the \fB\-\-loadclasses\fR option\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/classes\.txt
 .
 .IP "" 0
 .
 .SS "client_datadir"
 The directory in which serialized data is stored on the client\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/client_data
 .
 .IP "" 0
 .
 .SS "clientbucketdir"
 Where FileBucket files are stored locally\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/clientbucket
 .
 .IP "" 0
 .
 .SS "clientyamldir"
 The directory in which client\-side YAML data is stored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/client_yaml
 .
 .IP "" 0
 .
 .SS "code"
 Code to parse directly\. This is essentially only used by \fBpuppet\fR, and should only be set if you\'re writing your own Puppet executable
 .
 .SS "color"
 Whether to use colors when logging to the console\. Valid values are \fBansi\fR (equivalent to \fBtrue\fR), \fBhtml\fR (mostly used during testing with TextMate), and \fBfalse\fR, which produces no color\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: ansi
 .
 .IP "" 0
 .
 .SS "confdir"
 The main Puppet configuration directory\. The default for this parameter is calculated based on the user\. If the process is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in the user\'s home directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: /etc/puppet
 .
 .IP "" 0
 .
 .SS "config"
 The configuration file for doc\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/puppet\.conf
 .
 .IP "" 0
 .
 .SS "config_version"
 How to determine the configuration version\. By default, it will be the time that the configuration is parsed, but you can provide a shell script to override how the version is determined\. The output of this script will be added to every log message in the reports, allowing you to correlate changes on your hosts to the source version on the server\.
 .
 .SS "configprint"
 Print the value of a specific configuration parameter\. If a parameter is provided for this, then the value is printed and puppet exits\. Comma\-separate multiple values\. For a list of all values, specify \'all\'\. This feature is only available in Puppet versions higher than 0\.18\.4\.
 .
 .SS "configtimeout"
 How long the client should wait for the configuration to be retrieved before considering it a failure\. This can help reduce flapping if too many clients contact the server at one time\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 120
 .
 .IP "" 0
 .
 .SS "couchdb_url"
 The url where the puppet couchdb database will be created
 .
 .IP "\(bu" 4
 \fIDefault\fR: http://127\.0\.0\.1:5984/puppet
 .
 .IP "" 0
 .
 .SS "csrdir"
 Where the CA stores certificate requests
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/requests
 .
 .IP "" 0
 .
 .SS "daemonize"
 Send the process into the background\. This is the default\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "dbadapter"
 The type of database to use\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: sqlite3
 .
 .IP "" 0
 .
 .SS "dbconnections"
 The number of database connections for networked databases\. Will be ignored unless the value is a positive integer\.
 .
 .SS "dblocation"
 The database cache for client configurations\. Used for querying within the language\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/clientconfigs\.sqlite3
 .
 .IP "" 0
 .
 .SS "dbmigrate"
 Whether to automatically migrate the database\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "dbname"
 The name of the database to use\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "dbpassword"
 The database password for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "dbport"
 The database password for caching\. Only used when networked databases are used\.
 .
 .SS "dbserver"
 The database server for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: localhost
 .
 .IP "" 0
 .
 .SS "dbsocket"
 The database socket location\. Only used when networked databases are used\. Will be ignored if the value is an empty string\.
 .
 .SS "dbuser"
 The database user for caching\. Only used when networked databases are used\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "diff"
 Which diff command to use when printing differences between files\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: diff
 .
 .IP "" 0
 .
 .SS "diff_args"
 Which arguments to pass to the diff command when printing differences between files\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: \-u
 .
 .IP "" 0
 .
 .SS "document_all"
 Document all resources
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "downcasefacts"
 Whether facts should be made all lowercase when sent to the server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "dynamicfacts"
 Facts that are dynamic; these facts will be ignored when deciding whether changed facts should result in a recompile\. Multiple facts should be comma\-separated\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: memorysize,memoryfree,swapsize,swapfree
 .
 .IP "" 0
 .
 .SS "environment"
 The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR) this determines the environment itself, which is used to find modules and much more\. For servers (i\.e\., \fBpuppet master\fR) this provides the default environment for nodes we know nothing about\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: production
 .
 .IP "" 0
 .
 .SS "evaltrace"
 Whether each resource should log when it is being evaluated\. This allows you to interactively see exactly what is being done\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "external_nodes"
 An external command that can produce node information\. The output must be a YAML dump of a hash, and that hash must have one or both of \fBclasses\fR and \fBparameters\fR, where \fBclasses\fR is an array and \fBparameters\fR is a hash\. For unknown nodes, the commands should exit with a non\-zero exit code\. This command makes it straightforward to store your node mapping information in other data sources like databases\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: none
 .
 .IP "" 0
 .
 .SS "factdest"
 Where Puppet should store facts that it pulls down from the central server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/facts/
 .
 .IP "" 0
 .
 .SS "factpath"
 Where Puppet should look for facts\. Multiple directories should be colon\-separated, like normal PATH variables\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/lib/facter:$vardir/facts
 .
 .IP "" 0
 .
 .SS "facts_terminus"
 The node facts terminus\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: facter
 .
 .IP "" 0
 .
 .SS "factsignore"
 What files to ignore when pulling down facts\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: \.svn CVS
 .
 .IP "" 0
 .
 .SS "factsource"
 From where to retrieve facts\. The standard Puppet \fBfile\fR type is used for retrieval, so anything that is a valid file source can be used here\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet://$server/facts/
 .
 .IP "" 0
 .
 .SS "factsync"
 Whether facts should be synced with the central server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "fileserverconfig"
 Where the fileserver configuration is stored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/fileserver\.conf
 .
 .IP "" 0
 .
 .SS "filetimeout"
 The minimum time to wait (in seconds) between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 15
 .
 .IP "" 0
 .
 .SS "freeze_main"
 Freezes the \'main\' class, disallowing any code to be added to it\. This essentially means that you can\'t have any code outside of a node, class, or definition other than in the site manifest\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "genconfig"
 Whether to just print a configuration to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "genmanifest"
 Whether to just print a manifest to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "graph"
 Whether to create dot graph files for the different configuration graphs\. These dot files can be interpreted by tools like OmniGraffle or dot (which is part of ImageMagick)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "graphdir"
 Where to store dot\-outputted graphs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/graphs
 .
 .IP "" 0
 .
 .SS "group"
 The group puppet master should run as\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "hostcert"
 Where individual hosts store and look for their certificates\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $certdir/$certname\.pem
 .
 .IP "" 0
 .
 .SS "hostcrl"
 Where the host\'s certificate revocation list can be found\. This is distinct from the certificate authority\'s CRL\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/crl\.pem
 .
 .IP "" 0
 .
 .SS "hostcsr"
 Where individual hosts store and look for their certificate requests\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/csr_$certname\.pem
 .
 .IP "" 0
 .
 .SS "hostprivkey"
 Where individual hosts store and look for their private key\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $privatekeydir/$certname\.pem
 .
 .IP "" 0
 .
 .SS "hostpubkey"
 Where individual hosts store and look for their public key\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $publickeydir/$certname\.pem
 .
 .IP "" 0
 .
 .SS "http_compression"
 Allow http compression in REST communication with the master\. This setting might improve performance for agent \-> master communications over slow WANs\. Your puppetmaster needs to support compression (usually by activating some settings in a reverse\-proxy in front of the puppetmaster, which rules out webrick)\. It is harmless to activate this settings if your master doesn\'t support compression, but if it supports it, this setting might reduce performance on high\-speed LANs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "http_proxy_host"
 The HTTP proxy host to use for outgoing connections\. Note: You may need to use a FQDN for the server hostname when using a proxy\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: none
 .
 .IP "" 0
 .
 .SS "http_proxy_port"
 The HTTP proxy port to use for outgoing connections
 .
 .IP "\(bu" 4
 \fIDefault\fR: 3128
 .
 .IP "" 0
 .
 .SS "httplog"
 Where the puppet agent web server logs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/http\.log
 .
 .IP "" 0
 .
 .SS "ignorecache"
 Ignore cache and always recompile the configuration\. This is useful for testing new configurations, where the local cache may in fact be stale even if the timestamps are up to date \- if the facts change or if the server changes\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
+.SS "ignoreimport"
+A parameter that can be used in commit hooks, since it enables you to parse\-check a single file rather than requiring that all files exist\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: false
+.
+.IP "" 0
+.
 .SS "ignoreschedules"
 Boolean; whether puppet agent should ignore schedules\. This is useful for initial puppet agent runs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "inventory_port"
 The port to communicate with the inventory_server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $masterport
 .
 .IP "" 0
 .
 .SS "inventory_server"
 The server to send facts to\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
 .SS "inventory_terminus"
 Should usually be the same as the facts terminus
 .
 .IP "\(bu" 4
 \fIDefault\fR: $facts_terminus
 .
 .IP "" 0
 .
 .SS "keylength"
 The bit length of keys\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 1024
 .
 .IP "" 0
 .
 .SS "lastrunfile"
 Where puppet agent stores the last run report summary in yaml format\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/last_run_summary\.yaml
 .
 .IP "" 0
 .
 .SS "lastrunreport"
 Where puppet agent stores the last run report in yaml format\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/last_run_report\.yaml
 .
 .IP "" 0
 .
 .SS "ldapattrs"
 The LDAP attributes to include when querying LDAP for nodes\. All returned attributes are set as variables in the top\-level scope\. Multiple values should be comma\-separated\. The value \'all\' returns all attributes\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: all
 .
 .IP "" 0
 .
 .SS "ldapbase"
 The search base for LDAP searches\. It\'s impossible to provide a meaningful default here, although the LDAP libraries might have one already set\. Generally, it should be the \'ou=Hosts\' branch under your main directory\.
 .
 .SS "ldapclassattrs"
 The LDAP attributes to use to define Puppet classes\. Values should be comma\-separated\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppetclass
 .
 .IP "" 0
 .
 .SS "ldapnodes"
 Whether to search for node configurations in LDAP\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/LDAP_Nodes for more information\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "ldapparentattr"
 The attribute to use to define the parent node\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: parentnode
 .
 .IP "" 0
 .
 .SS "ldappassword"
 The password to use to connect to LDAP\.
 .
 .SS "ldapport"
 The LDAP port\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 389
 .
 .IP "" 0
 .
 .SS "ldapserver"
 The LDAP server\. Only used if \fBldapnodes\fR is enabled\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: ldap
 .
 .IP "" 0
 .
 .SS "ldapssl"
 Whether SSL should be used when searching for nodes\. Defaults to false because SSL usually requires certificates to be set up on the client side\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "ldapstackedattrs"
 The LDAP attributes that should be stacked to arrays by adding the values in all hierarchy elements of the tree\. Values should be comma\-separated\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppetvar
 .
 .IP "" 0
 .
 .SS "ldapstring"
 The search string used to find an LDAP node\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: (&(objectclass=puppetClient)(cn=%s))
 .
 .IP "" 0
 .
 .SS "ldaptls"
 Whether TLS should be used when searching for nodes\. Defaults to false because TLS usually requires certificates to be set up on the client side\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "ldapuser"
 The user to use to connect to LDAP\. Must be specified as a full DN\.
 .
 .SS "lexical"
 Whether to use lexical scoping (vs\. dynamic)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "libdir"
 An extra search path for Puppet\. This is only useful for those files that Puppet will load on demand, and is only guaranteed to work for those cases\. In fact, the autoload mechanism is responsible for making sure this directory is in Ruby\'s search path
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/lib
 .
 .IP "" 0
 .
 .SS "listen"
 Whether puppet agent should listen for connections\. If this is true, then by default only the \fBrunner\fR server is started, which allows remote authorized and authenticated nodes to connect and trigger \fBpuppet agent\fR runs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "localcacert"
 Where each client stores the CA certificate\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $certdir/ca\.pem
 .
 .IP "" 0
 .
 .SS "localconfig"
 Where puppet agent caches the local configuration\. An extension indicating the cache format is added automatically\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/localconfig
 .
 .IP "" 0
 .
 .SS "logdir"
 The Puppet log directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/log
 .
 .IP "" 0
 .
 .SS "manage_internal_file_permissions"
 Whether Puppet should manage the owner, group, and mode of files it uses internally
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "manifest"
 The entry\-point manifest for puppet master\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $manifestdir/site\.pp
 .
 .IP "" 0
 .
 .SS "manifestdir"
 Where puppet master looks for its manifests\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/manifests
 .
 .IP "" 0
 .
 .SS "masterhttplog"
 Where the puppet master web server logs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/masterhttp\.log
 .
 .IP "" 0
 .
 .SS "masterlog"
 Where puppet master logs\. This is generally not used, since syslog is the default log destination\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/puppetmaster\.log
 .
 .IP "" 0
 .
 .SS "masterport"
 Which port puppet master listens on\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 8140
 .
 .IP "" 0
 .
 .SS "maximum_uid"
 The maximum allowed UID\. Some platforms use negative UIDs but then ship with tools that do not know how to handle signed ints, so the UIDs show up as huge numbers that can then not be fed back into the system\. This is a hackish way to fail in a slightly more useful way when that happens\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 4294967290
 .
 .IP "" 0
 .
 .SS "mkusers"
 Whether to create the necessary user and group that puppet agent will run as\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "modulepath"
 The search path for modules as a colon\-separated list of directories\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/modules:/usr/share/puppet/modules
 .
 .IP "" 0
 .
 .SS "name"
 The name of the application, if we are running as one\. The default is essentially $0 without the path or \fB\.rb\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: doc
 .
 .IP "" 0
 .
 .SS "node_name"
 How the puppetmaster determines the client\'s identity and sets the \'hostname\', \'fqdn\' and \'domain\' facts for use in the manifest, in particular for determining which \'node\' statement applies to the client\. Possible values are \'cert\' (use the subject\'s CN in the client\'s certificate) and \'facter\' (use the hostname that the client reported in its facts)
 .
 .IP "\(bu" 4
 \fIDefault\fR: cert
 .
 .IP "" 0
 .
 .SS "node_terminus"
 Where to find information about nodes\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: plain
 .
 .IP "" 0
 .
 .SS "noop"
 Whether puppet agent should be run in noop mode\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "onetime"
 Run the configuration once, rather than as a long\-running daemon\. This is useful for interactively running puppetd\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "passfile"
 Where puppet agent stores the password for its private key\. Generally unused\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $privatedir/password
 .
 .IP "" 0
 .
 .SS "path"
 The shell search path\. Defaults to whatever is inherited from the parent process\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: none
 .
 .IP "" 0
 .
 .SS "pidfile"
 The pid file
 .
 .IP "\(bu" 4
 \fIDefault\fR: $rundir/$name\.pid
 .
 .IP "" 0
 .
 .SS "plugindest"
 Where Puppet should store plugins that it pulls down from the central server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $libdir
 .
 .IP "" 0
 .
 .SS "pluginsignore"
 What files to ignore when pulling down plugins\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: \.svn CVS \.git
 .
 .IP "" 0
 .
 .SS "pluginsource"
 From where to retrieve plugins\. The standard Puppet \fBfile\fR type is used for retrieval, so anything that is a valid file source can be used here\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet://$server/plugins
 .
 .IP "" 0
 .
 .SS "pluginsync"
 Whether plugins should be synced with the central server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "postrun_command"
 A command to run after every agent run\. If this command returns a non\-zero return code, the entire Puppet run will be considered to have failed, even though it might have performed work during the normal run\.
 .
 .SS "preferred_serialization_format"
 The preferred means of serializing ruby instances for passing over the wire\. This won\'t guarantee that all instances will be serialized using this method, since not all classes can be guaranteed to support this format, but it will be used for all classes that support it\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: pson
 .
 .IP "" 0
 .
 .SS "prerun_command"
 A command to run before every agent run\. If this command returns a non\-zero return code, the entire Puppet run will fail\.
 .
 .SS "privatedir"
 Where the client stores private certificate information\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/private
 .
 .IP "" 0
 .
 .SS "privatekeydir"
 The private key directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/private_keys
 .
 .IP "" 0
 .
 .SS "publickeydir"
 The public key directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/public_keys
 .
 .IP "" 0
 .
 .SS "puppetdlockfile"
 A lock file to temporarily stop puppet agent from doing anything\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/puppetdlock
 .
 .IP "" 0
 .
 .SS "puppetdlog"
 The log file for puppet agent\. This is generally not used\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/puppetd\.log
 .
 .IP "" 0
 .
 .SS "puppetport"
 Which port puppet agent listens on\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 8139
 .
 .IP "" 0
 .
 .SS "queue_source"
 Which type of queue to use for asynchronous processing\. If your stomp server requires authentication, you can include it in the URI as long as your stomp client library is at least 1\.1\.1
 .
 .IP "\(bu" 4
 \fIDefault\fR: stomp://localhost:61613/
 .
 .IP "" 0
 .
 .SS "queue_type"
 Which type of queue to use for asynchronous processing\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: stomp
 .
 .IP "" 0
 .
 .SS "rails_loglevel"
 The log level for Rails connections\. The value must be a valid log level within Rails\. Production environments normally use \fBinfo\fR and other environments normally use \fBdebug\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: info
 .
 .IP "" 0
 .
 .SS "railslog"
 Where Rails\-specific logs are sent
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/rails\.log
 .
 .IP "" 0
 .
 .SS "report"
 Whether to send reports after every transaction\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "report_port"
 The port to communicate with the report_server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $masterport
 .
 .IP "" 0
 .
 .SS "report_server"
 The server to send transaction reports to\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
 .SS "reportdir"
 The directory in which to store reports received from the client\. Each client gets a separate subdirectory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/reports
 .
 .IP "" 0
 .
 .SS "reportfrom"
 The \'from\' email address for the reports\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: report@Nick\-Lewiss\-MacBook\-Pro\.local
 .
 .IP "" 0
 .
 .SS "reports"
 The list of reports to generate\. All reports are looked for in \fBpuppet/reports/name\.rb\fR, and multiple report names should be comma\-separated (whitespace is okay)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: store
 .
 .IP "" 0
 .
 .SS "reportserver"
 (Deprecated for \'report_server\') The server to which to send transaction reports\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $server
 .
 .IP "" 0
 .
 .SS "reporturl"
 The URL used by the http reports processor to send reports
 .
 .IP "\(bu" 4
 \fIDefault\fR: http://localhost:3000/reports
 .
 .IP "" 0
 .
 .SS "req_bits"
 The bit length of the certificates\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 2048
 .
 .IP "" 0
 .
 .SS "requestdir"
 Where host certificate requests are stored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $ssldir/certificate_requests
 .
 .IP "" 0
 .
 .SS "rest_authconfig"
 The configuration file that defines the rights to the different rest indirections\. This can be used as a fine\-grained authorization system for \fBpuppet master\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/auth\.conf
 .
 .IP "" 0
 .
 .SS "route_file"
 The YAML file containing indirector route configuration\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/routes\.yaml
 .
 .IP "" 0
 .
 .SS "rrddir"
 The directory where RRD database files are stored\. Directories for each reporting host will be created under this directory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/rrd
 .
 .IP "" 0
 .
 .SS "rrdinterval"
 How often RRD should expect data\. This should match how often the hosts report back to the server\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $runinterval
 .
 .IP "" 0
 .
 .SS "run_mode"
 The effective \'run mode\' of the application: master, agent, or user\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: master
 .
 .IP "" 0
 .
 .SS "rundir"
 Where Puppet PID files are kept\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/run
 .
 .IP "" 0
 .
 .SS "runinterval"
 How often puppet agent applies the client configuration; in seconds\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 1800
 .
 .IP "" 0
 .
 .SS "sendmail"
 Where to find the sendmail binary with which to send email\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: /usr/sbin/sendmail
 .
 .IP "" 0
 .
 .SS "serial"
 Where the serial number for certificates is stored\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/serial
 .
 .IP "" 0
 .
 .SS "server"
 The server to which server puppet agent should connect
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "server_datadir"
 The directory in which serialized data is stored, usually in a subdirectory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/server_data
 .
 .IP "" 0
 .
 .SS "servertype"
 The type of server to use\. Currently supported options are webrick and mongrel\. If you use mongrel, you will need a proxy in front of the process or processes, since Mongrel cannot speak SSL\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: webrick
 .
 .IP "" 0
 .
 .SS "show_diff"
 Whether to print a contextual diff when files are being replaced\. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively\. This feature currently requires the \fBdiff/lcs\fR Ruby library\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "signeddir"
 Where the CA stores signed certificates\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/signed
 .
 .IP "" 0
 .
 .SS "smtpserver"
 The server through which to send email reports\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: none
 .
 .IP "" 0
 .
 .SS "splay"
 Whether to sleep for a pseudo\-random (but consistent) amount of time before a run\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "splaylimit"
 The maximum time to delay before runs\. Defaults to being the same as the run interval\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $runinterval
 .
 .IP "" 0
 .
 .SS "ssl_client_header"
 The header containing an authenticated client\'s SSL DN\. Only used with Mongrel\. This header must be set by the proxy to the authenticated client\'s SSL DN (e\.g\., \fB/CN=puppet\.puppetlabs\.com\fR)\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/Using_Mongrel for more information\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: HTTP_X_CLIENT_DN
 .
 .IP "" 0
 .
 .SS "ssl_client_verify_header"
 The header containing the status message of the client verification\. Only used with Mongrel\. This header must be set by the proxy to \'SUCCESS\' if the client successfully authenticated, and anything else otherwise\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/Using_Mongrel for more information\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: HTTP_X_CLIENT_VERIFY
 .
 .IP "" 0
 .
 .SS "ssldir"
 Where SSL certificates are kept\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/ssl
 .
 .IP "" 0
 .
 .SS "statedir"
 The directory where Puppet state is stored\. Generally, this directory can be removed without causing harm (although it might result in spurious service restarts)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/state
 .
 .IP "" 0
 .
 .SS "statefile"
 Where puppet agent and puppet master store state associated with the running configuration\. In the case of puppet master, this file reflects the state discovered through interacting with clients\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $statedir/state\.yaml
 .
 .IP "" 0
 .
 .SS "storeconfigs"
 Whether to store each client\'s configuration\. This requires ActiveRecord from Ruby on Rails\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "strict_hostname_checking"
 Whether to only search for the complete hostname as it is in the certificate when searching for node information in the catalogs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "summarize"
 Whether to print a transaction summary\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "syslogfacility"
 What syslog facility to use when logging to syslog\. Syslog has a fixed list of valid facilities, and you must choose one of those; you cannot just make one up\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: daemon
 .
 .IP "" 0
 .
 .SS "tagmap"
 The mapping between reporting tags and email addresses\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/tagmail\.conf
 .
 .IP "" 0
 .
 .SS "tags"
 Tags to use to find resources\. If this is set, then only resources tagged with the specified tags will be applied\. Values must be comma\-separated\.
 .
 .SS "templatedir"
 Where Puppet looks for template files\. Can be a list of colon\-seperated directories\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/templates
 .
 .IP "" 0
 .
 .SS "thin_storeconfigs"
 Boolean; wether storeconfigs store in the database only the facts and exported resources\. If true, then storeconfigs performance will be higher and still allow exported/collected resources, but other usage external to Puppet might not work
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "trace"
 Whether to print stack traces on some errors
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "use_cached_catalog"
 Whether to only use the cached catalog rather than compiling a new catalog on every run\. Puppet can be run with this enabled by default and then selectively disabled when a recompile is desired\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
 .SS "usecacheonfailure"
 Whether to use the cached configuration when the remote configuration will not compile\. This option is useful for testing new configurations, where you want to fix the broken configuration rather than reverting to a known\-good one\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .SS "user"
 The user puppet master should run as\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
 .
 .IP "" 0
 .
 .SS "vardir"
 Where Puppet stores dynamic and growing data\. The default for this parameter is calculated specially, like \fBconfdir\fR_\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: /var/lib/puppet
 .
 .IP "" 0
 .
 .SS "yamldir"
 The directory in which YAML data is stored, usually in a subdirectory\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/yaml
 .
 .IP "" 0
 .
 .SS "zlib"
 Boolean; whether to use the zlib library
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
 .
 .IP "" 0
 .
 .P
-\fIThis page autogenerated on Wed Apr 13 14:37:15 \-0700 2011\fR
+\fIThis page autogenerated on Wed Apr 13 14:24:43 \-0700 2011\fR
diff --git a/spec/unit/node/environment_spec.rb b/spec/unit/node/environment_spec.rb
index b5efbd480..d1badfa3a 100755
--- a/spec/unit/node/environment_spec.rb
+++ b/spec/unit/node/environment_spec.rb
@@ -1,326 +1,334 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'puppet/node/environment'
 require 'puppet/util/execution'
 
 describe Puppet::Node::Environment do
   include PuppetSpec::Files
   after do
     Puppet::Node::Environment.clear
   end
 
   it "should include the Cacher module" do
     Puppet::Node::Environment.ancestors.should be_include(Puppet::Util::Cacher)
   end
 
   it "should use the filetimeout for the ttl for the modulepath" do
     Puppet::Node::Environment.attr_ttl(:modulepath).should == Integer(Puppet[:filetimeout])
   end
 
   it "should use the filetimeout for the ttl for the module list" do
     Puppet::Node::Environment.attr_ttl(:modules).should == Integer(Puppet[:filetimeout])
   end
 
   it "should use the filetimeout for the ttl for the manifestdir" do
     Puppet::Node::Environment.attr_ttl(:manifestdir).should == Integer(Puppet[:filetimeout])
   end
 
   it "should use the default environment if no name is provided while initializing an environment" do
     Puppet.settings.expects(:value).with(:environment).returns("one")
     Puppet::Node::Environment.new.name.should == :one
   end
 
   it "should treat environment instances as singletons" do
     Puppet::Node::Environment.new("one").should equal(Puppet::Node::Environment.new("one"))
   end
 
   it "should treat an environment specified as names or strings as equivalent" do
     Puppet::Node::Environment.new(:one).should equal(Puppet::Node::Environment.new("one"))
   end
 
   it "should return its name when converted to a string" do
     Puppet::Node::Environment.new(:one).to_s.should == "one"
   end
 
   it "should just return any provided environment if an environment is provided as the name" do
     one = Puppet::Node::Environment.new(:one)
     Puppet::Node::Environment.new(one).should equal(one)
   end
 
   describe "when managing known resource types" do
     before do
       @env = Puppet::Node::Environment.new("dev")
       @collection = Puppet::Resource::TypeCollection.new(@env)
       @env.stubs(:perform_initial_import).returns(Puppet::Parser::AST::Hostclass.new(''))
       Thread.current[:known_resource_types] = nil
     end
 
     it "should create a resource type collection if none exists" do
       Puppet::Resource::TypeCollection.expects(:new).with(@env).returns @collection
       @env.known_resource_types.should equal(@collection)
     end
 
     it "should reuse any existing resource type collection" do
       @env.known_resource_types.should equal(@env.known_resource_types)
     end
 
     it "should perform the initial import when creating a new collection" do
       @env = Puppet::Node::Environment.new("dev")
       @env.expects(:perform_initial_import).returns(Puppet::Parser::AST::Hostclass.new(''))
       @env.known_resource_types
     end
 
     it "should return the same collection even if stale if it's the same thread" do
       Puppet::Resource::TypeCollection.stubs(:new).returns @collection
       @env.known_resource_types.stubs(:stale?).returns true
 
       @env.known_resource_types.should equal(@collection)
     end
 
     it "should return the current thread associated collection if there is one" do
       Thread.current[:known_resource_types] = @collection
 
       @env.known_resource_types.should equal(@collection)
     end
 
     it "should give to all threads using the same environment the same collection if the collection isn't stale" do
       original_thread_type_collection = Puppet::Resource::TypeCollection.new(@env)
       Puppet::Resource::TypeCollection.expects(:new).with(@env).returns original_thread_type_collection
       @env.known_resource_types.should equal(original_thread_type_collection)
 
       original_thread_type_collection.expects(:require_reparse?).returns(false)
       Puppet::Resource::TypeCollection.stubs(:new).with(@env).returns @collection
 
       t = Thread.new {
         @env.known_resource_types.should equal(original_thread_type_collection)
       }
       t.join
     end
 
     it "should generate a new TypeCollection if the current one requires reparsing" do
       old_type_collection = @env.known_resource_types
       old_type_collection.stubs(:require_reparse?).returns true
       Thread.current[:known_resource_types] = nil
       new_type_collection = @env.known_resource_types
 
       new_type_collection.should be_a Puppet::Resource::TypeCollection
       new_type_collection.should_not equal(old_type_collection)
     end
   end
 
   [:modulepath, :manifestdir].each do |setting|
     it "should validate the #{setting} directories" do
       path = %w{/one /two}.join(File::PATH_SEPARATOR)
 
       env = Puppet::Node::Environment.new("testing")
       env.stubs(:[]).with(setting).returns path
 
       env.expects(:validate_dirs).with(%w{/one /two})
 
       env.send(setting)
     end
 
     it "should return the validated dirs for #{setting}" do
       path = %w{/one /two}.join(File::PATH_SEPARATOR)
 
       env = Puppet::Node::Environment.new("testing")
       env.stubs(:[]).with(setting).returns path
       env.stubs(:validate_dirs).returns %w{/one /two}
 
       env.send(setting).should == %w{/one /two}
     end
   end
 
   it "should prefix the value of the 'PUPPETLIB' environment variable to the module path if present" do
     Puppet::Util::Execution.withenv("PUPPETLIB" => %w{/l1 /l2}.join(File::PATH_SEPARATOR)) do
       env = Puppet::Node::Environment.new("testing")
       module_path = %w{/one /two}.join(File::PATH_SEPARATOR)
       env.expects(:validate_dirs).with(%w{/l1 /l2 /one /two}).returns %w{/l1 /l2 /one /two}
       env.expects(:[]).with(:modulepath).returns module_path
 
       env.modulepath.should == %w{/l1 /l2 /one /two}
     end
   end
 
   describe "when validating modulepath or manifestdir directories" do
     it "should not return non-directories" do
       env = Puppet::Node::Environment.new("testing")
 
       FileTest.expects(:directory?).with("/one").returns true
       FileTest.expects(:directory?).with("/two").returns false
 
       env.validate_dirs(%w{/one /two}).should == %w{/one}
     end
 
     it "should use the current working directory to fully-qualify unqualified paths" do
       FileTest.stubs(:directory?).returns true
       env = Puppet::Node::Environment.new("testing")
 
       two = File.join(Dir.getwd, "two")
       env.validate_dirs(%w{/one two}).should == ["/one", two]
     end
   end
 
   describe "when modeling a specific environment" do
     it "should have a method for returning the environment name" do
       Puppet::Node::Environment.new("testing").name.should == :testing
     end
 
     it "should provide an array-like accessor method for returning any environment-specific setting" do
       env = Puppet::Node::Environment.new("testing")
       env.should respond_to(:[])
     end
 
     it "should ask the Puppet settings instance for the setting qualified with the environment name" do
       Puppet.settings.expects(:value).with("myvar", :testing).returns("myval")
       env = Puppet::Node::Environment.new("testing")
       env["myvar"].should == "myval"
     end
 
     it "should be able to return an individual module that exists in its module path" do
       env = Puppet::Node::Environment.new("testing")
 
       mod = mock 'module'
       Puppet::Module.expects(:new).with("one", env).returns mod
       mod.expects(:exist?).returns true
 
       env.module("one").should equal(mod)
     end
 
     it "should return nil if asked for a module that does not exist in its path" do
       env = Puppet::Node::Environment.new("testing")
 
       mod = mock 'module'
       Puppet::Module.expects(:new).with("one", env).returns mod
       mod.expects(:exist?).returns false
 
       env.module("one").should be_nil
     end
 
     it "should be able to return its modules" do
       Puppet::Node::Environment.new("testing").should respond_to(:modules)
     end
 
     describe ".modules" do
       it "should return a module named for every directory in each module path" do
         env = Puppet::Node::Environment.new("testing")
         env.expects(:modulepath).at_least_once.returns %w{/a /b}
         Dir.expects(:entries).with("/a").returns %w{foo bar}
         Dir.expects(:entries).with("/b").returns %w{bee baz}
 
         env.modules.collect{|mod| mod.name}.sort.should == %w{foo bar bee baz}.sort
       end
 
       it "should remove duplicates" do
         env = Puppet::Node::Environment.new("testing")
         env.expects(:modulepath).returns( %w{/a /b} ).at_least_once
         Dir.expects(:entries).with("/a").returns %w{foo}
         Dir.expects(:entries).with("/b").returns %w{foo}
 
         env.modules.collect{|mod| mod.name}.sort.should == %w{foo}
       end
 
       it "should ignore invalid modules" do
         env = Puppet::Node::Environment.new("testing")
         env.stubs(:modulepath).returns %w{/a}
         Dir.expects(:entries).with("/a").returns %w{foo bar}
 
         Puppet::Module.expects(:new).with { |name, env| name == "foo" }.returns mock("foomod", :name => "foo")
         Puppet::Module.expects(:new).with { |name, env| name == "bar" }.raises( Puppet::Module::InvalidName, "name is invalid" )
 
         env.modules.collect{|mod| mod.name}.sort.should == %w{foo}
       end
 
       it "should create modules with the correct environment" do
         env = Puppet::Node::Environment.new("testing")
         env.expects(:modulepath).at_least_once.returns %w{/a}
         Dir.expects(:entries).with("/a").returns %w{foo}
 
         env.modules.each {|mod| mod.environment.should == env }
       end
 
       it "should cache the module list" do
         env = Puppet::Node::Environment.new("testing")
         env.expects(:modulepath).at_least_once.returns %w{/a}
         Dir.expects(:entries).once.with("/a").returns %w{foo}
 
         env.modules
         env.modules
       end
     end
   end
 
   describe Puppet::Node::Environment::Helper do
     before do
       @helper = Object.new
       @helper.extend(Puppet::Node::Environment::Helper)
     end
 
     it "should be able to set and retrieve the environment" do
       @helper.environment = :foo
       @helper.environment.name.should == :foo
     end
 
     it "should accept an environment directly" do
       env = Puppet::Node::Environment.new :foo
       @helper.environment = env
       @helper.environment.name.should == :foo
     end
 
     it "should accept an environment as a string" do
       env = Puppet::Node::Environment.new "foo"
       @helper.environment = env
       @helper.environment.name.should == :foo
     end
   end
 
   describe "when performing initial import" do
     before do
       @parser = Puppet::Parser::Parser.new("test")
       Puppet::Parser::Parser.stubs(:new).returns @parser
       @env = Puppet::Node::Environment.new("env")
     end
 
     it "should set the parser's string to the 'code' setting and parse if code is available" do
       Puppet.settings[:code] = "my code"
       @parser.expects(:string=).with "my code"
       @parser.expects(:parse)
       @env.instance_eval { perform_initial_import }
     end
 
     it "should set the parser's file to the 'manifest' setting and parse if no code is available and the manifest is available" do
       filename = tmpfile('myfile')
       File.open(filename, 'w'){|f| }
       Puppet.settings[:manifest] = filename
       @parser.expects(:file=).with filename
       @parser.expects(:parse)
       @env.instance_eval { perform_initial_import }
     end
 
     it "should pass the manifest file to the parser even if it does not exist on disk" do
       filename = tmpfile('myfile')
       Puppet.settings[:code] = ""
       Puppet.settings[:manifest] = filename
       @parser.expects(:file=).with(filename).once
       @parser.expects(:parse).once
       @env.instance_eval { perform_initial_import }
     end
 
     it "should fail helpfully if there is an error importing" do
       File.stubs(:exist?).returns true
       @env.stubs(:known_resource_types).returns Puppet::Resource::TypeCollection.new(@env)
       @parser.expects(:file=).once
       @parser.expects(:parse).raises ArgumentError
       lambda { @env.instance_eval { perform_initial_import } }.should raise_error(Puppet::Error)
     end
 
+    it "should not do anything if the ignore_import settings is set" do
+      Puppet.settings[:ignoreimport] = true
+      @parser.expects(:string=).never
+      @parser.expects(:file=).never
+      @parser.expects(:parse).never
+      @env.instance_eval { perform_initial_import }
+    end
+
     it "should mark the type collection as needing a reparse when there is an error parsing" do
       @parser.expects(:parse).raises Puppet::ParseError.new("Syntax error at ...")
       @env.stubs(:known_resource_types).returns Puppet::Resource::TypeCollection.new(@env)
 
       lambda { @env.instance_eval { perform_initial_import } }.should raise_error(Puppet::Error, /Syntax error at .../)
       @env.known_resource_types.require_reparse?.should be_true
     end
   end
 end
diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb
index 48a3f29d3..9367b61c8 100755
--- a/spec/unit/parser/type_loader_spec.rb
+++ b/spec/unit/parser/type_loader_spec.rb
@@ -1,224 +1,230 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'puppet/parser/type_loader'
 require 'puppet_spec/files'
 
 describe Puppet::Parser::TypeLoader do
   include PuppetSpec::Files
 
   before do
     @loader = Puppet::Parser::TypeLoader.new(:myenv)
   end
 
   it "should support an environment" do
     loader = Puppet::Parser::TypeLoader.new(:myenv)
     loader.environment.name.should == :myenv
   end
 
   it "should include the Environment Helper" do
     @loader.class.ancestors.should be_include(Puppet::Node::Environment::Helper)
   end
 
   it "should delegate its known resource types to its environment" do
     @loader.known_resource_types.should be_instance_of(Puppet::Resource::TypeCollection)
   end
 
   describe "when loading names from namespaces" do
     it "should do nothing if the name to import is an empty string" do
       @loader.expects(:name2files).never
       @loader.try_load_fqname(:hostclass, "") { |filename, modname| raise :should_not_occur }.should be_nil
     end
 
     it "should attempt to import each generated name" do
       @loader.expects(:import).with("foo/bar",nil).returns([])
       @loader.expects(:import).with("foo",nil).returns([])
       @loader.try_load_fqname(:hostclass, "foo::bar") { |f| false }
     end
   end
 
   describe "when importing" do
     before do
       Puppet::Parser::Files.stubs(:find_manifests).returns ["modname", %w{file}]
       Puppet::Parser::Parser.any_instance.stubs(:parse).returns(Puppet::Parser::AST::Hostclass.new(''))
       Puppet::Parser::Parser.any_instance.stubs(:file=)
     end
 
+    it "should return immediately when imports are being ignored" do
+      Puppet::Parser::Files.expects(:find_manifests).never
+      Puppet[:ignoreimport] = true
+      @loader.import("foo").should be_nil
+    end
+
     it "should find all manifests matching the file or pattern" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| pat == "myfile" }.returns ["modname", %w{one}]
       @loader.import("myfile")
     end
 
     it "should use the directory of the current file if one is set" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:cwd] == "/current" }.returns ["modname", %w{one}]
       @loader.import("myfile", "/current/file")
     end
 
     it "should pass the environment when looking for files" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:environment] == @loader.environment }.returns ["modname", %w{one}]
       @loader.import("myfile")
     end
 
     it "should fail if no files are found" do
       Puppet::Parser::Files.expects(:find_manifests).returns [nil, []]
       lambda { @loader.import("myfile") }.should raise_error(Puppet::ImportError)
     end
 
     it "should parse each found file" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
       @loader.expects(:parse_file).with("/one").returns(Puppet::Parser::AST::Hostclass.new(''))
       @loader.import("myfile")
     end
 
     it "should make each file qualified before attempting to parse it" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{one}]
       @loader.expects(:parse_file).with("/current/one").returns(Puppet::Parser::AST::Hostclass.new(''))
       @loader.import("myfile", "/current/file")
     end
 
     it "should not attempt to import files that have already been imported" do
       Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
       Puppet::Parser::Parser.any_instance.expects(:parse).once.returns(Puppet::Parser::AST::Hostclass.new(''))
       @loader.import("myfile")
 
       # This will fail if it tries to reimport the file.
       @loader.import("myfile")
     end
   end
 
   describe "when importing all" do
     before do
       @base = tmpdir("base")
 
       # Create two module path directories
       @modulebase1 = File.join(@base, "first")
       FileUtils.mkdir_p(@modulebase1)
       @modulebase2 = File.join(@base, "second")
       FileUtils.mkdir_p(@modulebase2)
 
       Puppet[:modulepath] = "#{@modulebase1}:#{@modulebase2}"
     end
 
     def mk_module(basedir, name)
       module_dir = File.join(basedir, name)
 
       # Go ahead and make our manifest directory
       FileUtils.mkdir_p(File.join(module_dir, "manifests"))
 
       return Puppet::Module.new(name)
     end
 
     # We have to pass the base path so that we can
     # write to modules that are in the second search path
     def mk_manifests(base, mod, type, files)
       exts = {"ruby" => ".rb", "puppet" => ".pp"}
       files.collect do |file|
         name = mod.name + "::" + file.gsub("/", "::")
         path = File.join(base, mod.name, "manifests", file + exts[type])
         FileUtils.mkdir_p(File.split(path)[0])
 
         # write out the class
         if type == "ruby"
           File.open(path, "w") { |f| f.print "hostclass '#{name}' do\nend" }
         else
           File.open(path, "w") { |f| f.print "class #{name} {}" }
         end
         name
       end
     end
 
     it "should load all puppet manifests from all modules in the specified environment" do
       @module1 = mk_module(@modulebase1, "one")
       @module2 = mk_module(@modulebase2, "two")
 
       mk_manifests(@modulebase1, @module1, "puppet", %w{a b})
       mk_manifests(@modulebase2, @module2, "puppet", %w{c d})
 
       @loader.import_all
 
       @loader.environment.known_resource_types.hostclass("one::a").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("one::b").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("two::c").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("two::d").should be_instance_of(Puppet::Resource::Type)
     end
 
     it "should load all ruby manifests from all modules in the specified environment" do
       @module1 = mk_module(@modulebase1, "one")
       @module2 = mk_module(@modulebase2, "two")
 
       mk_manifests(@modulebase1, @module1, "ruby", %w{a b})
       mk_manifests(@modulebase2, @module2, "ruby", %w{c d})
 
       @loader.import_all
 
       @loader.environment.known_resource_types.hostclass("one::a").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("one::b").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("two::c").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("two::d").should be_instance_of(Puppet::Resource::Type)
     end
 
     it "should not load manifests from duplicate modules later in the module path" do
       @module1 = mk_module(@modulebase1, "one")
 
       # duplicate
       @module2 = mk_module(@modulebase2, "one")
 
       mk_manifests(@modulebase1, @module1, "puppet", %w{a})
       mk_manifests(@modulebase2, @module2, "puppet", %w{c})
 
       @loader.import_all
 
       @loader.environment.known_resource_types.hostclass("one::c").should be_nil
     end
 
     it "should load manifests from subdirectories" do
       @module1 = mk_module(@modulebase1, "one")
 
       mk_manifests(@modulebase1, @module1, "puppet", %w{a a/b a/b/c})
 
       @loader.import_all
 
       @loader.environment.known_resource_types.hostclass("one::a::b").should be_instance_of(Puppet::Resource::Type)
       @loader.environment.known_resource_types.hostclass("one::a::b::c").should be_instance_of(Puppet::Resource::Type)
     end
   end
 
   describe "when parsing a file" do
     before do
       @parser = Puppet::Parser::Parser.new(@loader.environment)
       @parser.stubs(:parse).returns(Puppet::Parser::AST::Hostclass.new(''))
       @parser.stubs(:file=)
       Puppet::Parser::Parser.stubs(:new).with(@loader.environment).returns @parser
     end
 
     it "should create a new parser instance for each file using the current environment" do
       Puppet::Parser::Parser.expects(:new).with(@loader.environment).returns @parser
       @loader.parse_file("/my/file")
     end
 
     it "should assign the parser its file and parse" do
       @parser.expects(:file=).with("/my/file")
       @parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new(''))
       @loader.parse_file("/my/file")
     end
   end
 
   it "should be able to add classes to the current resource type collection" do
     file = tmpfile("simple_file.pp")
     File.open(file, "w") { |f| f.puts "class foo {}" }
     @loader.import(file)
 
     @loader.known_resource_types.hostclass("foo").should be_instance_of(Puppet::Resource::Type)
   end
 
   describe "when deciding where to look for files" do
     { 'foo' => ['foo'],
       'foo::bar' => ['foo/bar', 'foo'],
       'foo::bar::baz' => ['foo/bar/baz', 'foo/bar', 'foo']
     }.each do |fqname, expected_paths|
       it "should look for #{fqname.inspect} in #{expected_paths.inspect}" do
         @loader.instance_eval { name2files(fqname) }.should == expected_paths
       end
     end
   end
 end
diff --git a/spec/unit/util/rdoc_spec.rb b/spec/unit/util/rdoc_spec.rb
index df5f6d2de..067b5b8a7 100755
--- a/spec/unit/util/rdoc_spec.rb
+++ b/spec/unit/util/rdoc_spec.rb
@@ -1,135 +1,147 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'puppet/util/rdoc'
 require 'rdoc/rdoc'
 
 describe Puppet::Util::RDoc do
 
   describe "when generating RDoc HTML documentation" do
     before :each do
       @rdoc = stub_everything 'rdoc'
       RDoc::RDoc.stubs(:new).returns(@rdoc)
     end
 
+    it "should tell the parser to ignore import" do
+      Puppet.expects(:[]=).with(:ignoreimport, true)
+
+      Puppet::Util::RDoc.rdoc("output", [])
+    end
+
     it "should install the Puppet HTML Generator into RDoc generators" do
       Puppet::Util::RDoc.rdoc("output", [])
 
       RDoc::RDoc::GENERATORS["puppet"].file_name.should == "puppet/util/rdoc/generators/puppet_generator.rb"
     end
 
     it "should tell RDoc to generate documentation using the Puppet generator" do
       @rdoc.expects(:document).with { |args| args.include?("--fmt") and args.include?("puppet") }
 
       Puppet::Util::RDoc.rdoc("output", [])
     end
 
     it "should tell RDoc to be quiet" do
       @rdoc.expects(:document).with { |args| args.include?("--quiet") }
 
       Puppet::Util::RDoc.rdoc("output", [])
     end
 
     it "should pass charset to RDoc" do
       @rdoc.expects(:document).with { |args| args.include?("--charset") and args.include?("utf-8") }
 
       Puppet::Util::RDoc.rdoc("output", [], "utf-8")
     end
 
     it "should tell RDoc to force updates of indices when RDoc supports it" do
       Options::OptionList.stubs(:options).returns([["--force-update", "-U", 0 ]])
       @rdoc.expects(:document).with { |args| args.include?("--force-update") }
 
       Puppet::Util::RDoc.rdoc("output", [])
     end
 
     it "should not tell RDoc to force updates of indices when RDoc doesn't support it" do
       Options::OptionList.stubs(:options).returns([])
       @rdoc.expects(:document).never.with { |args| args.include?("--force-update") }
 
       Puppet::Util::RDoc.rdoc("output", [])
     end
 
     it "should tell RDoc to use the given outputdir" do
       @rdoc.expects(:document).with { |args| args.include?("--op") and args.include?("myoutputdir") }
 
       Puppet::Util::RDoc.rdoc("myoutputdir", [])
     end
 
     it "should tell RDoc to exclude .pp files under any modules/<mod>/files section" do
       @rdoc.expects(:document).with { |args| args.include?("--exclude") and args.include?("/modules/[^/]*/files/.*\.pp$") }
 
       Puppet::Util::RDoc.rdoc("myoutputdir", [])
     end
 
     it "should give all the source directories to RDoc" do
       @rdoc.expects(:document).with { |args| args.include?("sourcedir") }
 
       Puppet::Util::RDoc.rdoc("output", ["sourcedir"])
     end
   end
 
   describe "when running a manifest documentation" do
+    it "should tell the parser to ignore import" do
+      Puppet.expects(:[]=).with(:ignoreimport, true)
+
+      Puppet::Util::RDoc.manifestdoc([])
+    end
+
     it "should use a parser with the correct environment" do
       FileTest.stubs(:file?).returns(true)
       Puppet::Util::RDoc.stubs(:output)
 
       parser = stub_everything
       Puppet::Parser::Parser.stubs(:new).with{ |env| env.is_a?(Puppet::Node::Environment) }.returns(parser)
 
       parser.expects(:file=).with("file")
       parser.expects(:parse)
 
       Puppet::Util::RDoc.manifestdoc(["file"])
     end
 
     it "should puppet parse all given files" do
       FileTest.stubs(:file?).returns(true)
       Puppet::Util::RDoc.stubs(:output)
 
       parser = stub_everything
       Puppet::Parser::Parser.stubs(:new).returns(parser)
 
       parser.expects(:file=).with("file")
       parser.expects(:parse)
 
       Puppet::Util::RDoc.manifestdoc(["file"])
     end
 
     it "should call output for each parsed file" do
       FileTest.stubs(:file?).returns(true)
 
       ast = stub_everything
       parser = stub_everything
       Puppet::Parser::Parser.stubs(:new).returns(parser)
       parser.stubs(:parse).returns(ast)
 
       Puppet::Util::RDoc.expects(:output).with("file", ast)
 
       Puppet::Util::RDoc.manifestdoc(["file"])
     end
 
     describe "when outputing documentation" do
       it "should output doc for ast classes, nodes and definitions in order of increasing line number" do
         byline = sequence('documentation outputs in line order')
         Puppet::Util::RDoc.expects(:puts).with("im a class\n").in_sequence(byline)
         Puppet::Util::RDoc.expects(:puts).with("im a node\n").in_sequence(byline)
         Puppet::Util::RDoc.expects(:puts).with("im a define\n").in_sequence(byline)
         # any other output must fail
         Puppet::Util::RDoc.manifestdoc([my_fixture('basic.pp')])
       end
 
       it "should output resource documentation if needed" do
         pending "#6634 being fixed"
         Puppet.settings[:document_all] = true
         byline = sequence('documentation outputs in line order')
         Puppet::Util::RDoc.expects(:puts).with("im a class\n").in_sequence(byline)
         Puppet::Util::RDoc.expects(:puts).with("im a node\n").in_sequence(byline)
         Puppet::Util::RDoc.expects(:puts).with("im a define\n").in_sequence(byline)
         Puppet::Util::RDoc.expects(:puts).with("im a resource\n").in_sequence(byline)
         # any other output must fail
         Puppet::Util::RDoc.manifestdoc([my_fixture('basic.pp')])
       end
     end
   end
 end