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

[Stig Sandbeck Mathisen]

The following commit has been merged in the upstream branch:
commit 71824eeaf046197d869903dae2e476f9174c385a
Merge: db0b30dbde94d16ab1d7580be4dd32e18cff23dc 8f94f353e4323c5cf8f540cd2cb1f26b8ea8a7ae
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue Jul 20 07:23:33 2010 +0200

    Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-puppet/puppet into upstream
    
    Conflicts:
    	examples/modules/sample-module/README.txt
    	examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
    	ext/extlookup.rb
    	man/man5/puppet.conf.5
    	man/man8/filebucket.8
    	man/man8/puppet.8
    	man/man8/ralsh.8

diff --combined man/man8/pi.8
index 3e25485,cb57dc3..def4a63
--- a/man/man8/pi.8
+++ b/man/man8/pi.8
@@@ -11,7 -11,7 +11,7 @@@ detailed help
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -pi [\-h|\-\-help] [\-s|\-\-short] [\-p|\-\-providers] [\-l|\-\-list] [\-m|\-\-meta]
 +puppet describe [\-h|\-\-help] [\-s|\-\-short] [\-p|\-\-providers] [\-l|\-\-list] [\-m|\-\-meta]
  .UNINDENT
  .UNINDENT
  .SH DESCRIPTION
@@@ -33,9 -33,9 +33,9 @@@ short:     List only parameters withou
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -pi \-\-list
 -pi file \-\-providers
 -pi user \-s \-m
 +puppet describe \-\-list
 +puppet describe file \-\-providers
 +puppet describe user \-s \-m
  .UNINDENT
  .UNINDENT
  .SH AUTHOR
@@@ -43,7 -43,7 +43,7 @@@
  David Lutterkort
  .SH COPYRIGHT
  .sp
- Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
+ Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
  License
  .\" Generated by docutils manpage writer.
  .\" 
diff --combined man/man8/puppetdoc.8
index 281b738,cf64a7b..681e790
--- a/man/man8/puppetdoc.8
+++ b/man/man8/puppetdoc.8
@@@ -6,15 -6,15 +6,15 @@@
  .SH SYNOPSIS
  .sp
  Generate a reference for all Puppet types. Largely meant for internal
- Reductive Labs use.
+ Puppet Labs use.
  .SH USAGE
  .INDENT 0.0
  .INDENT 3.5
  .INDENT 0.0
  .TP
 -.B puppetdoc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir <rdoc outputdir>] [\-m|\-\-mode <text|pdf|markdown|trac|rdoc>]
 +.B puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir <rdoc outputdir>] [\-m|\-\-mode <text|pdf|markdown|trac|rdoc>]
  .
 -[\-r|\-\-reference <[type]|configuration|..>] [manifest\-file]
 +[\-r|\-\-reference <[type]|configuration|..>] [\-\-charset CHARSET] [manifest\-file]
  .UNINDENT
  .UNINDENT
  .UNINDENT
@@@ -24,7 -24,7 +24,7 @@@ If mode is not \(aqrdoc\(aq, then this 
  document describing all installed Puppet types or all allowable
  arguments to puppet executables. It is largely meant for internal use
  and is used to generate the reference document available on the
- Reductive Labs web site.
+ Puppet Labs web site.
  .sp
  In \(aqrdoc\(aq mode, this command generates an html RDoc hierarchy describing
  the manifests that are in \(aqmanifestdir\(aq and \(aqmodulepath\(aq configuration
@@@ -32,7 -32,7 +32,7 @@@ directives. The generated documentatio
  can be changed with the \(aqoutputdir\(aq option.
  .sp
  If the command is started with \(aqmanifest\-file\(aq command\-line arguments,
 -puppetdoc generate a single manifest documentation that is output on
 +puppet doc generate a single manifest documentation that is output on
  stdout.
  .SH OPTIONS
  .INDENT 0.0
@@@ -53,23 -53,19 +53,23 @@@ documentation in \(aqrdoc\(aq mode
  .
  \(aqpdf\(aq, \(aqmarkdown\(aq and \(aqrdoc\(aq. The \(aqpdf\(aq and \(aqmarkdown\(aq modes
  create PDF or Markdown formatted files in the /tmp directory.
- Note that \(aqtrac\(aq mode only works on Reductive Labs servers.
+ Note that \(aqtrac\(aq mode only works on Puppet Labs servers.
  The default mode is \(aqtext\(aq. In \(aqrdoc\(aq mode you must provide
  \(aqmanifests\-path\(aq
  .TP
  .B reference: Build a particular reference. Get a list of references by
  .
 -running +puppetdoc \-\-list+.
 +running +puppet doc \-\-list+.
 +.TP
 +.B charset:   Used only in \(aqrdoc\(aq mode. It sets the charset used in the
 +.
 +html files produced.
  .UNINDENT
  .SH EXAMPLE
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -$ puppetdoc \-r type > /tmp/type_reference.rst
 +$ puppet doc \-r type > /tmp/type_reference.rst
  .UNINDENT
  .UNINDENT
  .sp
@@@ -77,7 -73,7 +77,7 @@@ o
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -$ puppetdoc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
 +$ puppet doc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
  .UNINDENT
  .UNINDENT
  .sp
@@@ -85,7 -81,7 +85,7 @@@ o
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -$ puppetdoc /etc/puppet/manifests/site.pp
 +$ puppet doc /etc/puppet/manifests/site.pp
  .UNINDENT
  .UNINDENT
  .sp
@@@ -93,7 -89,7 +93,7 @@@ o
  .INDENT 0.0
  .INDENT 3.5
  .sp
 -$ puppetdoc \-m markdown \-r configuration
 +$ puppet doc \-m markdown \-r configuration
  .UNINDENT
  .UNINDENT
  .SH AUTHOR
@@@ -101,7 -97,7 +101,7 @@@
  Luke Kanies
  .SH COPYRIGHT
  .sp
- Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
+ Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU
  Public License
  .\" Generated by docutils manpage writer.
  .\" 

-- 
Puppet packaging for Debian