diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
| commit | 0f56c1b02d40f1f8552d933dd78b24745937b137 (patch) | |
| tree | 3c6495838d1b876528cb4522de3484c44749140d /lib/puppet/parser/functions/file.rb | |
| parent | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff) | |
| parent | 0aa27b5cc5df818e3878601e83f83a20590e161a (diff) | |
| download | puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.gz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.xz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.zip | |
Merge commit '2.6.1rc2' into next
Diffstat (limited to 'lib/puppet/parser/functions/file.rb')
| -rw-r--r-- | lib/puppet/parser/functions/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/file.rb b/lib/puppet/parser/functions/file.rb index 963111260..19ab9ba2e 100644 --- a/lib/puppet/parser/functions/file.rb +++ b/lib/puppet/parser/functions/file.rb @@ -2,7 +2,7 @@ Puppet::Parser::Functions::newfunction( :file, :type => :rvalue, - + :doc => "Return the contents of a file. Multiple files can be passed, and the first file that exists will be read in.") do |vals| ret = nil |