From 640814ac75da3f54822f12c013afdaef04163a27 Mon Sep 17 00:00:00 2001 From: Mauro Bieg Date: Thu, 19 Jul 2018 22:09:26 +0200 Subject: MANUAL: clarify gfm vs markdown_github (#4783) --- MANUAL.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'MANUAL.txt') diff --git a/MANUAL.txt b/MANUAL.txt index c50d348ac..cedfe3cb7 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -225,9 +225,9 @@ General options - `epub` ([EPUB]) - `fb2` ([FictionBook2] e-book) - `gfm` ([GitHub-Flavored Markdown]), - or `markdown_github`, which provides deprecated and less accurate - support for Github-Flavored Markdown; please use `gfm` instead, - unless you need to use extensions other than `smart`. + or the deprecated and less accurate `markdown_github`; + use [`markdown_github`](#markdown-variants) only + if you need extensions not supported in [`gfm`](#markdown-variants). - `haddock` ([Haddock markup]) - `html` ([HTML]) - `jats` ([JATS] XML) @@ -274,9 +274,9 @@ General options - `epub2` (EPUB v2) - `fb2` ([FictionBook2] e-book) - `gfm` ([GitHub-Flavored Markdown]), - or `markdown_github`, which provides deprecated and less accurate - support for Github-Flavored Markdown; please use `gfm` instead, - unless you use extensions that do not work with `gfm`. + or the deprecated and less accurate `markdown_github`; + use [`markdown_github`](#markdown-variants) only + if you need extensions not supported in [`gfm`](#markdown-variants). - `haddock` ([Haddock markup]) - `html` or `html5` ([HTML], i.e. [HTML5]/XHTML [polyglot markup]) - `html4` ([XHTML] 1.0 Transitional) @@ -4186,7 +4186,7 @@ individually disabled. Also, `raw_tex` only affects `gfm` output, not input. `gfm` (GitHub-Flavored Markdown) -: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `auto_identifiers`, +: `pipe_tables`, `raw_html`, `fenced_code_blocks`, `gfm_auto_identifiers`, `ascii_identifiers`, `backtick_code_blocks`, `autolink_bare_uris`, `intraword_underscores`, `strikeout`, `hard_line_breaks`, `emoji`, `shortcut_reference_links`, `angle_brackets_escapable`. -- cgit v1.2.3