summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-07-02 14:01:39 +1000
committerJames Turnbull <james@lovedthanlost.net>2009-07-10 14:55:41 +1000
commit44f127f738f6427bdf2adbe1d06d57b7b62e715e (patch)
tree6165256ca9d30f70d409113c5b612fdf07fed843 /bin
parent8a8ce9d40fd97b26906301b0587395c9fb9fddf6 (diff)
downloadpuppet-44f127f738f6427bdf2adbe1d06d57b7b62e715e.tar.gz
Added Markdown mode to puppetdoc to output Markdown.
Requires the pandoc binary to function (http://johnmacfarlane.net/pandoc/).
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppetdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/puppetdoc b/bin/puppetdoc
index 09d0966cd..a69d169c9 100755
--- a/bin/puppetdoc
+++ b/bin/puppetdoc
@@ -8,7 +8,7 @@
#
# = Usage
#
-# puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>]
+# puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|markdown|trac|rdoc>]
# [-r|--reference <[type]|configuration|..>] [manifest-file]
#
# = Description
@@ -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'. Note that 'trac' mode only works on Reductive Labs servers. The default mode is 'text'. In 'rdoc' mode you must provide 'manifests-path'
+# Determine the output mode. Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers. 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 +puppetdoc --list+.
@@ -49,6 +49,8 @@
# $ puppetdoc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
# or
# $ puppetdoc /etc/puppet/manifests/site.pp
+# or
+# $ puppetdoc -m markdown -r configuration
#
# = Author
#