[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[nfagerlund]

The following commit has been merged in the upstream branch:
commit 6f6c4b5f55d00df370f7d00a2499551e36aa880b
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Mon Feb 28 09:55:19 2011 -0800

    (#6509) Inline docs: Fix broken code block in file type (content attribute)

diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb
index 63c0aaf..0e31f30 100755
--- a/lib/puppet/type/file/content.rb
+++ b/lib/puppet/type/file/content.rb
@@ -17,19 +17,19 @@ module Puppet
 
     desc "Specify the contents of a file as a string.  Newlines, tabs, and
       spaces can be specified using the escaped syntax (e.g., \\n for a newline).  The primary purpose of this parameter is to provide a
-      kind of limited templating::
-
-        define resolve(nameserver1, nameserver2, domain, search) {
-          $str = \"search $search
-        domain $domain
-        nameserver $nameserver1
-        nameserver $nameserver2
-        \"
-
-          file { \"/etc/resolv.conf\":
-            content => $str
+      kind of limited templating:
+
+          define resolve(nameserver1, nameserver2, domain, search) {
+              $str = \"search $search
+                  domain $domain
+                  nameserver $nameserver1
+                  nameserver $nameserver2
+                  \"
+
+              file { \"/etc/resolv.conf\":
+                content => $str
+              }
           }
-        }
 
       This attribute is especially useful when used with templating."
 

-- 
Puppet packaging for Debian