@@ -13,14 +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], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown],
15[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown],
16−and (subsets of) [Textile], [reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki
16+[MultiMarkdown], and (subsets of) [Textile], [reStructuredText], [HTML],
17−markup], [Haddock markup], [OPML], [Emacs Org mode], [DocBook],
17+[LaTeX], [MediaWiki markup], [TWiki markup], [Haddock markup], [OPML], [Emacs
18−[txt2tags], [EPUB], [ODT] and [Word docx]; and it can write plain text,
18+Org mode], [DocBook], [txt2tags], [EPUB], [ODT] and [Word docx]; and it can
19−[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown],
19+write plain text, [Markdown], [CommonMark], [PHP Markdown Extra],
20−[reStructuredText], [XHTML], [HTML5], [LaTeX] (including
20+[GitHub-Flavored Markdown], [MultiMarkdown], [reStructuredText], [XHTML],
21−[`beamer`] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
21+[HTML5], [LaTeX] (including [`beamer`] slide shows), [ConTeXt], [RTF], [OPML],
22−[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
22+[DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
23−[DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3),
23+markup], [DokuWiki markup], [Haddock markup], [EPUB] (v2 or v3),
24[FictionBook2], [Textile], [groff man] pages, [Emacs Org mode],
24[FictionBook2], [Textile], [groff man] pages, [Emacs Org mode],
25[AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy], [Slideous], [DZSlides],
25[AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy], [Slideous], [DZSlides],
26[reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output
26[reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output
@@ -55,6 +55,7 @@ Markdown can be expected to be lossy.
55[CommonMark]: http://commonmark.org
55[CommonMark]: http://commonmark.org
56[PHP Markdown Extra]: https://michelf.ca/projects/php-markdown/extra/
56[PHP Markdown Extra]: https://michelf.ca/projects/php-markdown/extra/
57[GitHub-Flavored Markdown]: https://help.github.com/articles/github-flavored-markdown/
57[GitHub-Flavored Markdown]: https://help.github.com/articles/github-flavored-markdown/
58+[MultiMarkdown]: http://fletcherpenney.net/multimarkdown/
58[reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html
59[reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html
59[S5]: http://meyerweb.com/eric/tools/s5/
60[S5]: http://meyerweb.com/eric/tools/s5/
60[Slidy]: http://www.w3.org/Talks/Tools/Slidy/
61[Slidy]: http://www.w3.org/Talks/Tools/Slidy/
@@ -242,8 +243,8 @@ General options
242: Specify input format. *FORMAT* can be `native` (native Haskell),
243: Specify input format. *FORMAT* can be `native` (native Haskell),
243 `json` (JSON version of native AST), `markdown` (pandoc's
244 `json` (JSON version of native AST), `markdown` (pandoc's
244 extended Markdown), `markdown_strict` (original unextended
245 extended Markdown), `markdown_strict` (original unextended
245− Markdown), `markdown_phpextra` (PHP Markdown Extra),
246+ Markdown), `markdown_phpextra` (PHP Markdown Extra), `markdown_github`
246− `markdown_github` (GitHub-Flavored Markdown),
247+ (GitHub-Flavored Markdown), `markdown_mmd` (MultiMarkdown),
247 `commonmark` (CommonMark Markdown), `textile` (Textile), `rst`
248 `commonmark` (CommonMark Markdown), `textile` (Textile), `rst`
248 (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
249 (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
249 (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
250 (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
@@ -267,8 +268,8 @@ General options
267 `json` (JSON version of native AST), `plain` (plain text),
268 `json` (JSON version of native AST), `plain` (plain text),
268 `markdown` (pandoc's extended Markdown), `markdown_strict`
269 `markdown` (pandoc's extended Markdown), `markdown_strict`
269 (original unextended Markdown), `markdown_phpextra` (PHP Markdown
270 (original unextended Markdown), `markdown_phpextra` (PHP Markdown
270− Extra), `markdown_github` (GitHub-Flavored
271+ Extra), `markdown_github` (GitHub-Flavored Markdown), `markdown_mmd`
271− Markdown), `commonmark` (CommonMark Markdown), `rst`
272+ (MultiMarkdown), `commonmark` (CommonMark Markdown), `rst`
272 (reStructuredText), `html` (XHTML), `html5` (HTML5), `latex`
273 (reStructuredText), `html` (XHTML), `html5` (HTML5), `latex`
273 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
274 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
274 `man` (groff man), `mediawiki` (MediaWiki markup), `dokuwiki`
275 `man` (groff man), `mediawiki` (MediaWiki markup), `dokuwiki`