Merge branch '2.6.x' into next

* 2.6.x:
  (#5304) Use internal_name rather than real_name for maillist provider
  Updated CHANGELOG and version for 2.6.4
  Revert "(#5304) Use internal_name rather than real_name for maillist provider"
  Disable remote ralsh by default
  (#5424) Ship auth.conf as part of installing from source
  (#5304) Use internal_name rather than real_name for maillist provider
  Renamed Reductive to Puppet

Manually Resolved Conflicts:
	lib/puppet/provider/maillist/mailman.rb

9 files changed, 10 insertions, 10 deletions

diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8
index 60a6eb28e..59afc2ed3 100644
--- a/man/man8/filebucket.8
+++ b/man/man8/filebucket.8
@@ -102,4 +102,4 @@ server: The server to send the file to, instead of locally\.
 verbose: Print extra information\.
 .
 .P
-version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/pi.8 b/man/man8/pi.8
index e8f5ab531..b70a128e7 100644
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@ -14,4 +14,4 @@ list: List all types
 meta: List all metaparameters
 .
 .P
-short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+short: List only parameters without detailpuppet describe \-\-list puppet describe file \-\-providers puppet describe user \-s \-mDavid LutterkortCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8
index 17369aa20..62fa7a5bf 100644
--- a/man/man8/puppetca.8
+++ b/man/man8/puppetca.8
@@ -166,4 +166,4 @@ verify: Verify the named certificate against the local CA
 .fi
 .
 .IP "" 0
-$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet cert \-l culain\.madstop\.com $ puppet cert \-s culain\.madstop\.comLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8
index 32aede791..861137553 100644
--- a/man/man8/puppetd.8
+++ b/man/man8/puppetd.8
@@ -280,4 +280,4 @@ waitforcert: This option only matters for daemons that do not yet
 .fi
 .
 .IP "" 0
-puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Reductive Labs, LLC Licensed under the GNU Public License
+puppet agent \-\-server puppet\.domain\.comLuke KaniesCopyright (c) 2005, 2006 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8
index 5fc01c2ba..47df0e764 100644
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
 .TH "PUPPETDOC" "8" "August 2010" "" ""
-Generate a reference for all Puppet types\. Largely meant for internal Reductive Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
+Generate a reference for all Puppet types\. Largely meant for internal Puppet Labs use\.puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir \fIrdoc outputdir\fR] [\-m|\-\-mode \fItext|pdf|rdoc\fR]
 .
 .IP "" 4
 .
@@ -105,4 +105,4 @@ $ puppet doc /etc/puppet/manifests/site\.pp
 or
 .
 .P
-$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+$ puppet doc \-m pdf \-r configurationLuke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8
index 3ae567a69..dde93a3d6 100644
--- a/man/man8/puppetmasterd.8
+++ b/man/man8/puppetmasterd.8
@@ -49,4 +49,4 @@ logdest: Where to send messages\. Choose between syslog, the
 verbose: Enable verbosity\.
 .
 .P
-version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet masterLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetqd.8 b/man/man8/puppetqd.8
index 137a13af3..f630c74a5 100644
--- a/man/man8/puppetqd.8
+++ b/man/man8/puppetqd.8
@@ -17,4 +17,4 @@ help: Print this help message
 verbose: Turn on verbose reporting\.
 .
 .P
-version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public License
+version: Print the puppet version number and exit\.puppet queueLuke KaniesCopyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8
index b3c27c3a7..09fa31b15 100644
--- a/man/man8/puppetrun.8
+++ b/man/man8/puppetrun.8
@@ -170,4 +170,4 @@ test: Print the hosts you would connect to but do not
 ping::
 .
 .P
-Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2Luke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License
+Do a ICMP echo against the target host\. Skip hosts that don\'t respond to ping\.sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2Luke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License
diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8
index e387e2324..bdc81e90a 100644
--- a/man/man8/ralsh.8
+++ b/man/man8/ralsh.8
@@ -82,4 +82,4 @@ Print extra information\.This example uses \fBpuppet resource\fR to return Puppe
 .fi
 .
 .IP "" 0
-Luke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License
+Luke KaniesCopyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License