summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-01-22 10:39:49 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-03-27 08:53:48 +1100
commit6160aafe86e48d545583a2e9e093754ac32a5ced (patch)
tree5938d36110c5b97ef7aa5db1a584a671b58dbf47
parentd1259372ea955c488efa37724fc74a55da28eefc (diff)
downloadpuppet-6160aafe86e48d545583a2e9e093754ac32a5ced.tar.gz
puppet-6160aafe86e48d545583a2e9e093754ac32a5ced.tar.xz
puppet-6160aafe86e48d545583a2e9e093754ac32a5ced.zip
In order for ReST formatting to work properly, newlines and
indentation of doc strings must be retained. Signed-off-by: Thomas Bellman <bellman@nsc.liu.se>
-rw-r--r--lib/puppet/parser/functions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index b1cd0d083..b9e49131c 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -92,7 +92,7 @@ module Functions
#ret += "%s\n%s\n" % [name, hash[:type]]
ret += "%s\n%s\n" % [name, "-" * name.to_s.length]
if hash[:doc]
- ret += hash[:doc].gsub(/\n\s*/, ' ')
+ ret += Puppet::Util::Docs.scrub(hash[:doc])
else
ret += "Undocumented.\n"
end