summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions/defined.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-08-12 13:51:14 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-08-12 13:51:14 -0700
commit0f56c1b02d40f1f8552d933dd78b24745937b137 (patch)
tree3c6495838d1b876528cb4522de3484c44749140d /lib/puppet/parser/functions/defined.rb
parentb53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff)
parent0aa27b5cc5df818e3878601e83f83a20590e161a (diff)
downloadpuppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.gz
puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.xz
puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.zip
Merge commit '2.6.1rc2' into next
Diffstat (limited to 'lib/puppet/parser/functions/defined.rb')
-rw-r--r--lib/puppet/parser/functions/defined.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/defined.rb b/lib/puppet/parser/functions/defined.rb
index 2930a65cc..90632af2f 100644
--- a/lib/puppet/parser/functions/defined.rb
+++ b/lib/puppet/parser/functions/defined.rb
@@ -3,7 +3,7 @@ Puppet::Parser::Functions::newfunction(:defined, :type => :rvalue, :doc => "Dete
type is defined, either as a native type or a defined type, or whether a class is defined.
This is useful for checking whether a class is defined and only including it if it is.
This function can also test whether a resource has been defined, using resource references
- (e.g., ``if defined(File['/tmp/myfile']) { ... }``). This function is unfortunately
+ (e.g., `if defined(File['/tmp/myfile']) { ... }`). This function is unfortunately
dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals|
result = false
vals = [vals] unless vals.is_a?(Array)