diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-05 00:08:15 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-05 00:08:15 -0500 |
| commit | 275af562b462813ddf5ddbad2192ddc2bf57770c (patch) | |
| tree | aceabf68095b8c34fd599f245022a9aaab0984da /lib/puppet/parser/functions.rb | |
| parent | ce0178316d8cefd072f53d39b59ce47332f6ec8f (diff) | |
| parent | 29accba1b9343f4967c15d36506b3bf60d5f0f9c (diff) | |
| download | puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.gz puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.xz puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.zip | |
Merge branch 'routing' of http://git.rickbradley.com/puppet into routing
Diffstat (limited to 'lib/puppet/parser/functions.rb')
| -rw-r--r-- | lib/puppet/parser/functions.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 7ffdb6ccb..1d07122d4 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' @@ -304,4 +302,3 @@ module Functions end end -# $Id$ |