@@ -13,13 +13,14 @@ 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], and [DocBook XML]; and it can write plain text, [markdown],
16+[LaTeX], [MediaWiki markup], and [DocBook XML]; and it can write plain
17−[reStructuredText], [XHTML], [HTML 5], [LaTeX] (including [beamer]
17+text, [markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX]
18−slide shows), [ConTeXt], [RTF], [DocBook XML], [OpenDocument XML],
18+(including [beamer] slide shows), [ConTeXt], [RTF], [DocBook XML],
19−[ODT], [Word docx], [GNU Texinfo], [MediaWiki markup], [EPUB], [FictionBook2],
19+[OpenDocument XML], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
20−[Textile], [groff man] pages, [Emacs Org-Mode], [AsciiDoc], and [Slidy],
20+markup], [EPUB], [FictionBook2], [Textile], [groff man] pages, [Emacs
21−[Slideous], [DZSlides], or [S5] HTML slide shows. It can also produce
21+Org-Mode], [AsciiDoc], and [Slidy], [Slideous], [DZSlides], or [S5] HTML
22−[PDF] output on systems where LaTeX is installed.
22+slide shows. It can also produce [PDF] output on systems where LaTeX is
24Pandoc's enhanced version of markdown includes syntax for footnotes,
25Pandoc's enhanced version of markdown includes syntax for footnotes,
25tables, flexible ordered lists, definition lists, fenced code blocks,
26tables, flexible ordered lists, definition lists, fenced code blocks,
@@ -140,18 +141,18 @@ General options
140 `json` (JSON version of native AST), `markdown` (pandoc's
141 `json` (JSON version of native AST), `markdown` (pandoc's
141 extended markdown), `markdown_strict` (original unextended markdown),
142 extended markdown), `markdown_strict` (original unextended markdown),
142 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
143 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
143− `docbook` (DocBook XML), or `latex` (LaTeX). If `+lhs` is
144+ `docbook` (DocBook XML), `mediawiki` (MediaWiki markup),
144− appended to `markdown`, `rst`, `latex`, the input will be
145+ or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
145− treated as literate Haskell source: see [Literate Haskell
146+ `latex`, the input will be treated as literate Haskell source:
146− support](#literate-haskell-support), below. Markdown syntax
147+ see [Literate Haskell support](#literate-haskell-support), below.
147− extensions can be individually enabled or disabled by appending
148+ Markdown syntax extensions can be individually enabled or disabled
148− `+EXTENSION` or `-EXTENSION` to the format name. So, for example,
149+ by appending `+EXTENSION` or `-EXTENSION` to the format name.
149− `markdown_strict+footnotes+definition_lists` is strict markdown
150+ So, for example, `markdown_strict+footnotes+definition_lists`
150− with footnotes and definition lists enabled, and
151+ is strict markdown with footnotes and definition lists enabled,
151− `markdown-pipe_tables+hard_line_breaks` is pandoc's markdown
152+ and `markdown-pipe_tables+hard_line_breaks` is pandoc's markdown
152− without pipe tables and with hard line breaks. See
153+ without pipe tables and with hard line breaks. See [Pandoc's
153− [Pandoc's markdown](#pandocs-markdown), below, for a list of
154+ markdown](#pandocs-markdown), below, for a list of extensions and
154− extensions and their names.
155+ their names.
156`-t` *FORMAT*, `-w` *FORMAT*, `--to=`*FORMAT*, `--write=`*FORMAT*
157`-t` *FORMAT*, `-w` *FORMAT*, `--to=`*FORMAT*, `--write=`*FORMAT*
157: Specify output format. *FORMAT* can be `native` (native Haskell),
158: Specify output format. *FORMAT* can be `native` (native Haskell),