diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-06-13 17:41:20 -0700 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-06-13 17:41:20 -0700 |
| commit | 2e95568be7df9dd40a66a40e57e920c26f04da73 (patch) | |
| tree | 5ae762a7398ed4f7a95eae67a3f1bd19dffa8b95 | |
| parent | d1c965a2e1ddde3907ecf83303a832a6fd5c20e9 (diff) | |
| parent | de064693c3b6846718497bcfb42ef0b9e44ab90b (diff) | |
| download | puppet-2e95568be7df9dd40a66a40e57e920c26f04da73.tar.gz puppet-2e95568be7df9dd40a66a40e57e920c26f04da73.tar.xz puppet-2e95568be7df9dd40a66a40e57e920c26f04da73.zip | |
Merge branch 'ticket/2.7.x/5641' into 2.7.x
| -rw-r--r-- | lib/puppet/application/doc.rb | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index a88f27c78..65cd37da8 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -87,29 +87,40 @@ puppet doc will output a single manifest's documentation on stdout. OPTIONS ------- * --all: - Output the docs for all of the reference types. In 'rdoc' - modes, this also outputs documentation for all resources + Output the docs for all of the reference types. In 'rdoc' mode, this also + outputs documentation for all resources. * --help: Print this help message * --outputdir: - Specifies the directory where to output the rdoc - documentation in 'rdoc' mode. + Used only in 'rdoc' mode. The directory to which the rdoc output should + be written. * --mode: - 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' + 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'. + Build a particular reference. Get a list of references by running + 'puppet doc --list'. * --charset: - Used only in 'rdoc' mode. It sets the charset used in the - html files produced. + Used only in 'rdoc' mode. It sets the charset used in the html files produced. + +* --manifestdir: + Used only in 'rdoc' mode. The directory to scan for stand-alone manifests. + If not supplied, puppet doc will use the manifestdir from puppet.conf. + +* --modulepath: + Used only in 'rdoc' mode. The directory or directories to scan for modules. + If not supplied, puppet doc will use the modulepath from puppet.conf. + +* --environment: + Used only in 'rdoc' mode. The configuration environment from which + to read the modulepath and manifestdir settings, when reading said settings + from puppet.conf. Due to a known bug, this option is not currently effective. EXAMPLE |