diff --git a/lib/puppet/util/docs.rb b/lib/puppet/util/docs.rb
index 4344d67ab..9b8ae2955 100644
--- a/lib/puppet/util/docs.rb
+++ b/lib/puppet/util/docs.rb
@@ -1,107 +1,123 @@
 # Some simple methods for helping manage automatic documentation generation.
 module Puppet::Util::Docs
   # Specify the actual doc string.
   def desc(str)
     @doc = str
   end
 
   # Add a new autodoc block.  We have to define these as class methods,
   # rather than just sticking them in a hash, because otherwise they're
   # too difficult to do inheritance with.
   def dochook(name, &block)
     method = "dochook_#{name}"
 
     meta_def method, &block
   end
 
   attr_writer :doc
 
   # Generate the full doc string.
   def doc
     extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.collect { |m|
       self.send(m)
     }.join("  ")
 
     if @doc
       @doc + extra
     else
       extra
     end
   end
 
   # Build a table
   def doctable(headers, data)
     str = "\n\n"
 
     lengths = []
     # Figure out the longest field for all columns
     data.each do |name, values|
       [name, values].flatten.each_with_index do |value, i|
         lengths[i] ||= 0
         lengths[i] = value.to_s.length if value.to_s.length > lengths[i]
       end
     end
 
     # The headers could also be longest
     headers.each_with_index do |value, i|
       lengths[i] = value.to_s.length if value.to_s.length > lengths[i]
     end
 
     # Add the header names
     str += headers.zip(lengths).collect { |value, num| pad(value, num) }.join(" | ") + " |" + "\n"
 
     # And the header row
     str += lengths.collect { |num| "-" * num }.join(" | ") + " |" + "\n"
 
     # Now each data row
     data.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, rows|
       str += [name, rows].flatten.zip(lengths).collect do |value, length|
         pad(value, length)
       end.join(" | ") + " |" + "\n"
     end
 
     str + "\n"
   end
 
   attr_reader :nodoc
   def nodoc?
     nodoc
   end
 
   # Pad a field with spaces
   def pad(value, length)
     value.to_s + (" " * (length - value.to_s.length))
   end
 
+  HEADER_LEVELS = [nil, "#", "##", "###", "####", "#####"]
+
+  def markdown_header(name, level)
+    "#{HEADER_LEVELS[level]} #{name}\n\n"
+  end
+
+  def markdown_definitionlist(term, definition)
+    lines = definition.split("\n")
+    str = "#{term}\n: #{lines.shift}\n"
+    lines.each do |line|
+      str << "    " if line =~ /\S/
+      str << "#{line}\n"
+    end
+    str << "\n"
+  end
+
   # Handle the inline indentation in the docs.
   def scrub(text)
     # Stupid markdown
     #text = text.gsub("<%=", "&lt;%=")
     # For text with no carriage returns, there's nothing to do.
     return text if text !~ /\n/
     indent = nil
 
     # If we can match an indentation, then just remove that same level of
     # indent from every line.  However, ignore any indentation on the
     # first line, since that can be inconsistent.
     text = text.lstrip
     text.gsub!(/^([\t]+)/) { |s| " "*8*s.length; } # Expand leading tabs
     # Find first non-empty line after the first line:
     line2start = (text =~ /(\n?\s*\n)/)
     line2start += $1.length
     if (text[line2start..-1] =~ /^([ ]+)\S/) == 0
       indent = Regexp.quote($1)
       begin
         return text.gsub(/^#{indent}/,'')
       rescue => detail
         puts detail.backtrace
         puts detail
       end
     else
       return text
     end
 
   end
 
   module_function :scrub
 end
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index ae5f2d44c..600325109 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -1,139 +1,123 @@
 require 'puppet/util/instance_loader'
 require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
   include Puppet::Util
   include Puppet::Util::Docs
 
   extend Puppet::Util::InstanceLoader
 
   instance_load(:reference, 'puppet/reference')
 
   def self.footer
     "\n\n----------------\n\n*This page autogenerated on #{Time.now}*\n"
   end
 
   def self.modes
     %w{pdf text}
   end
 
   def self.newreference(name, options = {}, &block)
     ref = self.new(name, options, &block)
     instance_hash(:reference)[symbolize(name)] = ref
 
     ref
   end
 
   def self.page(*sections)
     depth = 4
     # Use the minimum depth
     sections.each do |name|
       section = reference(name) or raise "Could not find section #{name}"
       depth = section.depth if section.depth < depth
     end
   end
 
   def self.pdf(text)
     puts "creating pdf"
     Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
       f.puts text
     end
     rst2latex = which('rst2latex') || which('rst2latex.py') || raise("Could not find rst2latex")
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
     Puppet::Util.secure_open("/tmp/puppetdoc.tex","w") do |f|
       # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink
     end
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
       $stderr.puts "rst2latex failed"
       $stderr.puts output
       exit(1)
     end
     $stderr.puts output
 
     # Now convert to pdf
     Dir.chdir("/tmp") do
       %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
     end
 
   end
 
   def self.references
     instance_loader(:reference).loadall
     loaded_instances(:reference).sort { |a,b| a.to_s <=> b.to_s }
   end
 
-  HEADER_LEVELS = [nil, "#", "##", "###", "####", "#####"]
-
   attr_accessor :page, :depth, :header, :title, :dynamic
   attr_writer :doc
 
   def doc
     if defined?(@doc)
       return "#{@name} - #{@doc}"
     else
       return @title
     end
   end
 
   def dynamic?
     self.dynamic
   end
 
-  def markdown_header(name, level)
-    "#{HEADER_LEVELS[level]} #{name}\n\n"
-  end
-
-  def markdown_definitionlist(term, definition)
-    lines = definition.split("\n")
-    str = "#{term}\n: #{lines.shift}\n"
-    lines.each do |line|
-      str << "    " if line =~ /\S/
-      str << "#{line}\n"
-    end
-    str << "\n"
-  end
-
   def initialize(name, options = {}, &block)
     @name = name
     options.each do |option, value|
       send(option.to_s + "=", value)
     end
 
     meta_def(:generate, &block)
 
     # Now handle the defaults
     @title ||= "#{@name.to_s.capitalize} Reference"
     @page ||= @title.gsub(/\s+/, '')
     @depth ||= 2
     @header ||= ""
   end
 
   # Indent every line in the chunk except those which begin with '..'.
   def indent(text, tab)
     text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
   end
 
   def option(name, value)
     ":#{name.to_s.capitalize}: #{value}\n"
   end
 
   def text
     puts output
   end
 
   def to_markdown(withcontents = true)
     # First the header
     text = markdown_header(@title, 1)
     text << "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n"
 
     text << @header
 
     text << generate
 
     text << self.class.footer if withcontents
 
     text
   end
 end