diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-08 13:32:25 -0800 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-08 13:32:25 -0800 |
| commit | 9d551be70ab2a5d64a75a5c497534b0413cd3d81 (patch) | |
| tree | 062d88419140fd3d848d68946c76cd3e75baeec5 /lib/puppet/application | |
| parent | c3ec3d100fb27211bf86c12bdc759d1fa1afce25 (diff) | |
| parent | 2a915725adf0ccefcc28653cbba2219925194594 (diff) | |
| download | puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.tar.gz puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.tar.xz puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.zip | |
Merge branch 'ticket/next/4798-rdoc-fixes' into next
* ticket/next/4798-rdoc-fixes:
(#4798) Make rdoc work if moduledir & manifestdir overlap
maint: Fix rdoc when documenting manifest files
maint: Move puppetdoc settings to defaults so we can use them in tests
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/doc.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index 3bfe41653..74811919e 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -1,7 +1,6 @@ require 'puppet/application' class Puppet::Application::Doc < Puppet::Application - should_not_parse_config run_mode :master @@ -140,7 +139,7 @@ COPYRIGHT Copyright (c) 2005-2007 Puppet Labs, LLC Licensed under the GNU Public License - HELP +HELP end def handle_unknown( opt, arg ) @@ -163,11 +162,6 @@ License files += command_line.args Puppet.info "scanning: #{files.inspect}" - Puppet.settings.setdefaults( - "puppetdoc", - - "document_all" => [false, "Document all resources"] - ) Puppet.settings[:document_all] = options[:all] || false begin require 'puppet/util/rdoc' |