Small fixes here and there. The rails changes needs to be pushed through the collection code, so I am committing so Blake can take a look at that.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1844 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 26 insertions, 0 deletions

diff --git a/lib/puppet/server/report.rb b/lib/puppet/server/report.rb
index 6253f6a0e..bbc8e7ddb 100755
--- a/lib/puppet/server/report.rb
+++ b/lib/puppet/server/report.rb
@@ -72,6 +72,32 @@ class Server
             @reports[symbolize(name)]
         end
 
+        def self.reportdocs
+            docs = %{Puppet clients can report back to the server after each
+transaction.  This transaction report is sent as a YAML dump and includes every
+log message that was generated during the transaction along with as many metrics
+as Puppet knows how to collect.
+
+Currently, clients default to not sending in reports; you can enable reporting
+by setting the ``report`` parameter to true.
+
+To use a report, set the ``reports`` parameter on the server; multiple
+reports must be comma-separated.
+
+Puppet provides multiple report handlers that will process client reports:
+
+}
+            # Use this method so they all get loaded
+            reports.sort { |a,b| a.to_s <=> b.to_s }.each do |name|
+                mod = self.report(name)
+                docs += "## %s\n\n" % name
+
+                docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n"
+            end
+
+            docs
+        end
+
         def self.reports
             @reportloader.loadall
             @reports.keys