diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 10:58:05 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 10:58:05 -0800 |
| commit | 54397a9e99ada60e7c717624490d77336fab4c86 (patch) | |
| tree | 07b07cafd8d1176d02f711f9cc278028e631ac65 /man | |
| parent | 283f1e60ccd2cdfe48a056687565aedade5ceb6d (diff) | |
| parent | 1ffbb59823975e0df5d0cf04f2384dc1ee05d452 (diff) | |
| download | pandoc-54397a9e99ada60e7c717624490d77336fab4c86.tar.gz | |
Merge branch 'master' into citeproc
Diffstat (limited to 'man')
| -rw-r--r-- | man/man1/pandoc.1.md | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md index 28a085b68..d6f188276 100644 --- a/man/man1/pandoc.1.md +++ b/man/man1/pandoc.1.md @@ -15,8 +15,9 @@ pandoc [*options*] [*input-file*]... Pandoc converts files from one markup format to another. It can read markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it can write plain text, markdown, reStructuredText, HTML, LaTeX, -ConTeXt, Texinfo, groff man, MediaWiki markup, RTF, OpenDocument XML, -ODT, DocBook XML, EPUB, and Slidy or S5 HTML slide shows. +ConTeXt, Texinfo, groff man, MediaWiki markup, Textile, RTF, +OpenDocument XML, ODT, DocBook XML, EPUB, and Slidy or S5 HTML slide +shows. If no *input-file* is specified, input is read from *stdin*. Otherwise, the *input-files* are concatenated (with a blank @@ -72,10 +73,10 @@ should pipe input and output through `iconv`: : Specify output format. *FORMAT* can be `native` (native Haskell), `plain` (plain text), `markdown` (markdown), `rst` (reStructuredText), `html` (HTML), `latex` (LaTeX), `context` (ConTeXt), `man` (groff man), - `mediawiki` (MediaWiki markup), `texinfo` (GNU Texinfo), - `docbook` (DocBook XML), `opendocument` (OpenDocument XML), - `odt` (OpenOffice text document), `epub` (EPUB book), - `slidy` (Slidy HTML and javascript slide show), + `mediawiki` (MediaWiki markup), `textile` (Textile), + `texinfo` (GNU Texinfo), `docbook` (DocBook XML), + `opendocument` (OpenDocument XML), `odt` (OpenOffice text document), + `epub` (EPUB book), `slidy` (Slidy HTML and javascript slide show), `s5` (S5 HTML and javascript slide show), or `rtf` (rich text format). Note that `odt` and `epub` output will not be directed to *stdout*; an output filename must be specified using the `-o/--output` |