5 files changed, 14 insertions, 14 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index a754ed399..ab47abc38 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -100,9 +100,9 @@ class Puppet::Application::Agent < Puppet::Application
 
     def fingerprint
         unless cert = host.certificate || host.certificate_request
-           $stderr.puts "Fingerprint asked but no certificate nor certificate request have yet been issued"
-           exit(1)
-           return
+            $stderr.puts "Fingerprint asked but no certificate nor certificate request have yet been issued"
+            exit(1)
+            return
         end
         unless fingerprint = cert.fingerprint(options[:digest])
             raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'"
@@ -183,8 +183,7 @@ class Puppet::Application::Agent < Puppet::Application
 
     def setup_listen
         unless FileTest.exists?(Puppet[:authconfig])
-            Puppet.err "Will not start without authorization file %s" %
-                Puppet[:authconfig]
+            Puppet.err "Will not start without authorization file %s" % Puppet[:authconfig]
             exit(14)
         end
 
@@ -235,7 +234,7 @@ class Puppet::Application::Agent < Puppet::Application
         Puppet.settings.use :main, :agent, :ssl
 
         # We need to specify a ca location for all of the SSL-related i
-        # indirected classes to work; in fingerprint mode we just need 
+        # indirected classes to work; in fingerprint mode we just need
         # access to the local files and we don't need a ca.
         Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote
 
diff --git a/lib/puppet/application/describe.rb b/lib/puppet/application/describe.rb
index 4da64b3bb..f9c5260ec 100644
--- a/lib/puppet/application/describe.rb
+++ b/lib/puppet/application/describe.rb
@@ -160,8 +160,7 @@ class TypeDoc
             a.to_s <=> b.to_s
         }.each { |prov|
             puts "\n- **%s**" % prov
-            puts @format.wrap(type.provider(prov).doc,
-                              :indent => 4, :scrub => true)
+            puts @format.wrap(type.provider(prov).doc, :indent => 4, :scrub => true)
         }
     end
 
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index a28cac21b..ae4c871cd 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -70,7 +70,10 @@ class Puppet::Application::Doc < Puppet::Application
         end
         files += command_line.args
         Puppet.info "scanning: %s" % files.inspect
-        Puppet.settings.setdefaults("puppetdoc",
+
+                    Puppet.settings.setdefaults(
+                "puppetdoc",
+        
             "document_all" => [false, "Document all resources"]
         )
         Puppet.settings[:document_all] = options[:all] || false
@@ -160,7 +163,7 @@ class Puppet::Application::Doc < Puppet::Application
 
         if options[:mode] == :pdf
             Puppet::Util::Reference.pdf(text)
-        else 
+        else
             puts text
         end
 
diff --git a/lib/puppet/application/kick.rb b/lib/puppet/application/kick.rb
index 5792edebd..8c168b3ba 100644
--- a/lib/puppet/application/kick.rb
+++ b/lib/puppet/application/kick.rb
@@ -82,8 +82,7 @@ class Puppet::Application::Kick < Puppet::Application
                         end
                         print "%s finished with exit code %s\n" % [host, $?.exitstatus]
                     else
-                        $stderr.puts "Could not find host for PID %s with status %s" %
-                            [pid, $?.exitstatus]
+                        $stderr.puts "Could not find host for PID %s with status %s" % [pid, $?.exitstatus]
                     end
                 rescue Errno::ECHILD
                     # There are no children left, so just exit unless there are still
@@ -144,7 +143,7 @@ class Puppet::Application::Kick < Puppet::Application
             exit(12)
         end
     end
-    
+
     def initialize(*args)
         super
         @hosts = []
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 484ec08ca..a8ed27c42 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -54,7 +54,7 @@ class Puppet::Application::Master < Puppet::Application
         raise ArgumentError, "Cannot render compiled catalogs without pson support" unless Puppet.features.pson?
         begin
             unless catalog = Puppet::Resource::Catalog.find(options[:node])
-                raise "Could not compile catalog for %s" % options[:node] 
+                raise "Could not compile catalog for %s" % options[:node]
             end
 
             jj catalog.to_resource