(#2128) Whitespace only reflow commit

The output of puppet --genconfig was showing a blank line between the
description of the option and the default value line.  This is because
of the here document being used in the first commit.

This change replaces the HERE document with a normal string that does
not contain a final newline.

In addition, the indentation of one of the default options was using 4
spaces instead of 2 and this has been corrected.

1 files changed, 17 insertions, 19 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index fa0736387..b6d25d6d6 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -486,27 +486,25 @@ module Puppet
   )
 
   setdefaults(:agent,
-    :node_name_value => ["$certname", <<-'ENDnodenamevalueDESChereDOC' ],
-      The explicit value used for the node name for all requests the agent makes to
-      the master. This setting is mutually exclusive with node_name_fact. Changing
-      this setting also requires changes to the default auth.conf configuration on
-      the Puppet Master.  Please see http://links.puppetlabs.com/node_name_value for
-      more information.
-      ENDnodenamevalueDESChereDOC
+    :node_name_value => { :default => "$certname",
+      :desc => "The explicit value used for the node name for all requests the agent
+        makes to the master. This setting is mutually exclusive with node_name_fact.
+        Changing this setting also requires changes to the default auth.conf
+        configuration on the Puppet Master.  Please see
+        http://links.puppetlabs.com/node_name_value for more information."
+    },
     :node_name_fact => { :default => "",
-        :desc => <<-'ENDnodenamefactDESChereDOC',
-          The fact name used to determine the node name used for all requests the agent
-          makes to the master. This setting is mutually exclusive with node_name_value.
-          Changing this setting also requires changes to the default auth.conf
-          configuration on the Puppet Master.  Please see
-          http://links.puppetlabs.com/node_name_fact for more information.
-          ENDnodenamefactDESChereDOC
-        :hook => proc do |value|
-          if !value.empty? and Puppet[:node_name_value] != Puppet[:certname]
-            raise "Cannot specify both the node_name_value and node_name_fact settings"
-          end
+      :desc => " The fact name used to determine the node name used for all requests the agent
+        makes to the master. This setting is mutually exclusive with node_name_value.
+        Changing this setting also requires changes to the default auth.conf
+        configuration on the Puppet Master.  Please see
+        http://links.puppetlabs.com/node_name_fact for more information.",
+      :hook => proc do |value|
+        if !value.empty? and Puppet[:node_name_value] != Puppet[:certname]
+          raise "Cannot specify both the node_name_value and node_name_fact settings"
         end
-      },
+      end
+    },
     :localconfig => { :default => "$statedir/localconfig",
       :owner => "root",
       :mode => 0660,