summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-11-13 14:35:34 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-11-13 14:35:34 +1100
commite2c675edb5aecb5af6399ac53f9a85ed8214b8e9 (patch)
treed2a4de2b372d29dbf7bfea1def143b45136685df /lib/puppet/parser/functions
parent53f40bd336d709e717edb621a9d68dde9a4d5bce (diff)
downloadpuppet-e2c675edb5aecb5af6399ac53f9a85ed8214b8e9.tar.gz
puppet-e2c675edb5aecb5af6399ac53f9a85ed8214b8e9.tar.xz
puppet-e2c675edb5aecb5af6399ac53f9a85ed8214b8e9.zip
Updated generate function documentation to make it clear it runs on the master
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r--lib/puppet/parser/functions/generate.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/generate.rb b/lib/puppet/parser/functions/generate.rb
index 1be9016ed..18fe883b4 100644
--- a/lib/puppet/parser/functions/generate.rb
+++ b/lib/puppet/parser/functions/generate.rb
@@ -1,7 +1,7 @@
# Runs an external command and returns the results
Puppet::Parser::Functions::newfunction(:generate, :type => :rvalue,
- :doc => "Calls an external command and returns the results of the
- command. Any arguments are passed to the external command as
+ :doc => "Calls an external command on the Puppet master and returns
+ the results of the command. Any arguments are passed to the external command as
arguments. If the generator does not exit with return code of 0,
the generator is considered to have failed and a parse error is
thrown. Generators can only have file separators, alphanumerics, dashes,