@@ -263,14 +263,17 @@ General options
263: Specify input format. *FORMAT* can be `native` (native Haskell),
263: Specify input format. *FORMAT* can be `native` (native Haskell),
264 `json` (JSON version of native AST), `markdown` (pandoc's
264 `json` (JSON version of native AST), `markdown` (pandoc's
265 extended Markdown), `markdown_strict` (original unextended
265 extended Markdown), `markdown_strict` (original unextended
266− Markdown), `markdown_phpextra` (PHP Markdown Extra), `markdown_github`
266+ Markdown), `markdown_phpextra` (PHP Markdown Extra),
267− (GitHub-Flavored Markdown), `markdown_mmd` (MultiMarkdown),
267+ `markdown_mmd` (MultiMarkdown), `gfm` (GitHub-Flavored Markdown),
268 `commonmark` (CommonMark Markdown), `textile` (Textile), `rst`
268 `commonmark` (CommonMark Markdown), `textile` (Textile), `rst`
269 (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
269 (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t`
270 (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
270 (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML),
271 `org` (Emacs Org mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki
271 `org` (Emacs Org mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki
272 markup), `tikiwiki` (TikiWiki markup), `haddock` (Haddock markup), or
272 markup), `tikiwiki` (TikiWiki markup), `haddock` (Haddock markup), or
273+ `latex` (LaTeX). (`markdown_github` provides deprecated and
274+ less accurate suppport for Github-Flavored Markdown; please
275+ use `gfm` instead, unless you use extensions that do not work
273− `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`, `latex`, or
276+ with `gfm`.) If `+lhs` is appended to `markdown`, `rst`, `latex`, or
274 `html`, the input will be treated as literate Haskell source: see
277 `html`, the input will be treated as literate Haskell source: see
275 [Literate Haskell support], below. Markdown
278 [Literate Haskell support], below. Markdown
276 syntax extensions can be individually enabled or disabled by
279 syntax extensions can be individually enabled or disabled by
@@ -289,8 +292,8 @@ General options
289 `json` (JSON version of native AST), `plain` (plain text),
292 `json` (JSON version of native AST), `plain` (plain text),
290 `markdown` (pandoc's extended Markdown), `markdown_strict`
293 `markdown` (pandoc's extended Markdown), `markdown_strict`
291 (original unextended Markdown), `markdown_phpextra` (PHP Markdown
294 (original unextended Markdown), `markdown_phpextra` (PHP Markdown
292− Extra), `markdown_github` (GitHub-Flavored Markdown), `markdown_mmd`
295+ Extra), `markdown_mmd` (MultiMarkdown), `gfm` (GitHub-Flavored
293− (MultiMarkdown), `commonmark` (CommonMark Markdown), `rst`
296+ Markdown), `commonmark` (CommonMark Markdown), `rst`
294 (reStructuredText), `html4` (XHTML 1.0 Transitional), `html`
297 (reStructuredText), `html4` (XHTML 1.0 Transitional), `html`
295 or `html5` (HTML5/XHTML [polyglot markup]), `latex`
298 or `html5` (HTML5/XHTML [polyglot markup]), `latex`
296 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
299 (LaTeX), `beamer` (LaTeX beamer slide show), `context` (ConTeXt),
@@ -308,7 +311,10 @@ General options
308 `dzslides` (DZSlides HTML5 + JavaScript slide show),
311 `dzslides` (DZSlides HTML5 + JavaScript slide show),
309 `revealjs` (reveal.js HTML5 + JavaScript slide show), `s5`
312 `revealjs` (reveal.js HTML5 + JavaScript slide show), `s5`
310 (S5 HTML and JavaScript slide show), or the path of a custom
313 (S5 HTML and JavaScript slide show), or the path of a custom
311− lua writer (see [Custom writers], below). Note that `odt`,
314+ lua writer (see [Custom writers], below). (`markdown_github`
315+ provides deprecated and less accurate suppport for
316+ Github-Flavored Markdown; please use `gfm` instead, unless
317+ you use extensions that do not work with `gfm`.) Note that `odt`,
312 `epub`, and `epub3` output will not be directed to *stdout*;
318 `epub`, and `epub3` output will not be directed to *stdout*;
313 an output filename must be specified using the `-o/--output`
319 an output filename must be specified using the `-o/--output`
314 option. If `+lhs` is appended to `markdown`, `rst`, `latex`,
320 option. If `+lhs` is appended to `markdown`, `rst`, `latex`,
@@ -3740,7 +3746,7 @@ variants are supported:
3740 `header_attributes`, `link_attributes`, `abbreviations`,
3746 `header_attributes`, `link_attributes`, `abbreviations`,
3741 `shortcut_reference_links`.
3747 `shortcut_reference_links`.
3743−`markdown_github` (GitHub-Flavored Markdown)
3749+`gfm` and `markdown_github` (GitHub-Flavored Markdown)
3744: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`,
3750: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`,
3745 `ascii_identifiers`, `backtick_code_blocks`, `autolink_bare_uris`,
3751 `ascii_identifiers`, `backtick_code_blocks`, `autolink_bare_uris`,
3746 `intraword_underscores`, `strikeout`, `hard_line_breaks`, `emoji`,
3752 `intraword_underscores`, `strikeout`, `hard_line_breaks`, `emoji`,