diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-04 08:04:44 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-04 08:04:44 -0500 |
| commit | 92d23e0398ffbaf7e264bb7ff716bd6f83130b07 (patch) | |
| tree | af4a9296a11733c4636a88d38925804ea6f0793d /lib/puppet/parser/functions.rb | |
| parent | 1334b786ac622a6094ba68b3e66fce3f5841deed (diff) | |
| parent | bd8e38236a23ae687c418fcbb90e5f61c8c67b01 (diff) | |
| download | puppet-92d23e0398ffbaf7e264bb7ff716bd6f83130b07.tar.gz puppet-92d23e0398ffbaf7e264bb7ff716bd6f83130b07.tar.xz puppet-92d23e0398ffbaf7e264bb7ff716bd6f83130b07.zip | |
Merge branch 'master' of git://reductivelabs.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$ |