@@ -4,11 +4,11 @@
44
55Pandoc is a [Haskell] library for converting from one markup format to
66another, and a command-line tool that uses this library. It can read
7−[markdown] and (subsets of) [reStructuredText], [HTML], and [LaTeX]; and
8−it can write plain text, [markdown], [reStructuredText], [HTML], [LaTeX],
9−[ConTeXt], [RTF], [DocBook XML], [OpenDocument XML], [ODT], [GNU Texinfo],
10−[MediaWiki markup], [EPUB], [Textile], [groff man] pages, and [Slidy]
11−or [S5] HTML slide shows.
7+[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
8+and [LaTeX]; and it can write plain text, [markdown], [reStructuredText],
9+[HTML], [LaTeX], [ConTeXt], [RTF], [DocBook XML], [OpenDocument XML], [ODT],
10+[GNU Texinfo], [MediaWiki markup], [EPUB], [Textile], [groff man] pages,
11+and [Slidy] or [S5] HTML slide shows.
1212
1313Pandoc's enhanced version of markdown includes syntax for footnotes,
1414tables, flexible ordered lists, definition lists, delimited code blocks,
@@ -79,11 +79,12 @@ Texinfo), `mediawiki` (MediaWiki markup), `textile` (Textile),
7979`epub` (EPUB ebook), `man` (groff man), `slidy` (slidy HTML and
8080javascript slide show), or `s5` (S5 HTML and javascript slide show).
8181
82−Supported input formats include `markdown`, `html`, `latex`, and `rst`.
83−Note that the `rst` reader only parses a subset of reStructuredText
84−syntax. For example, it doesn't handle tables, option lists, or
85−footnotes. But for simple documents it should be adequate. The `latex`
86−and `html` readers are also limited in what they can do.
82+Supported input formats include `markdown`, `textile`, `html`,
83+`latex`, and `rst`. Note that the `rst` reader only parses a subset of
84+reStructuredText syntax. For example, it doesn't handle tables, option
85+lists, or footnotes. But for simple documents it should be adequate.
86+The `textile`, `latex`, and `html` readers are also limited in what they
87+can do.
8788
8889If you don't specify a reader or writer explicitly, `pandoc` will
8990try to determine the input and output format from the extensions of
@@ -168,8 +169,8 @@ For further documentation, see the `pandoc(1)` man page.
168169
169170`-f`, `--from`, `-r`, or `--read` *format*
170171: specifies the input format (the format Pandoc will be converting
171− *from*). *format* can be `native`, `markdown`, `rst`, `html`, or
172− `latex`. (`+lhs` can be appended to indicate that the input should
172+ *from*). *format* can be `native`, `markdown`, `textile`, `rst`, `html`,
173+ or `latex`. (`+lhs` can be appended to indicate that the input should
173174 be treated as literate Haskell source. See
174175 [Literate Haskell support](#literate-haskell-support), below.)
175176
@@ -1314,7 +1315,7 @@ and ConTeXt.
13141315Citations
13151316---------
13161317
1317−
1318+TODO
13181319
13191320Producing HTML slide shows with Pandoc
13201321======================================