diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:19 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:32 -0700 |
| commit | 21efa7b282080c69760a17576dff60c01821a963 (patch) | |
| tree | 8874c587d6932f49b0588caaa78149083231d947 /lib/puppet/parser/functions | |
| parent | 9caa04fd36353f02b5e3e1d343f04a62ba640f64 (diff) | |
| parent | 91185c6c04dc2bb5659db8f7a7d23a41c4d308ea (diff) | |
| download | puppet-21efa7b282080c69760a17576dff60c01821a963.tar.gz puppet-21efa7b282080c69760a17576dff60c01821a963.tar.xz puppet-21efa7b282080c69760a17576dff60c01821a963.zip | |
Merge branch 'master' into next
This is the code for 2.6 RC3
Diffstat (limited to 'lib/puppet/parser/functions')
| -rw-r--r-- | lib/puppet/parser/functions/inline_template.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb index 11d980fab..46e000383 100644 --- a/lib/puppet/parser/functions/inline_template.rb +++ b/lib/puppet/parser/functions/inline_template.rb @@ -1,6 +1,6 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => "Evaluate a template string and return its value. See `the templating docs - </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that + <http://docs.puppetlabs.com/guides/templating.html>`_ for more information. Note that if multiple template strings are specified, their output is all concatenated and returned as the output of the function.") do |vals| require 'erb' |