summaryrefslogtreecommitdiff
path: root/man/man1
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-12-03 23:50:03 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-12-03 23:50:03 -0800
commit5171de66c53b4117fd0f4b16ef53d037cce38eb4 (patch)
treedc49c9d291321ec35bfb99dad4285c42104a3ad8 /man/man1
parent357b965b4455422cfdeb2676befda31d017f944f (diff)
Updated README and pandoc man page with textile reader.
Diffstat (limited to 'man/man1')
-rw-r--r--man/man1/pandoc.1.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index f6cb7e3a6..88c072ccc 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -13,8 +13,8 @@ pandoc [*options*] [*input-file*]...
# DESCRIPTION
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,
+read markdown and (subsets of) Textile, reStructuredText, HTML, and LaTeX,
+and it can write plain text, markdown, reStructuredText, HTML, LaTeX,
ConTeXt, Texinfo, groff man, MediaWiki markup, Textile, RTF,
OpenDocument XML, ODT, DocBook XML, EPUB, and Slidy or S5 HTML slide
shows.
@@ -65,9 +65,9 @@ should pipe input and output through `iconv`:
-f *FORMAT*, -r *FORMAT*, \--from=*FORMAT*, \--read=*FORMAT*
: Specify input format. *FORMAT* can be
`native` (native Haskell), `markdown` (markdown or plain text),
- `rst` (reStructuredText), `html` (HTML), or `latex` (LaTeX).
- If `+lhs` is appended to `markdown`, `rst`, or `latex`, the input
- will be treated as literate Haskell source.
+ `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
+ or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
+ or `latex`, the input will be treated as literate Haskell source.
-t *FORMAT*, -w *FORMAT*, \--to=*FORMAT*, \--write=*FORMAT*
: Specify output format. *FORMAT* can be `native` (native Haskell),