From: Matt Robinson <[email protected]>
Paired-with: Daniel Pittman <[email protected]>
Signed-off-by: Max Martin <[email protected]>
---
Local-branch: ticket/next/4798-rdoc-fixes
lib/puppet/application/doc.rb | 8 +-------
lib/puppet/defaults.rb | 4 ++++
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 3bfe416..7481191 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'
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 576acfe..f308d44 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -822,4 +822,8 @@ module Puppet
directories."
]
)
+ setdefaults(
+ :puppetdoc,
+ :document_all => [false, "Document all resources"]
+ )
end
--
1.7.4
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
