[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[James Turnbull]

The following commit has been merged in the upstream branch:
commit d40e24c63ed23ba88638dae169a09afad52f9c50
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Apr 22 17:00:21 2010 +1000

    Fixed #3384 - Updated broken link

diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb
index 0a4cfc7..006eeb8 100644
--- a/lib/puppet/parser/functions/template.rb
+++ b/lib/puppet/parser/functions/template.rb
@@ -1,8 +1,8 @@
 Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
     "Evaluate a template and return its value.  See `the templating docs
-    </trac/puppet/wiki/PuppetTemplating>`_ for more information.  Note that
-    if multiple templates are specified, their output is all concatenated
-    and returned as the output of the function.") do |vals|
+    <http://projects.reductivelabs.com/projects/puppet/wiki/Puppet_Templating`_ 
+    for more information.  Note that if multiple templates are specified, their 
+    output is all concatenated and returned as the output of the function.") do |vals|
         require 'erb'
 
         vals.collect do |file|

-- 
Puppet packaging for Debian