summaryrefslogtreecommitdiffstats
path: root/man/man8/puppet-resource.8
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-06-08 18:41:16 -0700
committerNick Lewis <nick@puppetlabs.com>2011-06-08 18:41:16 -0700
commit8ccd00963d91f168438eaec4b29a18cd4a1ac583 (patch)
tree85e15c5ef9390454438fb300c5baa38a7f2f5f3e /man/man8/puppet-resource.8
parent376e0f04af01810d00eede4de52744bb8c8e1681 (diff)
parentd4c499dfdbd94f5272278e1ba87a75915607c3d7 (diff)
downloadpuppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.gz
puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.xz
puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.zip
Merge branch '2.7rc' into 2.7.x
Diffstat (limited to 'man/man8/puppet-resource.8')
-rw-r--r--man/man8/puppet-resource.84
1 files changed, 2 insertions, 2 deletions
diff --git a/man/man8/puppet-resource.8 b/man/man8/puppet-resource.8
index 738537e84..7e09c0739 100644
--- a/man/man8/puppet-resource.8
+++ b/man/man8/puppet-resource.8
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "PUPPET\-RESOURCE" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual"
.
.SH "NAME"
\fBpuppet\-resource\fR \- The resource abstraction layer shell
@@ -81,4 +81,4 @@ user { \'luke\':
Luke Kanies
.
.SH "COPYRIGHT"
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU Public License
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License