[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 4d1b51fbcd7d7e285e7e56242951fcc821972e11
Author: James Turnbull <james at lovedthanlost.net>
Date:   Mon Jan 17 10:38:03 2011 +1100

    Fixed #5167 - misleading documentation in the defaults of [main]

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 4521a59..df359a7 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -2,8 +2,8 @@
 module Puppet
   setdefaults(:main,
     :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process
-    is running as root or the user that `puppet master` is supposed to run as, it defaults to a system directory, but if it's running as any other user,
-    it defaults to being in `~`."],
+    is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it's running as any other user,
+    it defaults to being in the user's home directory."],
     :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this parameter is calculated specially, like `confdir`_."],
     :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
       default is essentially $0 without the path or `.rb`."],

-- 
Puppet packaging for Debian