summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-06-22 15:51:08 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-06-22 15:51:08 +1000
commit069bf1b4a9cd9de6cea0415754e078d66641ae44 (patch)
treeb1914529de8c7cf91ffa0d838cca461e2f8020ce /lib/puppet/parser
parent23431da087959199a91c88691446238a406a5489 (diff)
downloadpuppet-069bf1b4a9cd9de6cea0415754e078d66641ae44.tar.gz
puppet-069bf1b4a9cd9de6cea0415754e078d66641ae44.tar.xz
puppet-069bf1b4a9cd9de6cea0415754e078d66641ae44.zip
Fixed require warning documentation
Diffstat (limited to 'lib/puppet/parser')
-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 f634f9fbd..76630f1a5 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]::