Merge branch 'master' of ssh://reductivelabs.com/opt/rl/git/puppet

Conflicts:

	lib/puppet/defaults.rb
	lib/puppet/dsl.rb

186 files changed, 40 insertions, 223 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index c1f31e467..c09ec5971 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -117,6 +117,8 @@ module Puppet
     # Load all of the configuration parameters.
     require 'puppet/defaults'
 
+    # Prints the contents of a config file with the available config elements, or it
+    # prints a single value of a config element.
     def self.genconfig
         if Puppet[:configprint] != ""
             val = Puppet[:configprint]
@@ -428,4 +430,3 @@ if Puppet[:storeconfigs]
     require 'puppet/rails'
 end
 
-# $Id$
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index 52197f562..24d743764 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -81,4 +81,3 @@ module Puppet::Daemon
     end
 end
 
-# $Id$
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 45fe0f5b0..1b0b402ec 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -133,7 +133,11 @@ module Puppet
             is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
             This feature currently requires the ``diff/lcs`` Ruby library."],
         :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750",
-            :desc => "The directory in which YAML data is stored, usually in a subdirectory."}
+            :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
+        :daemonize => { :default => true,
+            :desc => "Send the process into the background.  This is the default.",
+            :short => "D"
+        }
     )
 
     hostname = Facter["hostname"].value
@@ -341,7 +345,7 @@ module Puppet
             :owner => "root",
             :mode => 0644,
             :desc => "The file in which puppetd stores a list of the classes
-                associated with the retrieved configuratiion.  Can be loaded in
+                associated with the retrieved configuration.  Can be loaded in
                 the separate ``puppet`` executable using the ``--loadclasses``
                 option."},
         :puppetdlog => { :default => "$logdir/puppetd.log",
@@ -652,4 +656,3 @@ module Puppet
     )
 end
 
-# $Id$
diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb
index 166745359..75bc81b2b 100644
--- a/lib/puppet/dsl.rb
+++ b/lib/puppet/dsl.rb
@@ -269,5 +269,3 @@ module Puppet
 end
 
 @aspects = {}
-
-# $Id$
diff --git a/lib/puppet/error.rb b/lib/puppet/error.rb
index 55fbf2e2f..971b31116 100644
--- a/lib/puppet/error.rb
+++ b/lib/puppet/error.rb
@@ -41,12 +41,5 @@ module Puppet # :nodoc:
     # An error class for when I don't know what happened.  Automatically
     # prints a stack trace when in debug mode.
     class DevError < Puppet::Error
-        # XXX This is probably the wrong way to do this, but...
-        def set_backtrace(trace)
-            if Puppet[:trace]
-                puts trace
-            end
-            super
-        end
     end
 end
diff --git a/lib/puppet/event.rb b/lib/puppet/event.rb
index 16e76bf50..c1928a354 100644
--- a/lib/puppet/event.rb
+++ b/lib/puppet/event.rb
@@ -26,4 +26,3 @@ module Puppet
 	end
 end
 
-# $Id$
diff --git a/lib/puppet/external/gratr/rdot.rb b/lib/puppet/external/gratr/rdot.rb
index 4ce545ae6..b94568c12 100644
--- a/lib/puppet/external/gratr/rdot.rb
+++ b/lib/puppet/external/gratr/rdot.rb
@@ -1,6 +1,5 @@
 # rdot.rb
 # 
-# $Id$
 #
 # This is a modified version of dot.rb from Dave Thomas's rdoc project.  I [Horst Duchene]
 # renamed it to rdot.rb to avoid collision with an installed rdoc/dot.
diff --git a/lib/puppet/external/lock.rb b/lib/puppet/external/lock.rb
index d873d1bbf..5213f5657 100644
--- a/lib/puppet/external/lock.rb
+++ b/lib/puppet/external/lock.rb
@@ -61,4 +61,3 @@ class File
     end
 end
 
-# $Id$
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 34407de66..63e6f00bc 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -49,4 +49,3 @@ Puppet.features.add(:rails) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/attributes.rb b/lib/puppet/metatype/attributes.rb
index 0ceb7f161..dc59ce6b6 100644
--- a/lib/puppet/metatype/attributes.rb
+++ b/lib/puppet/metatype/attributes.rb
@@ -688,4 +688,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/closure.rb b/lib/puppet/metatype/closure.rb
index 727bc6884..46e3c873f 100644
--- a/lib/puppet/metatype/closure.rb
+++ b/lib/puppet/metatype/closure.rb
@@ -95,4 +95,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/container.rb b/lib/puppet/metatype/container.rb
index 7bbccf8a0..2bbe3f546 100644
--- a/lib/puppet/metatype/container.rb
+++ b/lib/puppet/metatype/container.rb
@@ -48,4 +48,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/evaluation.rb b/lib/puppet/metatype/evaluation.rb
index b358fefad..0451d50a7 100644
--- a/lib/puppet/metatype/evaluation.rb
+++ b/lib/puppet/metatype/evaluation.rb
@@ -162,4 +162,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/instances.rb b/lib/puppet/metatype/instances.rb
index 4af230b28..2f9918067 100644
--- a/lib/puppet/metatype/instances.rb
+++ b/lib/puppet/metatype/instances.rb
@@ -314,4 +314,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb
index 2df2de489..e95b6fd07 100644
--- a/lib/puppet/metatype/manager.rb
+++ b/lib/puppet/metatype/manager.rb
@@ -139,4 +139,3 @@ module Manager
 end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb
index 92f12e6cb..1ab3f26c1 100644
--- a/lib/puppet/metatype/metaparams.rb
+++ b/lib/puppet/metatype/metaparams.rb
@@ -414,4 +414,3 @@ class Puppet::Type
     end
 end # Puppet::Type
 
-# $Id$
diff --git a/lib/puppet/metatype/relationships.rb b/lib/puppet/metatype/relationships.rb
index 494407e68..c7a0a91ee 100644
--- a/lib/puppet/metatype/relationships.rb
+++ b/lib/puppet/metatype/relationships.rb
@@ -113,4 +113,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/schedules.rb b/lib/puppet/metatype/schedules.rb
index 5cd242148..96ebce0ab 100644
--- a/lib/puppet/metatype/schedules.rb
+++ b/lib/puppet/metatype/schedules.rb
@@ -31,4 +31,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/metatype/tags.rb b/lib/puppet/metatype/tags.rb
index 2a78d89ec..1d96306dd 100644
--- a/lib/puppet/metatype/tags.rb
+++ b/lib/puppet/metatype/tags.rb
@@ -36,4 +36,3 @@ class Puppet::Type
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb
index ebf005022..8e3773719 100644
--- a/lib/puppet/network/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -165,4 +165,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/authorization.rb b/lib/puppet/network/authorization.rb
index a3c1d50e1..9ea4bf69e 100644
--- a/lib/puppet/network/authorization.rb
+++ b/lib/puppet/network/authorization.rb
@@ -81,4 +81,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index 9af118e09..c16bef32f 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -294,4 +294,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index 351888c9e..7950abe3f 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -190,4 +190,3 @@ class Puppet::Network::Client
     require 'puppet/network/client/proxy'
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/ca.rb b/lib/puppet/network/client/ca.rb
index 46fb9f51f..a2704e451 100644
--- a/lib/puppet/network/client/ca.rb
+++ b/lib/puppet/network/client/ca.rb
@@ -56,4 +56,3 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/dipper.rb b/lib/puppet/network/client/dipper.rb
index c16e37725..0ec7087e5 100644
--- a/lib/puppet/network/client/dipper.rb
+++ b/lib/puppet/network/client/dipper.rb
@@ -78,4 +78,3 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/file.rb b/lib/puppet/network/client/file.rb
index 381a10cdb..6dd2adab2 100644
--- a/lib/puppet/network/client/file.rb
+++ b/lib/puppet/network/client/file.rb
@@ -4,4 +4,3 @@ class Puppet::Network::Client::File < Puppet::Network::Client::ProxyClient
     self.mkmethods
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/proxy.rb b/lib/puppet/network/client/proxy.rb
index 4cd37bb5d..17b1b0e14 100644
--- a/lib/puppet/network/client/proxy.rb
+++ b/lib/puppet/network/client/proxy.rb
@@ -25,4 +25,3 @@ class Puppet::Network::Client::ProxyClient < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/report.rb b/lib/puppet/network/client/report.rb
index cb4711afe..9bd61de2e 100644
--- a/lib/puppet/network/client/report.rb
+++ b/lib/puppet/network/client/report.rb
@@ -28,4 +28,3 @@ class Puppet::Network::Client::Report < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/resource.rb b/lib/puppet/network/client/resource.rb
index bf026dff0..bc4a8e53f 100644
--- a/lib/puppet/network/client/resource.rb
+++ b/lib/puppet/network/client/resource.rb
@@ -49,4 +49,3 @@ class Puppet::Network::Client::Resource < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/runner.rb b/lib/puppet/network/client/runner.rb
index 12097c52f..5806dd343 100644
--- a/lib/puppet/network/client/runner.rb
+++ b/lib/puppet/network/client/runner.rb
@@ -10,4 +10,3 @@ class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/status.rb b/lib/puppet/network/client/status.rb
index d35e44c1a..9dc22b606 100644
--- a/lib/puppet/network/client/status.rb
+++ b/lib/puppet/network/client/status.rb
@@ -2,4 +2,3 @@ class Puppet::Network::Client::Status < Puppet::Network::Client::ProxyClient
     self.mkmethods
 end
 
-# $Id$
diff --git a/lib/puppet/network/client_request.rb b/lib/puppet/network/client_request.rb
index 16a9d9993..86dd31bcf 100644
--- a/lib/puppet/network/client_request.rb
+++ b/lib/puppet/network/client_request.rb
@@ -29,4 +29,3 @@ module Puppet::Network # :nodoc:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler.rb b/lib/puppet/network/handler.rb
index c2fbfcba5..f6a658662 100644
--- a/lib/puppet/network/handler.rb
+++ b/lib/puppet/network/handler.rb
@@ -51,4 +51,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/ca.rb b/lib/puppet/network/handler/ca.rb
index 052eb5c19..de7a976c8 100644
--- a/lib/puppet/network/handler/ca.rb
+++ b/lib/puppet/network/handler/ca.rb
@@ -155,4 +155,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index 2df1b3ab4..353693bdc 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -107,16 +107,13 @@ class Puppet::Network::Handler
             benchmark(level, "Compiled configuration for %s" % node.name) do
                 begin
                     config = interpreter.compile(node)
-                rescue Puppet::Error => detail
-                    if Puppet[:trace]
-                        puts detail.backtrace
-                    end
-                    unless local?
-                        Puppet.err detail.to_s
-                    end
-                    raise XMLRPC::FaultException.new(
-                        1, detail.to_s
-                    )
+                rescue => detail
+                    # If we're local, then we leave it to the local system
+                    # to handle error reporting, but otherwise we do it here
+                    # so the interpreter doesn't need to know if the parser
+                    # is local or not.
+                    Puppet.err(detail.to_s) unless local?
+                    raise
                 end
             end
 
diff --git a/lib/puppet/network/handler/filebucket.rb b/lib/puppet/network/handler/filebucket.rb
index 1bf8da854..38ef7f3f2 100755
--- a/lib/puppet/network/handler/filebucket.rb
+++ b/lib/puppet/network/handler/filebucket.rb
@@ -180,4 +180,3 @@ class Puppet::Network::Handler # :nodoc:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index ae0e6553d..dd00450be 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -676,4 +676,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 030950c61..25c4318b8 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -77,12 +77,7 @@ class Puppet::Network::Handler
             Puppet::Node::Facts.new(client, facts).save
 
             # And get the configuration from the config handler
-            begin
-                config = config_handler.configuration(client)
-            rescue => detail
-                puts detail.backtrace
-                raise
-            end
+            config = config_handler.configuration(client)
 
             return translate(config.extract)
         end
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 62e9cfdec..e202d4e2a 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -142,4 +142,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb
index 7709b85fe..0fcd694fb 100755
--- a/lib/puppet/network/handler/resource.rb
+++ b/lib/puppet/network/handler/resource.rb
@@ -192,4 +192,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/runner.rb b/lib/puppet/network/handler/runner.rb
index 4b9ccab75..a8d0da9ce 100755
--- a/lib/puppet/network/handler/runner.rb
+++ b/lib/puppet/network/handler/runner.rb
@@ -62,4 +62,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/status.rb b/lib/puppet/network/handler/status.rb
index 48668ca47..fbdc7a765 100644
--- a/lib/puppet/network/handler/status.rb
+++ b/lib/puppet/network/handler/status.rb
@@ -14,4 +14,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/rights.rb b/lib/puppet/network/rights.rb
index 970a7aacf..a4133f22c 100755
--- a/lib/puppet/network/rights.rb
+++ b/lib/puppet/network/rights.rb
@@ -71,4 +71,3 @@ class Puppet::Network::Rights < Hash
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 1bf3f5f63..0dee30b10 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -2,4 +2,3 @@
 module Puppet::Network::Server # :nodoc:
 end
 
-# $Id$
diff --git a/lib/puppet/network/server/mongrel.rb b/lib/puppet/network/server/mongrel.rb
index 5bce40756..8cd7e807b 100644
--- a/lib/puppet/network/server/mongrel.rb
+++ b/lib/puppet/network/server/mongrel.rb
@@ -137,4 +137,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/server/webrick.rb b/lib/puppet/network/server/webrick.rb
index f24411ab3..dd9a91c7c 100644
--- a/lib/puppet/network/server/webrick.rb
+++ b/lib/puppet/network/server/webrick.rb
@@ -161,4 +161,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index eb8d1b9ca..c652dbf8d 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -151,4 +151,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/processor.rb b/lib/puppet/network/xmlrpc/processor.rb
index 248354696..2c2dc61ec 100644
--- a/lib/puppet/network/xmlrpc/processor.rb
+++ b/lib/puppet/network/xmlrpc/processor.rb
@@ -88,4 +88,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/server.rb b/lib/puppet/network/xmlrpc/server.rb
index bd05703ba..e7435268a 100644
--- a/lib/puppet/network/xmlrpc/server.rb
+++ b/lib/puppet/network/xmlrpc/server.rb
@@ -17,4 +17,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb
index 0ddb056dc..9a46ffb7c 100644
--- a/lib/puppet/network/xmlrpc/webrick_servlet.rb
+++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb
@@ -118,4 +118,3 @@ module Puppet::Network::XMLRPC
     end
 end
 
-# $Id$
diff --git a/lib/puppet/node/configuration.rb b/lib/puppet/node/configuration.rb
index 53f63d003..3571eecda 100644
--- a/lib/puppet/node/configuration.rb
+++ b/lib/puppet/node/configuration.rb
@@ -226,9 +226,10 @@ class Puppet::Node::Configuration < Puppet::PGraph
             raise Puppet::DevError, "Could not find 'main' class; cannot generate configuration"
         end
 
-        # Retrive the bucket for the top-level scope and set the appropriate metadata.
+        # Retrieve the bucket for the top-level scope and set the appropriate metadata.
         unless result = buckets[main.to_s]
-            raise Puppet::DevError, "Did not evaluate top scope"
+            # This only happens when the configuration is entirely empty.
+            result = buckets[main.to_s] = main.to_trans
         end
 
         result.classes = classes
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index 8f4baa33e..d15c1f622 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -484,4 +484,3 @@ class Puppet::Parameter
     end
 end
 
-# $Id$
diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index ce5e8263e..14b686e2f 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -117,4 +117,3 @@ end
 
 require 'puppet/parser/ast/leaf'
 
-# $Id$
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 7ffdb6ccb..1d07122d4 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -200,11 +200,9 @@ module Functions
     end
 
     newfunction(:template, :type => :rvalue, :doc => "Evaluate a template and
-    return its value.  See `the templating docs`_
+    return its value.  See `the templating docs </trac/puppet/wiki/PuppetTemplating>`_
     for more information.  Note that if multiple templates are specified, their
     output is all concatenated and returned as the output of the function.
-    
-    .. _the templating docs: /trac/puppet/wiki/PuppetTemplating
     ") do |vals|
         require 'erb'
 
@@ -304,4 +302,3 @@ module Functions
 end
 end
 
-# $Id$
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index 81867c84b..0b8c035ba 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -25,7 +25,8 @@ class Puppet::Parser::Interpreter
 
     # evaluate our whole tree
     def compile(node)
-        return Puppet::Parser::Compile.new(node, parser(node.environment), :ast_nodes => usenodes?).compile
+        raise Puppet::ParseError, "Could not parse configuration; cannot compile" unless env_parser = parser(node.environment)
+        return Puppet::Parser::Compile.new(node, env_parser, :ast_nodes => usenodes?).compile
     end
 
     # create our interpreter
@@ -74,15 +75,14 @@ class Puppet::Parser::Interpreter
             parser.parse
             return parser
         rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
             msg = "Could not parse"
             if environment and environment != ""
                 msg += " for environment %s" % environment
             end
-            msg += ": %s" % detail
-            raise Puppet::Error, detail
+            msg += ": %s" % detail.to_s
+            error = Puppet::Error.new(msg)
+            error.set_backtrace(detail.backtrace)
+            raise error
         end
     end
 
@@ -96,8 +96,11 @@ class Puppet::Parser::Interpreter
                 tmp = create_parser(environment)
                 @parsers[environment].clear if @parsers[environment]
                 @parsers[environment] = tmp
-            rescue
-                # Nothing, yo.
+            rescue => detail
+                # If a parser already exists, than assume that we logged the
+                # exception elsewhere and reuse the parser.  If one doesn't
+                # exist, then reraise.
+                raise detail unless @parsers[environment]
             end
         end
         @parsers[environment]
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index 360ed4254..086d82c09 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -330,4 +330,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index b4e9b84d7..c3279d4e7 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -39,7 +39,6 @@ require 'puppet/parser/parser_support'
 # mode: ruby
 # End:
 
-# $Id$
 
 ..end grammar.ra modeval..id9134b179f4
 
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index 4332bee85..6bde0674e 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -88,4 +88,3 @@ class Puppet::Parser::Resource::Param
     end
 end
 
-# $Id$
diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb
index f863e31aa..13823d483 100644
--- a/lib/puppet/parser/templatewrapper.rb
+++ b/lib/puppet/parser/templatewrapper.rb
@@ -51,4 +51,3 @@ class Puppet::Parser::TemplateWrapper
     end
 end
 
-# $Id$
diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb
index 059d7c410..cd3c35b38 100644
--- a/lib/puppet/property.rb
+++ b/lib/puppet/property.rb
@@ -557,4 +557,3 @@ class Property < Puppet::Parameter
 end
 end
 
-# $Id$
diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb
index 5a38f7f20..53a2c5605 100644
--- a/lib/puppet/provider.rb
+++ b/lib/puppet/provider.rb
@@ -372,4 +372,3 @@ class Puppet::Provider
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb
index 6539e39d3..7ddcc0505 100755
--- a/lib/puppet/provider/cron/crontab.rb
+++ b/lib/puppet/provider/cron/crontab.rb
@@ -198,4 +198,3 @@ Puppet::Type.type(:cron).provide(:crontab,
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/group/groupadd.rb b/lib/puppet/provider/group/groupadd.rb
index b41ff6f93..4df5bf40d 100644
--- a/lib/puppet/provider/group/groupadd.rb
+++ b/lib/puppet/provider/group/groupadd.rb
@@ -26,4 +26,3 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/group/netinfo.rb b/lib/puppet/provider/group/netinfo.rb
index eb98c0066..b2174778f 100644
--- a/lib/puppet/provider/group/netinfo.rb
+++ b/lib/puppet/provider/group/netinfo.rb
@@ -9,4 +9,3 @@ Puppet::Type.type(:group).provide :netinfo, :parent => Puppet::Provider::NameSer
     defaultfor :operatingsystem => :darwin
 end
 
-# $Id$
diff --git a/lib/puppet/provider/group/pw.rb b/lib/puppet/provider/group/pw.rb
index d2b9611b1..3c384cd6d 100644
--- a/lib/puppet/provider/group/pw.rb
+++ b/lib/puppet/provider/group/pw.rb
@@ -28,4 +28,3 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/host/netinfo.rb b/lib/puppet/provider/host/netinfo.rb
index 97a3b99e7..07a9362c5 100644
--- a/lib/puppet/provider/host/netinfo.rb
+++ b/lib/puppet/provider/host/netinfo.rb
@@ -14,4 +14,3 @@ Puppet::Type.type(:host).provide :netinfo, :parent => Puppet::Provider::NameServ
     defaultfor :operatingsystem => :darwin
 end
 
-# $Id$
diff --git a/lib/puppet/provider/host/parsed.rb b/lib/puppet/provider/host/parsed.rb
index e2e0786dc..a4812babe 100644
--- a/lib/puppet/provider/host/parsed.rb
+++ b/lib/puppet/provider/host/parsed.rb
@@ -70,4 +70,3 @@ Puppet::Type.type(:host).provide(:parsed,
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/interface/redhat.rb b/lib/puppet/provider/interface/redhat.rb
index 2f8611811..2f9c36903 100644
--- a/lib/puppet/provider/interface/redhat.rb
+++ b/lib/puppet/provider/interface/redhat.rb
@@ -248,4 +248,3 @@ LOOPBACKDUMMY
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/interface/sunos.rb b/lib/puppet/provider/interface/sunos.rb
index abe9dd8c6..6c55eae8e 100644
--- a/lib/puppet/provider/interface/sunos.rb
+++ b/lib/puppet/provider/interface/sunos.rb
@@ -113,4 +113,3 @@ Puppet::Type.type(:interface).provide(:sunos,
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/mailalias/aliases.rb b/lib/puppet/provider/mailalias/aliases.rb
index e3bf2c59f..85dec29cc 100755
--- a/lib/puppet/provider/mailalias/aliases.rb
+++ b/lib/puppet/provider/mailalias/aliases.rb
@@ -28,4 +28,3 @@ Puppet::Type.type(:mailalias).provide(:aliases,
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/maillist/mailman.rb b/lib/puppet/provider/maillist/mailman.rb
index 903689178..4e225fe0a 100755
--- a/lib/puppet/provider/maillist/mailman.rb
+++ b/lib/puppet/provider/maillist/mailman.rb
@@ -110,4 +110,3 @@ Puppet::Type.type(:maillist).provide(:mailman) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/mount/netinfo.rb b/lib/puppet/provider/mount/netinfo.rb
index ca3aee107..2cb125776 100644
--- a/lib/puppet/provider/mount/netinfo.rb
+++ b/lib/puppet/provider/mount/netinfo.rb
@@ -35,4 +35,3 @@ require 'puppet/provider/mount'
 #     end
 # end
 
-# $Id$
diff --git a/lib/puppet/provider/mount/parsed.rb b/lib/puppet/provider/mount/parsed.rb
index fa4383eb2..20908333d 100755
--- a/lib/puppet/provider/mount/parsed.rb
+++ b/lib/puppet/provider/mount/parsed.rb
@@ -34,4 +34,3 @@ Puppet::Type.type(:mount).provide(:parsed,
     record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => [:pass, :dump]
 end
 
-# $Id$
diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb
index bc205d43a..bba6c98ad 100644
--- a/lib/puppet/provider/nameservice.rb
+++ b/lib/puppet/provider/nameservice.rb
@@ -329,4 +329,3 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/nameservice/netinfo.rb b/lib/puppet/provider/nameservice/netinfo.rb
index f03e67445..29600052b 100644
--- a/lib/puppet/provider/nameservice/netinfo.rb
+++ b/lib/puppet/provider/nameservice/netinfo.rb
@@ -207,4 +207,3 @@ class NetInfo < Puppet::Provider::NameService
 end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/nameservice/objectadd.rb b/lib/puppet/provider/nameservice/objectadd.rb
index f7865185d..8ebf8924b 100644
--- a/lib/puppet/provider/nameservice/objectadd.rb
+++ b/lib/puppet/provider/nameservice/objectadd.rb
@@ -42,4 +42,3 @@ class ObjectAdd < Puppet::Provider::NameService
 end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/nameservice/pw.rb b/lib/puppet/provider/nameservice/pw.rb
index 0ee9d1d2c..4e8134627 100644
--- a/lib/puppet/provider/nameservice/pw.rb
+++ b/lib/puppet/provider/nameservice/pw.rb
@@ -19,4 +19,3 @@ class PW < ObjectAdd
 end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package.rb b/lib/puppet/provider/package.rb
index 24293e235..094bfb9f4 100644
--- a/lib/puppet/provider/package.rb
+++ b/lib/puppet/provider/package.rb
@@ -28,4 +28,3 @@ class Puppet::Provider::Package < Puppet::Provider
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb
index 1041e55d4..e822be14c 100644
--- a/lib/puppet/provider/package/appdmg.rb
+++ b/lib/puppet/provider/package/appdmg.rb
@@ -114,4 +114,3 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb
index 83606fc51..b211b7e12 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -52,4 +52,3 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index b48d71625..016623d71 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -116,4 +116,3 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index cad7449f4..699df0e51 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -29,4 +29,3 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
 	end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb
index 12dd7f378..9b3e7f015 100644
--- a/lib/puppet/provider/package/aptrpm.rb
+++ b/lib/puppet/provider/package/aptrpm.rb
@@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/blastwave.rb b/lib/puppet/provider/package/blastwave.rb
index e22fa1a69..402e8a1de 100755
--- a/lib/puppet/provider/package/blastwave.rb
+++ b/lib/puppet/provider/package/blastwave.rb
@@ -113,4 +113,3 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb
index 1f317d31c..73d5f395d 100755
--- a/lib/puppet/provider/package/darwinport.rb
+++ b/lib/puppet/provider/package/darwinport.rb
@@ -86,4 +86,3 @@ Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Pa
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
index d2f7048b9..44e6a985c 100755
--- a/lib/puppet/provider/package/dpkg.rb
+++ b/lib/puppet/provider/package/dpkg.rb
@@ -122,4 +122,3 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb
index 4bc857458..e0933df08 100755
--- a/lib/puppet/provider/package/fink.rb
+++ b/lib/puppet/provider/package/fink.rb
@@ -84,4 +84,3 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
      end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index 7e94bb795..f98f3064e 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -39,4 +39,3 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb
index f160adeb7..6e777a735 100755
--- a/lib/puppet/provider/package/gem.rb
+++ b/lib/puppet/provider/package/gem.rb
@@ -101,4 +101,3 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 11662abe8..093e509e5 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -85,4 +85,3 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb
index c068129ca..aa6de3245 100644
--- a/lib/puppet/provider/package/pkgdmg.rb
+++ b/lib/puppet/provider/package/pkgdmg.rb
@@ -190,4 +190,3 @@ package { Thunderbird-2.0.0.4-1.pkg.dmg:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index bcfcfde2e..866ec8730 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -115,4 +115,3 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb
index c17e47674..17a2755b4 100755
--- a/lib/puppet/provider/package/ports.rb
+++ b/lib/puppet/provider/package/ports.rb
@@ -93,4 +93,3 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index 6e0ba5070..4af299283 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -114,4 +114,3 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb
index 92a5d0ef0..e204e6d58 100755
--- a/lib/puppet/provider/package/sun.rb
+++ b/lib/puppet/provider/package/sun.rb
@@ -167,4 +167,3 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/sunfreeware.rb b/lib/puppet/provider/package/sunfreeware.rb
index 6c5e1d702..8b573fe2b 100755
--- a/lib/puppet/provider/package/sunfreeware.rb
+++ b/lib/puppet/provider/package/sunfreeware.rb
@@ -6,4 +6,3 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source
     commands :pkgget => "pkg-get"
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index 24cdfab21..dde633db4 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -38,4 +38,3 @@ Puppet.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/urpmi.rb b/lib/puppet/provider/package/urpmi.rb
index f19c6f41f..8adc62ab4 100644
--- a/lib/puppet/provider/package/urpmi.rb
+++ b/lib/puppet/provider/package/urpmi.rb
@@ -58,4 +58,3 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb
index a9427061c..7998b92c0 100755
--- a/lib/puppet/provider/package/yum.rb
+++ b/lib/puppet/provider/package/yum.rb
@@ -95,4 +95,3 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb
index b0c0f4d44..76654c4f4 100755
--- a/lib/puppet/provider/parsedfile.rb
+++ b/lib/puppet/provider/parsedfile.rb
@@ -362,4 +362,3 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/port/parsed.rb b/lib/puppet/provider/port/parsed.rb
index f5f12d3a1..68be0aa7c 100755
--- a/lib/puppet/provider/port/parsed.rb
+++ b/lib/puppet/provider/port/parsed.rb
@@ -171,4 +171,3 @@ require 'puppet/provider/parsedfile'
 #    end
 #end
 
-# $Id$
diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index 971375126..43e78e6e8 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -131,4 +131,3 @@ Puppet::Type.type(:service).provide :base do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index f7c5f3ced..d810eac1b 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -29,4 +29,3 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb
index 51a77a157..c3328f517 100755
--- a/lib/puppet/provider/service/init.rb
+++ b/lib/puppet/provider/service/init.rb
@@ -146,4 +146,3 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index feba05eef..41a060ee4 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -56,4 +56,3 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb
index f25f65cd1..c74ce3f8f 100755
--- a/lib/puppet/provider/service/smf.rb
+++ b/lib/puppet/provider/service/smf.rb
@@ -82,4 +82,3 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/sshkey/parsed.rb b/lib/puppet/provider/sshkey/parsed.rb
index d6e175cf8..cb1010c5b 100755
--- a/lib/puppet/provider/sshkey/parsed.rb
+++ b/lib/puppet/provider/sshkey/parsed.rb
@@ -33,4 +33,3 @@ Puppet::Type.type(:sshkey).provide(:parsed,
         }
 end
 
-# $Id$
diff --git a/lib/puppet/provider/user/netinfo.rb b/lib/puppet/provider/user/netinfo.rb
index 35c1c6cd9..fccc6c294 100644
--- a/lib/puppet/provider/user/netinfo.rb
+++ b/lib/puppet/provider/user/netinfo.rb
@@ -103,4 +103,3 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb
index 1921a7e78..a2fb52fa8 100644
--- a/lib/puppet/provider/user/pw.rb
+++ b/lib/puppet/provider/user/pw.rb
@@ -43,4 +43,3 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index dd05952f5..c2476203a 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -59,4 +59,3 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id$
diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb
index 5c89b86d9..dd8698b92 100644
--- a/lib/puppet/provider/zone/solaris.rb
+++ b/lib/puppet/provider/zone/solaris.rb
@@ -240,4 +240,3 @@ set zonepath=%s
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 53dafce79..e9be5a547 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -124,4 +124,3 @@ if Puppet.features.rails?
     require 'puppet/rails/host'
 end
 
-# $Id$
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb
index c3f525679..5365ce2a4 100644
--- a/lib/puppet/rails/database/schema.rb
+++ b/lib/puppet/rails/database/schema.rb
@@ -107,4 +107,3 @@ class Puppet::Rails::Schema
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb
index b7ca4c2e4..e0a26bdd4 100644
--- a/lib/puppet/rails/host.rb
+++ b/lib/puppet/rails/host.rb
@@ -154,4 +154,3 @@ class Puppet::Rails::Host < ActiveRecord::Base
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails/param_name.rb b/lib/puppet/rails/param_name.rb
index 95669264c..55d3727f9 100644
--- a/lib/puppet/rails/param_name.rb
+++ b/lib/puppet/rails/param_name.rb
@@ -19,4 +19,3 @@ class Puppet::Rails::ParamName < ActiveRecord::Base
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails/param_value.rb b/lib/puppet/rails/param_value.rb
index a176413eb..02c29c540 100644
--- a/lib/puppet/rails/param_value.rb
+++ b/lib/puppet/rails/param_value.rb
@@ -22,4 +22,3 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails/puppet_class.rb b/lib/puppet/rails/puppet_class.rb
index 1e8784ddb..35cef8974 100644
--- a/lib/puppet/rails/puppet_class.rb
+++ b/lib/puppet/rails/puppet_class.rb
@@ -4,4 +4,3 @@ class Puppet::Rails::PuppetClass < ActiveRecord::Base
     has_many :hosts
 end
 
-# $Id$
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
index 4b09002b8..c37b2e7dd 100644
--- a/lib/puppet/reference/configuration.rb
+++ b/lib/puppet/reference/configuration.rb
@@ -73,10 +73,14 @@ the client configuration.
 
 Configuration Files
 +++++++++++++++++++
-As mentioned above, the configuration parameters can also be stored in a 
-configuration file, located in the configuration directory (`/etc/puppet` 
-by default).  As of 0.23.0, all executables look for ``puppet.conf`` in their
-configuration directory (although they previously looked for separate 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 ``/etc/puppet``, and as a regular user, the
+default configuration directory is ``~user/.puppet``.  As of 0.23.0, all
+executables look for ``puppet.conf`` in their configuration directory
+(although they previously looked for separate files).  For example,
+``puppet.conf`` is located at ``/etc/puppet/puppet.conf`` as root and
+``~user/.puppet/puppet.conf`` as a regular user by default.
 
 All executables will set any parameters set within the ``main`` section,
 while each executable will also look for a section named for the executable
diff --git a/lib/puppet/relationship.rb b/lib/puppet/relationship.rb
index c848340d7..0b958fa39 100644
--- a/lib/puppet/relationship.rb
+++ b/lib/puppet/relationship.rb
@@ -60,4 +60,3 @@ class Puppet::Relationship < GRATR::Edge
     end
 end
 
-# $Id$
diff --git a/lib/puppet/reports/log.rb b/lib/puppet/reports/log.rb
index 96f14767b..8f7b95f8b 100644
--- a/lib/puppet/reports/log.rb
+++ b/lib/puppet/reports/log.rb
@@ -11,4 +11,3 @@ Puppet::Network::Handler.report.newreport(:log) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb
index 1516d331a..9ab1f4b17 100644
--- a/lib/puppet/reports/rrdgraph.rb
+++ b/lib/puppet/reports/rrdgraph.rb
@@ -135,4 +135,3 @@ Puppet::Network::Handler.report.newreport(:rrdgraph) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index 389de4e6e..0c3e86f37 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -61,4 +61,3 @@ Puppet::Network::Handler.report.newreport(:store, :useyaml => true) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 8c65524ee..fd9126a1a 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -167,4 +167,3 @@ Puppet::Network::Handler.report.newreport(:tagmail) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/sslcertificates.rb b/lib/puppet/sslcertificates.rb
index 357959d0b..45b9e7a72 100755
--- a/lib/puppet/sslcertificates.rb
+++ b/lib/puppet/sslcertificates.rb
@@ -142,4 +142,3 @@ module Puppet::SSLCertificates
     require 'puppet/sslcertificates/ca'
 end
 
-# $Id$
diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb
index fd416dd5e..39facdd48 100644
--- a/lib/puppet/sslcertificates/ca.rb
+++ b/lib/puppet/sslcertificates/ca.rb
@@ -414,4 +414,3 @@ class Puppet::SSLCertificates::CA
     end
 end
 
-# $Id$
diff --git a/lib/puppet/sslcertificates/certificate.rb b/lib/puppet/sslcertificates/certificate.rb
index e56bfa266..a632cbd6c 100644
--- a/lib/puppet/sslcertificates/certificate.rb
+++ b/lib/puppet/sslcertificates/certificate.rb
@@ -280,4 +280,3 @@ class Puppet::SSLCertificates::Certificate
     end
 end
 
-# $Id$
diff --git a/lib/puppet/sslcertificates/inventory.rb b/lib/puppet/sslcertificates/inventory.rb
index 14d2155a8..da959aa3b 100644
--- a/lib/puppet/sslcertificates/inventory.rb
+++ b/lib/puppet/sslcertificates/inventory.rb
@@ -37,4 +37,3 @@ module Puppet::SSLCertificates
     end
 end
 
-# $Id$
diff --git a/lib/puppet/sslcertificates/support.rb b/lib/puppet/sslcertificates/support.rb
index c8d2e846b..e63458b33 100644
--- a/lib/puppet/sslcertificates/support.rb
+++ b/lib/puppet/sslcertificates/support.rb
@@ -125,4 +125,3 @@ module Puppet::SSLCertificates::Support
     end
 end
 
-# $Id$
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 4e2ab702f..e00a57f40 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -730,4 +730,3 @@ end
 
 require 'puppet/transaction/report'
 
-# $Id$
diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 095b6c810..19dd1b629 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -76,4 +76,3 @@ class Puppet::Transaction::Report
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 19f676ff4..0a6ccdaa4 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -415,4 +415,3 @@ require 'puppet/type/tidy'
 
 
 
-# $Id$
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index bc1de4353..3154098db 100755
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -408,5 +408,4 @@ Puppet::Type.newtype(:cron) do
 end
 
 
-# $Id$
 
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 5e281978a..42c3516d4 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -602,4 +602,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/group.rb b/lib/puppet/type/group.rb
index e0291136a..36a4d49fa 100755
--- a/lib/puppet/type/group.rb
+++ b/lib/puppet/type/group.rb
@@ -129,4 +129,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/host.rb b/lib/puppet/type/host.rb
index 6a2e9082d..be5c2ed72 100755
--- a/lib/puppet/type/host.rb
+++ b/lib/puppet/type/host.rb
@@ -86,4 +86,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/interface.rb b/lib/puppet/type/interface.rb
index e0ad34761..1ddf68641 100644
--- a/lib/puppet/type/interface.rb
+++ b/lib/puppet/type/interface.rb
@@ -54,4 +54,3 @@ Puppet::Type.newtype(:interface) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb
index 79dfe42cc..92f609267 100755
--- a/lib/puppet/type/mailalias.rb
+++ b/lib/puppet/type/mailalias.rb
@@ -47,4 +47,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb
index fd536b51e..7273488ee 100755
--- a/lib/puppet/type/maillist.rb
+++ b/lib/puppet/type/maillist.rb
@@ -54,4 +54,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index 2a393391d..0ad879e4f 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -213,4 +213,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb
index 743755108..548cf760c 100644
--- a/lib/puppet/type/notify.rb
+++ b/lib/puppet/type/notify.rb
@@ -43,4 +43,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
index ed4caee2d..e04f651a9 100644
--- a/lib/puppet/type/package.rb
+++ b/lib/puppet/type/package.rb
@@ -403,4 +403,3 @@ module Puppet
     end # Puppet.type(:package)
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 5bf9fef78..1507c1725 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -1176,4 +1176,3 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id$
diff --git a/lib/puppet/type/pfile/checksum.rb b/lib/puppet/type/pfile/checksum.rb
index b5e6ab940..08f48ea21 100755
--- a/lib/puppet/type/pfile/checksum.rb
+++ b/lib/puppet/type/pfile/checksum.rb
@@ -324,4 +324,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/ensure.rb b/lib/puppet/type/pfile/ensure.rb
index 42c472117..0a6f73d95 100755
--- a/lib/puppet/type/pfile/ensure.rb
+++ b/lib/puppet/type/pfile/ensure.rb
@@ -172,4 +172,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/group.rb b/lib/puppet/type/pfile/group.rb
index b43b3c29d..9625b6354 100755
--- a/lib/puppet/type/pfile/group.rb
+++ b/lib/puppet/type/pfile/group.rb
@@ -118,4 +118,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/mode.rb b/lib/puppet/type/pfile/mode.rb
index 08dee9903..8674e0a88 100755
--- a/lib/puppet/type/pfile/mode.rb
+++ b/lib/puppet/type/pfile/mode.rb
@@ -132,4 +132,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/owner.rb b/lib/puppet/type/pfile/owner.rb
index 96325a0e0..d3fedd44e 100755
--- a/lib/puppet/type/pfile/owner.rb
+++ b/lib/puppet/type/pfile/owner.rb
@@ -167,4 +167,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/target.rb b/lib/puppet/type/pfile/target.rb
index be3481528..b4a6481e0 100644
--- a/lib/puppet/type/pfile/target.rb
+++ b/lib/puppet/type/pfile/target.rb
@@ -72,4 +72,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfile/type.rb b/lib/puppet/type/pfile/type.rb
index b0ceb4b23..65539795b 100755
--- a/lib/puppet/type/pfile/type.rb
+++ b/lib/puppet/type/pfile/type.rb
@@ -24,4 +24,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/pfilebucket.rb b/lib/puppet/type/pfilebucket.rb
index df30c1872..cf4e5aac3 100755
--- a/lib/puppet/type/pfilebucket.rb
+++ b/lib/puppet/type/pfilebucket.rb
@@ -115,4 +115,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/port.rb b/lib/puppet/type/port.rb
index dc2220070..db72b2331 100755
--- a/lib/puppet/type/port.rb
+++ b/lib/puppet/type/port.rb
@@ -116,4 +116,3 @@
 #    end
 #end
 
-# $Id$
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index 549026b07..c0d892bb8 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -149,4 +149,3 @@ Puppet::Type.newtype(:resources) do
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb
index 4b39f7b07..46cff10f5 100755
--- a/lib/puppet/type/schedule.rb
+++ b/lib/puppet/type/schedule.rb
@@ -358,4 +358,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 9d94cc8a0..24237de35 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -312,4 +312,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb
index b047ff1cd..bf4b0aac8 100755
--- a/lib/puppet/type/sshkey.rb
+++ b/lib/puppet/type/sshkey.rb
@@ -72,4 +72,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index 8b3ea6a76..f235d2e55 100755
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -292,4 +292,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index 80b1ddf02..48e35f2c8 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -343,4 +343,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/type/zone.rb b/lib/puppet/type/zone.rb
index 54220a0fc..4fd92672c 100644
--- a/lib/puppet/type/zone.rb
+++ b/lib/puppet/type/zone.rb
@@ -400,4 +400,3 @@ end
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 5a10f5344..2e83a08e9 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -461,4 +461,3 @@ require 'puppet/util/logging'
 require 'puppet/util/package'
 require 'puppet/util/warnings'
 
-# $Id$
diff --git a/lib/puppet/util/classgen.rb b/lib/puppet/util/classgen.rb
index 0c774eecd..4e1e57c85 100644
--- a/lib/puppet/util/classgen.rb
+++ b/lib/puppet/util/classgen.rb
@@ -205,4 +205,3 @@ module Puppet::Util::ClassGen
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
index 38a6eeb26..aabf58d89 100644
--- a/lib/puppet/util/docs.rb
+++ b/lib/puppet/util/docs.rb
@@ -101,4 +101,3 @@ module Puppet::Util::Docs
     module_function :scrub
 end
 
-# $Id$
diff --git a/lib/puppet/util/errors.rb b/lib/puppet/util/errors.rb
index d077abdee..badba595c 100644
--- a/lib/puppet/util/errors.rb
+++ b/lib/puppet/util/errors.rb
@@ -52,4 +52,3 @@ module Puppet::Util::Errors
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/execution.rb b/lib/puppet/util/execution.rb
index 467cd3f52..b8dcde58d 100644
--- a/lib/puppet/util/execution.rb
+++ b/lib/puppet/util/execution.rb
@@ -19,4 +19,3 @@ module Puppet::Util::Execution
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/fact_store.rb b/lib/puppet/util/fact_store.rb
index f872ebb01..a93aa4265 100644
--- a/lib/puppet/util/fact_store.rb
+++ b/lib/puppet/util/fact_store.rb
@@ -57,4 +57,3 @@ module Puppet::Util
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/fileparsing.rb b/lib/puppet/util/fileparsing.rb
index 6a04dee5a..7552e8141 100644
--- a/lib/puppet/util/fileparsing.rb
+++ b/lib/puppet/util/fileparsing.rb
@@ -394,4 +394,3 @@ module Puppet::Util::FileParsing
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index 4fd646331..2f1dabe62 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -309,4 +309,3 @@ class Puppet::Util::FileType
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/graph.rb b/lib/puppet/util/graph.rb
index e51b8e25a..028df5539 100644
--- a/lib/puppet/util/graph.rb
+++ b/lib/puppet/util/graph.rb
@@ -36,4 +36,3 @@ module Puppet::Util::Graph
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb
index bd01759ba..9f5582e95 100644
--- a/lib/puppet/util/inifile.rb
+++ b/lib/puppet/util/inifile.rb
@@ -206,4 +206,3 @@ module Puppet::Util::IniConfig
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/loadedfile.rb b/lib/puppet/util/loadedfile.rb
index 32a832d0f..c91fb847f 100755
--- a/lib/puppet/util/loadedfile.rb
+++ b/lib/puppet/util/loadedfile.rb
@@ -65,4 +65,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
index e7e000e30..22f4f3233 100644
--- a/lib/puppet/util/log.rb
+++ b/lib/puppet/util/log.rb
@@ -546,4 +546,3 @@ class Puppet::Util::Log
 end
 Puppet::Log = Puppet::Util::Log
 
-# $Id$
diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb
index 5cfec34cb..1a6bafc45 100644
--- a/lib/puppet/util/log_paths.rb
+++ b/lib/puppet/util/log_paths.rb
@@ -13,4 +13,3 @@ module Puppet::Util::LogPaths
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb
index 298df93ba..13480743c 100644
--- a/lib/puppet/util/logging.rb
+++ b/lib/puppet/util/logging.rb
@@ -17,4 +17,3 @@ module Puppet::Util::Logging
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/metaid.rb b/lib/puppet/util/metaid.rb
index 0978e7b32..0c38a5b1b 100644
--- a/lib/puppet/util/metaid.rb
+++ b/lib/puppet/util/metaid.rb
@@ -19,4 +19,3 @@ class Object
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 133aa9c2a..d0719ff3b 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -149,4 +149,3 @@ end
 
 Puppet::Metric = Puppet::Util::Metric
 
-# $Id$
diff --git a/lib/puppet/util/plist.rb b/lib/puppet/util/plist.rb
index d7b07a0ec..d7a95da23 100644
--- a/lib/puppet/util/plist.rb
+++ b/lib/puppet/util/plist.rb
@@ -21,4 +21,3 @@ module Plist
   VERSION = '3.0.0'
 end
 
-# $Id$
diff --git a/lib/puppet/util/plist/generator.rb b/lib/puppet/util/plist/generator.rb
index b61c7694c..c615ac43b 100644
--- a/lib/puppet/util/plist/generator.rb
+++ b/lib/puppet/util/plist/generator.rb
@@ -223,4 +223,3 @@ class Hash #:nodoc:
   include Plist::Emit
 end
 
-# $Id$
diff --git a/lib/puppet/util/plist/parser.rb b/lib/puppet/util/plist/parser.rb
index 0d14533ae..7308bfb9b 100644
--- a/lib/puppet/util/plist/parser.rb
+++ b/lib/puppet/util/plist/parser.rb
@@ -224,4 +224,3 @@ module Plist
   end
 end
 
-# $Id$
diff --git a/lib/puppet/util/posix.rb b/lib/puppet/util/posix.rb
index d7e3bb8b2..84fb744a9 100755
--- a/lib/puppet/util/posix.rb
+++ b/lib/puppet/util/posix.rb
@@ -116,4 +116,3 @@ module Puppet::Util::POSIX
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb
index 4cc74f449..d5f272420 100644
--- a/lib/puppet/util/provider_features.rb
+++ b/lib/puppet/util/provider_features.rb
@@ -175,4 +175,3 @@ module Puppet::Util::ProviderFeatures
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/rails/collection_merger.rb b/lib/puppet/util/rails/collection_merger.rb
index 27e3fad40..4a941b881 100644
--- a/lib/puppet/util/rails/collection_merger.rb
+++ b/lib/puppet/util/rails/collection_merger.rb
@@ -54,4 +54,3 @@ module Puppet::Util::CollectionMerger
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index 3446aeb06..b2186ab64 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -186,4 +186,3 @@ class Puppet::Util::Reference
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 1478cd8a5..ab55fbd2b 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -562,7 +562,7 @@ class Puppet::Util::Settings
         return transport.to_configuration
     end
 
-    # Convert our list of objects into a configuration file.
+    # Convert our list of config elements into a configuration file.
     def to_config
         str = %{The configuration file for #{Puppet[:name]}.  Note that this file
 is likely to have unused configuration parameters in it; any parameter that's
diff --git a/lib/puppet/util/subclass_loader.rb b/lib/puppet/util/subclass_loader.rb
index 00f011d03..dd0d6dd03 100644
--- a/lib/puppet/util/subclass_loader.rb
+++ b/lib/puppet/util/subclass_loader.rb
@@ -87,4 +87,3 @@ module Puppet::Util::SubclassLoader
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb
index c1ff66248..3108fdf5f 100644
--- a/lib/puppet/util/suidmanager.rb
+++ b/lib/puppet/util/suidmanager.rb
@@ -69,4 +69,3 @@ module Puppet::Util::SUIDManager
     module_function :system
 end
 
-# $Id$
diff --git a/lib/puppet/util/variables.rb b/lib/puppet/util/variables.rb
index 7e04cf1c0..1a78ef5c1 100644
--- a/lib/puppet/util/variables.rb
+++ b/lib/puppet/util/variables.rb
@@ -36,4 +36,3 @@ module Puppet::Util::Variables
     end
 end
 
-# $Id$
diff --git a/lib/puppet/util/warnings.rb b/lib/puppet/util/warnings.rb
index 8e4591474..d009c3967 100644
--- a/lib/puppet/util/warnings.rb
+++ b/lib/puppet/util/warnings.rb
@@ -12,4 +12,3 @@ module Puppet::Util::Warnings
     end
 end
 
-# $Id$