Merge branch 'ticket/2.6.next/6509' into 2.6.next

4 files changed, 22 insertions, 21 deletions

diff --git a/lib/puppet/provider/computer/computer.rb b/lib/puppet/provider/computer/computer.rb
index a6be6bdfe..dd055beb3 100644
--- a/lib/puppet/provider/computer/computer.rb
+++ b/lib/puppet/provider/computer/computer.rb
@@ -10,9 +10,7 @@ Puppet::Type.type(:computer).provide :directoryservice, :parent => Puppet::Provi
   domain, not in remote directories.
 
   If you wish to manage /etc/hosts on Mac OS X, then simply use the host
-  type as per other platforms.
-
-  "
+  type as per other platforms."
 
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb
index 65abf7728..bbb962a71 100644
--- a/lib/puppet/provider/service/daemontools.rb
+++ b/lib/puppet/provider/service/daemontools.rb
@@ -19,10 +19,10 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
   or this can be overriden in the service resource parameters::
 
-    service {
-      \"myservice\":
-      provider => \"daemontools\", path => \"/path/to/daemons\";
-    }
+      service { \"myservice\":
+        provider => \"daemontools\",
+        path => \"/path/to/daemons\",
+      }
 
   This provider supports out of the box:
 
@@ -31,10 +31,10 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   * restart
   * status
 
-  If a service has ensure => \"running\", it will link /path/to/daemon to
+  If a service has `ensure => \"running\"`, it will link /path/to/daemon to
   /path/to/service, which will automatically enable the service.
 
-  If a service has ensure => \"stopped\", it will only down the service, not
+  If a service has `ensure => \"stopped\"`, it will only down the service, not
   remove the /path/to/service link.
 
   "
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
index 1632edabf..07c549a8b 100644
--- a/lib/puppet/provider/service/launchd.rb
+++ b/lib/puppet/provider/service/launchd.rb
@@ -3,33 +3,36 @@ require 'facter/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc "launchd service management framework.
 
-  This provider manages launchd jobs, the default service framework for
-  Mac OS X, that has also been open sourced by Apple for possible use on
-  other platforms.
+  This provider manages jobs with launchd, which is the default service framework for
+  Mac OS X and is potentially available for use on other platforms.
 
   See:
+  
   * http://developer.apple.com/macosx/launchd.html
   * http://launchd.macosforge.org/
 
   This provider reads plists out of the following directories:
+  
   * /System/Library/LaunchDaemons
   * /System/Library/LaunchAgents
   * /Library/LaunchDaemons
   * /Library/LaunchAgents
 
-  and builds up a list of services based upon each plists \"Label\" entry.
+  ...and builds up a list of services based upon each plist's \"Label\" entry.
 
   This provider supports:
+  
   * ensure => running/stopped,
   * enable => true/false
   * status
   * restart
 
   Here is how the Puppet states correspond to launchd states:
-  * stopped => job unloaded
-  * started => job loaded
-  * enabled => 'Disable' removed from job plist file
-  * disabled => 'Disable' added to job plist file
+  
+  * stopped --- job unloaded
+  * started --- job loaded
+  * enabled --- 'Disable' removed from job plist file
+  * disabled --- 'Disable' added to job plist file
 
   Note that this allows you to do something launchctl can't do, which is to
   be in a state of \"stopped/enabled\ or \"running/disabled\".
diff --git a/lib/puppet/provider/service/runit.rb b/lib/puppet/provider/service/runit.rb
index 0315b9597..736e3db71 100644
--- a/lib/puppet/provider/service/runit.rb
+++ b/lib/puppet/provider/service/runit.rb
@@ -18,10 +18,10 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
 
   or this can be overriden in the service resource parameters::
 
-    service {
-      \"myservice\":
-      provider => \"runit\", path => \"/path/to/daemons\";
-    }
+      service { \"myservice\":
+        provider => \"runit\",
+        path => \"/path/to/daemons\",
+      }
 
   This provider supports out of the box: