[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 069bf1b4a9cd9de6cea0415754e078d66641ae44
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Jun 22 15:51:08 2010 +1000

    Fixed require warning documentation

diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index f634f9f..76630f1 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]::

-- 
Puppet packaging for Debian