Partial merge to 2.6.2rc1 : Merge commit '574812e' into next

The API for AST objects has changed, making the initialization of this
spec somewhat more complicated.
Also, git seems to have been confused by whitespace changes.

Manually Resolved Conflicts:
	lib/puppet/parser/ast/resource.rb

2 files changed, 12 insertions, 11 deletions

diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb
index 23207149f..bd15d9935 100644
--- a/lib/puppet/parser/ast/resource.rb
+++ b/lib/puppet/parser/ast/resource.rb
@@ -50,7 +50,6 @@ class Resource < AST::Branch
             :virtual => virt,
             :source => scope.source,
             :scope => scope,
-
             :strict => true
           )
 
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index aca66163c..ce34442ab 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -207,19 +207,21 @@ class Parser
       if stmt.is_a?(Puppet::Parser::AST::Resource) and !stmt.type.nil?
         begin
           type = stmt.type.split("::").collect { |s| s.capitalize }.join("::")
-          title = stmt.title.is_a?(Puppet::Parser::AST::ASTArray) ? stmt.title.to_s.gsub(/\[(.*)\]/,'\1') : stmt.title.to_s
-          Puppet.debug "rdoc: found resource: #{type}[#{title}]"
+          stmt.instances.each do |inst|
+            title = inst.title.is_a?(Puppet::Parser::AST::ASTArray) ? inst.title.to_s.gsub(/\[(.*)\]/,'\1') : inst.title.to_s
+            Puppet.debug "rdoc: found resource: #{type}[#{title}]"
 
-          param = []
-          stmt.params.children.each do |p|
-            res = {}
-            res["name"] = p.param
-            res["value"] = "#{p.value.to_s}" unless p.value.nil?
+            param = []
+            inst.parameters.children.each do |p|
+              res = {}
+              res["name"] = p.param
+              res["value"] = "#{p.value.to_s}" unless p.value.nil?
 
-            param << res
-          end
+              param << res
+            end
 
-          container.add_resource(PuppetResource.new(type, title, stmt.doc, param))
+            container.add_resource(PuppetResource.new(type, title, stmt.doc, param))
+          end
         rescue => detail
           raise Puppet::ParseError, "impossible to parse resource in #{stmt.file} at line #{stmt.line}: #{detail}"
         end