@@ -18,10 +18,11 @@ Org-mode], [DocBook], [txt2tags], [EPUB] and [Word docx]; and it can write plain
1818[markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX] (including
1919[beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
2020[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
21−[DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3), [FictionBook2],
22−[Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc], [InDesign ICML],
23−and [Slidy], [Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows.
24−It can also produce [PDF] output on systems where LaTeX is installed.
21+[DokuWiki markup], [TWiki markup], [Haddock markup], [EPUB] (v2 or v3),
22+[FictionBook2], [Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc],
23+[InDesign ICML], and [Slidy], [Slideous], [DZSlides], [reveal.js] or
24+[S5] HTML slide shows. It can also produce [PDF] output on systems where
25+LaTeX is installed.
2526
2627Pandoc's enhanced version of markdown includes syntax for footnotes,
2728tables, flexible ordered lists, definition lists, fenced code blocks,
@@ -147,8 +148,8 @@ General options
147148 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
148149 `docbook` (DocBook), `t2t` (txt2tags), `docx` (docx), `epub` (EPUB),
149150 `opml` (OPML), `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup),
150− `haddock` (Haddock markup), or `latex` (LaTeX). If `+lhs` is appended
151− to `markdown`, `rst`,
151+ `twiki` (TWiki markpu), `haddock` (Haddock markup), or `latex` (LaTeX).
152+ If `+lhs` is appended to `markdown`, `rst`,
152153 `latex`, or `html`, the input will be treated as literate Haskell
153154 source: see [Literate Haskell support](#literate-haskell-support),
154155 below. Markdown syntax extensions can be individually enabled or
@@ -239,8 +240,8 @@ Reader options
239240 to curly quotes, `---` to em-dashes, `--` to en-dashes, and
240241 `...` to ellipses. Nonbreaking spaces are inserted after certain
241242 abbreviations, such as "Mr." (Note: This option is significant only when
242− the input format is `markdown`, `markdown_strict`, or `textile`. It
243− is selected automatically when the input format is `textile` or the
243+ the input format is `markdown`, `markdown_strict`, `textile` or `twiki`.
244+ It is selected automatically when the input format is `textile` or the
244245 output format is `latex` or `context`, unless `--no-tex-ligatures`
245246 is used.)
246247
@@ -3168,6 +3169,7 @@ Rosenthal.
31683169[Textile]: http://redcloth.org/textile
31693170[MediaWiki markup]: http://www.mediawiki.org/wiki/Help:Formatting
31703171[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki
3172+[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules
31713173[Haddock markup]: http://www.haskell.org/haddock/doc/html/ch03s08.html
31723174[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
31733175[Haskell]: http://www.haskell.org/