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