Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/install.rb b/install.rb
index c99d7dacd..bc7df98b3 100755
--- a/install.rb
+++ b/install.rb
@@ -94,7 +94,7 @@ def do_libs(libs, strip = 'lib/')
     op = File.dirname(olf)
     File.makedirs(op, true)
     File.chmod(0755, op)
-    File.install(lf, olf, 0755, true)
+    File.install(lf, olf, 0644, true)
   end
 end
 
@@ -179,7 +179,7 @@ def prepare_installation
     opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
       InstallOptions.ri = onri
     end
-    opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
+    opts.on('--[no-]man', 'Prevents the creation of man pages.', 'Default on.') do |onman|
     InstallOptions.man = onman
     end
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|