diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-02-09 00:15:26 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-02-09 00:15:26 +1100 |
| commit | efd0f76c3b40fb15528b3226687eb1ab454b0c42 (patch) | |
| tree | 8354dc0b1f530a749d7a6f59a12a54e9c774af79 /install.rb | |
| parent | ad4f94adc4393e0ee3b1aca4bf7a1e8afc8b3ad8 (diff) | |
| download | puppet-efd0f76c3b40fb15528b3226687eb1ab454b0c42.tar.gz puppet-efd0f76c3b40fb15528b3226687eb1ab454b0c42.tar.xz puppet-efd0f76c3b40fb15528b3226687eb1ab454b0c42.zip | |
Fixed #3128 - Updated man pages and moved puppet.conf.8 to puppet.conf.5
Diffstat (limited to 'install.rb')
| -rwxr-xr-x | install.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install.rb b/install.rb index 49ca8b18c..30f1d32aa 100755 --- a/install.rb +++ b/install.rb @@ -83,7 +83,7 @@ sbins = glob(%w{sbin/*}) bins = glob(%w{bin/*}) rdoc = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ } ri = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ } -man = glob(%w{man/man8/*}) +man = glob(%w{man/man[0-9]/*}) libs = glob(%w{lib/**/*.rb lib/**/*.py}) tests = glob(%w{test/**/*.rb}) @@ -355,9 +355,9 @@ def build_man(bins) # Locate rst2man rst2man = %x{which rst2man.py} rst2man.chomp! - # Create puppet.conf.8 man page + # Create puppet.conf.5 man page %x{bin/puppetdoc --reference configuration > ./puppet.conf.rst} - %x{#{rst2man} ./puppet.conf.rst ./man/man8/puppet.conf.8} + %x{#{rst2man} ./puppet.conf.rst ./man/man5/puppet.conf.5} File.unlink("./puppet.conf.rst") # Create binary man pages |