summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-06-22 15:51:08 +1000
committerMarkus Roberts <Markus@reality.com>2010-06-24 16:12:04 -0700
commit60932e19bb8b56ce6fc17f970c80814c1bd43ed4 (patch)
tree772f35d450fd272d004829c25f193a11c88e9014 /lib
parent6fcb87d1745b5589b74a60e39739e524609dfe96 (diff)
downloadpuppet-60932e19bb8b56ce6fc17f970c80814c1bd43ed4.tar.gz
puppet-60932e19bb8b56ce6fc17f970c80814c1bd43ed4.tar.xz
puppet-60932e19bb8b56ce6fc17f970c80814c1bd43ed4.zip
Fixed require warning documentation
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions/require.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index 294484a2b..a46999f05 100644
--- a/lib/puppet/parser/functions/require.rb
+++ b/lib/puppet/parser/functions/require.rb
@@ -3,13 +3,12 @@ Puppet::Parser::Functions::newfunction(:require,
:doc =>"Evaluate one or more classes, adding the required class as a dependency.
The relationship metaparameters work well for specifying relationships
-between individual resources, but they can be clumsy for specifying
+between individual resources, but they can be clumsy for specifying
relationships between classes. This function is a superset of the
'include' function, adding a class relationship so that the requiring
class depends on the required class.
-.. Warning::
- using require in place of include can lead to unwanted dependency cycles.
+Warning: using require in place of include can lead to unwanted dependency cycles.
For instance the following manifest, with 'require' instead of 'include'
would produce a nasty dependence cycle, because notify imposes a before
between File[/foo] and Service[foo]::