Fix #1740 - Daemontools and Runit is not ReST compliant

2 files changed, 48 insertions, 31 deletions

diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb
index 52d8c6b6c..db4a7cdf8 100644
--- a/lib/puppet/provider/service/daemontools.rb
+++ b/lib/puppet/provider/service/daemontools.rb
@@ -2,27 +2,36 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :daemontools, :parent => :base do
-    desc "Daemontools service management.
-    This provider manages daemons running supervised by D.J.Bernstein daemontools.
-    It tries to detect the service directory, with by order of preference:
-     * /service
-     * /etc/service
-     * /var/lib/svscan
-    The daemon directory should be placed in a directory that can be 
-    by default in:
-     * /var/lib/service
-     * /etc
-    or this can be overriden in the service resource parameters:
+    desc """
+Daemontools service management.
+This provider manages daemons running supervised by D.J.Bernstein daemontools.
+It tries to detect the service directory, with by order of preference:
+
+ * /service
+ * /etc/service
+ * /var/lib/svscan
+
+The daemon directory should be placed in a directory that can be 
+by default in:
+
+ * /var/lib/service
+ * /etc
+
+or this can be overriden in the service resource parameters::
+
     service {
      \"myservice\":
        provider => \"daemontools\", path => \"/path/to/daemons\";
     }
 
-    This provider supports out of the box:
-     * start/stop (mapped to enable/disable)
-     * enable/disable
-     * restart
-     * status"
+This provider supports out of the box:
+
+ * start/stop (mapped to enable/disable)
+ * enable/disable
+ * restart
+ * status
+
+"""
 
     commands :svc  => "/usr/bin/svc"
     commands :svstat => "/usr/bin/svstat"
diff --git a/lib/puppet/provider/service/runit.rb b/lib/puppet/provider/service/runit.rb
index 230fa75d9..5c2b9c733 100644
--- a/lib/puppet/provider/service/runit.rb
+++ b/lib/puppet/provider/service/runit.rb
@@ -2,26 +2,34 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
-    desc "Runit service management.
-    This provider manages daemons running supervised by Runit.
-    It tries to detect the service directory, with by order of preference:
-     * /service
-     * /var/service
-     * /etc/service
-    The daemon directory should be placed in a directory that can be 
-    by default in:
-     * /etc/sv
-    or this can be overriden in the service resource parameters:
+    desc """
+Runit service management.
+This provider manages daemons running supervised by Runit.
+It tries to detect the service directory, with by order of preference:
+
+ * /service
+ * /var/service
+ * /etc/service
+
+The daemon directory should be placed in a directory that can be 
+by default in:
+
+ * /etc/sv
+
+or this can be overriden in the service resource parameters::
+
     service {
      \"myservice\":
        provider => \"runit\", path => \"/path/to/daemons\";
     }
 
-    This provider supports out of the box:
-     * start/stop
-     * enable/disable
-     * restart
-     * status"
+This provider supports out of the box:
+
+ * start/stop
+ * enable/disable
+ * restart
+ * status
+"""
 
     commands :sv => "/usr/bin/sv"