summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-16 21:37:34 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-16 21:37:34 +0000
commitc369e4023eb391dbb95b8efa6fb19a2ecdfab709 (patch)
treef8f026893c56ed433cf5a015e1f06749932c16c7
parentc3c5851c0ff4bc9a07572646ef7fb745f09cf79f (diff)
downloadpuppet-c369e4023eb391dbb95b8efa6fb19a2ecdfab709.tar.gz
puppet-c369e4023eb391dbb95b8efa6fb19a2ecdfab709.tar.xz
puppet-c369e4023eb391dbb95b8efa6fb19a2ecdfab709.zip
Fixing #346 -- on some scripts I accidentally used "feature" instead of "features"
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1886 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xbin/puppet2
-rwxr-xr-xbin/puppetca2
-rwxr-xr-xbin/puppetd2
-rwxr-xr-xbin/puppetdoc2
-rwxr-xr-xbin/puppetmasterd2
5 files changed, 5 insertions, 5 deletions
diff --git a/bin/puppet b/bin/puppet
index 9421e30f5..8a91769d9 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -100,7 +100,7 @@ begin
puts "%s" % Puppet.version
exit
when "--help"
- if Puppet.feature.usage?
+ if Puppet.features.usage?
RDoc::usage && exit
else
puts "No help available unless you have RDoc::usage installed"
diff --git a/bin/puppetca b/bin/puppetca
index d1a47a7b1..91a83aaca 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -121,7 +121,7 @@ begin
generate = arg
mode = :generate
when "--help"
- if Puppet.feature.usage?
+ if Puppet.features.usage?
RDoc::usage && exit
else
puts "No help available unless you have RDoc::usage installed"
diff --git a/bin/puppetd b/bin/puppetd
index dc3576f2c..4cf400bdf 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -216,7 +216,7 @@ begin
when "--centrallogging"
options[:centrallogs] = true
when "--help"
- if Puppet.feature.usage?
+ if Puppet.features.usage?
RDoc::usage && exit
else
puts "No help available unless you have RDoc::usage installed"
diff --git a/bin/puppetdoc b/bin/puppetdoc
index 51a95b8bb..c248b25f0 100755
--- a/bin/puppetdoc
+++ b/bin/puppetdoc
@@ -61,7 +61,7 @@ begin
when "--mode"
mode = arg.intern
when "--help"
- if Puppet.feature.usage?
+ if Puppet.features.usage?
RDoc::usage && exit
else
puts "No help available unless you have RDoc::usage installed"
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index cf3b42cff..f250ec10e 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -128,7 +128,7 @@ begin
when "--debug"
options[:debug] = true
when "--help"
- if Puppet.feature.usage?
+ if Puppet.features.usage?
RDoc::usage && exit
else
puts "No help available unless you have RDoc::usage installed"