Adding an Indirection reference, along with the work

necessary to support it.

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
index 01178e5f4..54d1052f3 100644
--- a/lib/puppet/util/docs.rb
+++ b/lib/puppet/util/docs.rb
@@ -14,9 +14,11 @@ module Puppet::Util::Docs
         meta_def method, &block
     end
 
+    attr_writer :doc
+
     # Generate the full doc string.
     def doc
-        extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.collect { |m|
+        extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.collect { |m|
             self.send(m)
         }.join("  ")
 
diff --git a/lib/puppet/util/instance_loader.rb b/lib/puppet/util/instance_loader.rb
index f280014eb..bf4f9b77f 100755
--- a/lib/puppet/util/instance_loader.rb
+++ b/lib/puppet/util/instance_loader.rb
@@ -36,6 +36,9 @@ module Puppet::Util::InstanceLoader
     def instance_docs(type)
         docs = ""
 
+        # Load all instances.
+        instance_loader(type).loadall
+
         # Use this method so they all get loaded
         loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
             mod = self.loaded_instance(name)