diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-06-06 18:03:18 +0200 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 3a44f0e4826b8677323d3c1be55263dfa94f3305 (patch) | |
| tree | c39e30693935c73a46381316031ab5b7615332a9 /lib | |
| parent | fb5c1d7bbe629df6214af9b47e522fb282983beb (diff) | |
Fix #3932 - Add --charset to puppetdoc for RDoc mode
This adds the --charset option to puppetdoc for RDoc mode.
This allows to set the charset for the generated html.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/doc.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/rdoc.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index 5da7040ae..ba010022d 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -19,6 +19,7 @@ class Puppet::Application::Doc < Puppet::Application option("--outputdir OUTPUTDIR","-o") option("--verbose","-v") option("--debug","-d") + option("--charset CHARSET") option("--format FORMAT", "-f") do |arg| method = "to_%s" % arg @@ -79,7 +80,7 @@ class Puppet::Application::Doc < Puppet::Application Puppet::Util::RDoc.manifestdoc(files) else options[:outputdir] = "doc" unless options[:outputdir] - Puppet::Util::RDoc.rdoc(options[:outputdir], files) + Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset]) end rescue => detail if Puppet[:trace] diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index fc4e2c6cd..cb9610c0a 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -5,7 +5,7 @@ module Puppet::Util::RDoc # launch a rdoc documenation process # with the files/dir passed in +files+ - def rdoc(outputdir, files) + def rdoc(outputdir, files, charset = nil) begin Puppet[:ignoreimport] = true @@ -26,6 +26,7 @@ module Puppet::Util::RDoc "--exclude", "/modules/[^/]*/files/.*\.pp$", "--op", outputdir ] + options += [ "--charset", charset] if charset options += files # launch the documentation process |