diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:59:23 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:59:23 -0800 |
| commit | c677f5bd4bb18ec93b82d8f39f317dd40963c2cc (patch) | |
| tree | 0d7d3617762d3076bd080c39a78a1e92568cb839 /lib/puppet/application/doc.rb | |
| parent | 9b064e655f90bb5aa2f95e343e9c22765ddf4998 (diff) | |
| parent | 66b442b723f1e74b934381227955cc30d64f3636 (diff) | |
| download | puppet-c677f5bd4bb18ec93b82d8f39f317dd40963c2cc.tar.gz puppet-c677f5bd4bb18ec93b82d8f39f317dd40963c2cc.tar.xz puppet-c677f5bd4bb18ec93b82d8f39f317dd40963c2cc.zip | |
Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.next
Diffstat (limited to 'lib/puppet/application/doc.rb')
| -rw-r--r-- | lib/puppet/application/doc.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index 1f6c63286..aaefd6e75 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -8,7 +8,7 @@ class Puppet::Application::Doc < Puppet::Application attr_accessor :unknown_args, :manifest def preinit - {:references => [], :mode => :text, :format => :to_rest }.each do |name,value| + {:references => [], :mode => :text, :format => :to_markdown }.each do |name,value| options[name] = value end @unknown_args = [] @@ -113,9 +113,6 @@ class Puppet::Application::Doc < Puppet::Application text += Puppet::Util::Reference.footer unless with_contents # We've only got one reference - # Replace the trac links, since they're invalid everywhere else - text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 } - if options[:mode] == :pdf Puppet::Util::Reference.pdf(text) else |