diff options
| author | Markus Roberts <Markus@reality.com> | 2011-02-01 17:57:06 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2011-02-01 17:57:06 -0800 |
| commit | 2a94c61e6c94b1167ea7b858dc184f9f77a7bfc5 (patch) | |
| tree | e8055300f7d3ac1d3b3a04aed1fab18dbba8789e /lib/puppet/util/command_line/puppetdoc | |
| parent | 07edcf716b2f90fb830053b207fe5dc7efcff1f3 (diff) | |
| parent | ed1359902d14a0ca89dac5debee756209b0bd433 (diff) | |
Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
Diffstat (limited to 'lib/puppet/util/command_line/puppetdoc')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/command_line/puppetdoc b/lib/puppet/util/command_line/puppetdoc index 8f24ea5ef..45a9c6518 100755 --- a/lib/puppet/util/command_line/puppetdoc +++ b/lib/puppet/util/command_line/puppetdoc @@ -37,7 +37,7 @@ # Specifies the directory where to output the rdoc documentation in 'rdoc' mode. # # mode:: -# Determine the output mode. Valid modes are 'text', 'trac', 'pdf' and 'rdoc'. The 'pdf' mode creates PDF formatted files in the /tmp directory. The default mode is 'text'. In 'rdoc' mode you must provide 'manifests-path' +# Determine the output mode. Valid modes are 'text', 'pdf' and 'rdoc'. The 'pdf' mode creates PDF formatted files in the /tmp directory. The default mode is 'text'. In 'rdoc' mode you must provide 'manifests-path' # # reference:: # Build a particular reference. Get a list of references by running +puppet doc --list+. @@ -47,7 +47,7 @@ # # = Example # -# $ puppet doc -r type > /tmp/type_reference.rst +# $ puppet doc -r type > /tmp/type_reference.markdown # or # $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests # or |