@@ -13,12 +13,12 @@ Description
13Pandoc is a [Haskell] library for converting from one markup format to
13Pandoc is a [Haskell] library for converting from one markup format to
14another, and a command-line tool that uses this library. It can read
14another, and a command-line tool that uses this library. It can read
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
16−[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], [Emacs
16+[LaTeX], [MediaWiki markup], [TWiki markup], [Haddock markup], [OPML],
17−Org-mode], [DocBook], [txt2tags], [EPUB] and [Word docx]; and it can write plain text,
17+[Emacs Org-mode], [DocBook], [txt2tags], [EPUB] and [Word docx]; and
18−[markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX] (including
18+it can write plain text, [markdown], [reStructuredText], [XHTML],
19−[beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
19+[HTML 5], [LaTeX] (including [beamer] slide shows), [ConTeXt], [RTF],
20−[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
20+[OPML], [DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo],
21−[DokuWiki markup], [TWiki markup], [Haddock markup], [EPUB] (v2 or v3),
21+[MediaWiki markup], [DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3),
22[FictionBook2], [Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc],
22[FictionBook2], [Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc],
23[InDesign ICML], and [Slidy], [Slideous], [DZSlides], [reveal.js] or
23[InDesign ICML], and [Slidy], [Slideous], [DZSlides], [reveal.js] or
24[S5] HTML slide shows. It can also produce [PDF] output on systems where
24[S5] HTML slide shows. It can also produce [PDF] output on systems where
@@ -162,7 +162,7 @@ General options
162 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
162 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
163 `docbook` (DocBook), `t2t` (txt2tags), `docx` (docx), `epub` (EPUB),
163 `docbook` (DocBook), `t2t` (txt2tags), `docx` (docx), `epub` (EPUB),
164 `opml` (OPML), `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup),
164 `opml` (OPML), `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup),
165− `twiki` (TWiki markpu), `haddock` (Haddock markup), or `latex` (LaTeX).
165+ `twiki` (TWiki markup), `haddock` (Haddock markup), or `latex` (LaTeX).
166 If `+lhs` is appended to `markdown`, `rst`,
166 If `+lhs` is appended to `markdown`, `rst`,
167 `latex`, or `html`, the input will be treated as literate Haskell
167 `latex`, or `html`, the input will be treated as literate Haskell
168 source: see [Literate Haskell support](#literate-haskell-support),
168 source: see [Literate Haskell support](#literate-haskell-support),