summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/parseyaml.rb
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-11-19 11:23:50 -0500
committerJeff McCune <jeff@puppetlabs.com>2012-11-19 11:23:50 -0500
commit326a13908ba8a725a85330d040e3c5cc0b211524 (patch)
tree7de72ae30323b32c529b9a1e34e27277ca1afe85 /lib/puppet/parser/functions/parseyaml.rb
parentf40bb1e28808f346ce44c9197549681165fe233f (diff)
parent88acc523931272deb57eafbb7021f8d32248d68e (diff)
Merge branch 'jfryman-master'
* jfryman-master: puppet-lint cleanup
Diffstat (limited to 'lib/puppet/parser/functions/parseyaml.rb')
-rw-r--r--lib/puppet/parser/functions/parseyaml.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb
index e8ac8a4..53d54fa 100644
--- a/lib/puppet/parser/functions/parseyaml.rb
+++ b/lib/puppet/parser/functions/parseyaml.rb
@@ -4,7 +4,7 @@
module Puppet::Parser::Functions
newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
-This function accepts YAML as a string and converts it into the correct
+This function accepts YAML as a string and converts it into the correct
Puppet structure.
EOS
) do |arguments|