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

[test branch]

The following commit has been merged in the upstream branch:
commit 394757453e608512ba801f5f1188f08a61f1a845
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue May 11 14:51:10 2010 +1000

    Updated Template documentation link

diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb
index a41bfa0..34524e3 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
-    <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|
+    <http://docs.puppetlabs.com/guides/templating.html>`_ 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