diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
| commit | 80c9a8feeae6203026f61215e100e95078c61a04 (patch) | |
| tree | e70920f96b88bdc9e985e2439f395371d5ffe2be /lib/puppet/parser/functions/loadyaml.rb | |
| parent | 1434f3cea6f6e2a1b939d91cb5ff66338cc87d32 (diff) | |
| parent | a8d4bbd9e234ea577e27d83df95a61b374ac484b (diff) | |
Merge branch 'v2.1.x' into v2.2.x
* v2.1.x:
(maint) Add semantic versioning info to README
Docs: Clarify the use case for the anchor type
Docs: Remove author emails from stdlib functions
Docs: Copyedit function doc strings
Docs: Correct indentation of markdown code examples
Docs: Update documentation of stdlib classes
Docs: Update file_line documentation
Docs: Improve example in merge function
Diffstat (limited to 'lib/puppet/parser/functions/loadyaml.rb')
| -rw-r--r-- | lib/puppet/parser/functions/loadyaml.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/loadyaml.rb b/lib/puppet/parser/functions/loadyaml.rb index 0f16f69..10c4005 100644 --- a/lib/puppet/parser/functions/loadyaml.rb +++ b/lib/puppet/parser/functions/loadyaml.rb @@ -1,12 +1,12 @@ module Puppet::Parser::Functions newfunction(:loadyaml, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args| - Load a YAML file and return the data if it contains an Array, String, or Hash - as a Puppet variable. + Load a YAML file containing an array, string, or hash, and return the data + in the corresponding native data type. For example: - $myhash = loadyaml('/etc/puppet/data/myhash.yaml') + $myhash = loadyaml('/etc/puppet/data/myhash.yaml') ENDHEREDOC unless args.length == 1 |