diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-03 18:01:42 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-03 18:01:42 -0500 |
| commit | 7da2031beb46c744a2a33af01d84e0d397b1e9ae (patch) | |
| tree | fd24a731d20e6ec5d5453da1705039eb25957642 | |
| parent | d4afe39fa1aeb4f4e9d1bcdaf0f924aac2f00584 (diff) | |
| parent | 7c8fc8b9bd5aeb406f777f36df5fc52b7db5f454 (diff) | |
| download | puppet-7da2031beb46c744a2a33af01d84e0d397b1e9ae.tar.gz puppet-7da2031beb46c744a2a33af01d84e0d397b1e9ae.tar.xz puppet-7da2031beb46c744a2a33af01d84e0d397b1e9ae.zip | |
Merge branch 'master' of git://michaelobrien.info/puppet
| -rw-r--r-- | lib/puppet/parser/functions.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 7ffdb6ccb..3e5417eef 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -200,11 +200,9 @@ module Functions end newfunction(:template, :type => :rvalue, :doc => "Evaluate a template and - return its value. See `the templating docs`_ + return its value. See `the templating docs </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that if multiple templates are specified, their output is all concatenated and returned as the output of the function. - - .. _the templating docs: /trac/puppet/wiki/PuppetTemplating ") do |vals| require 'erb' |