Merge pull request #251 from OpenVoxProject/binford2k-patch-2

add note about server_list precedence

Author: nmburgan

lib/puppet/defaults.rb

@@ -1651,13 +1651,14 @@ def self.initialize_default_settings!(settings)
     },
     :server => {
       :default => "puppet",
-      :desc => "The primary Puppet server to which the Puppet agent should connect.",
+      :desc => "The primary Puppet server to which the Puppet agent should connect. This setting is ignored when `server_list` is specified.",
     },
     :server_list => {
       :default => [],
       :type => :server_list,
       :desc => "The list of primary Puppet servers to which the Puppet agent should connect,
-        in the order that they will be tried. Each value should be a fully qualified domain name, followed by an optional ':' and port number. If a port is omitted, Puppet uses masterport for that host.",
+        in the order that they will be tried. Each value should be a fully qualified domain name, followed by an optional ':' and port number.
+        If a port is omitted, Puppet uses masterport for that host. This setting takes precedence over `server`.",
     },
     :use_srv_records => {
       :default    => false,