summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-03 17:32:40 -0500
committerLuke Kanies <luke@madstop.com>2007-10-03 17:32:40 -0500
commitf8c8efeff6f08cf8c23075311ce14bfd4decedb0 (patch)
tree4e0c39069fdff45f003b7e51783e6c0f579006b6 /lib/puppet/util
parent5d50ca790e7f752e07da84197b52ff84d2dcfdb4 (diff)
parent1be1db91c2ff3103c900da9ba3a3ba533d2587e7 (diff)
downloadpuppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.tar.gz
puppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.tar.xz
puppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.zip
Merge branch 'master' of git://michaelobrien.info/puppet
Diffstat (limited to 'lib/puppet/util')
-rw-r--r--lib/puppet/util/settings.rb2
1 files changed, 1 insertions, 1 deletions
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