summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-11-27 10:52:44 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-11-27 10:52:44 -0800
commitc989bf028fa226acb7b03039d0d77ef1e6a4700e (patch)
tree70c5d3af464d52e7d905f1039fdf3c37655ff8ef /man
parentf0b7945b2007fa2356f638864ca644bb851b0c18 (diff)
parent71c9316a597298415a7d4cb7f758b523ac9339cd (diff)
Merge branch 'textile'
Conflicts: README man/man1/pandoc.1.md pandoc.cabal
Diffstat (limited to 'man')
-rw-r--r--man/man1/pandoc.1.md13
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`