aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorYan Pas <yanp.bugz@gmail.com>2018-10-07 18:10:01 +0300
committerYan Pas <yanp.bugz@gmail.com>2018-10-07 18:10:01 +0300
commit27467189ab184c5d098e244e01f7d1bfdb0d4d45 (patch)
treed1fb96ebbc49ee0c4e73ef354feddd521690d545 /README.md
parent4f3dd3b1af7217214287ab886147c5e33a54774d (diff)
parentbd8a66394bc25b52dca9ffd963a560a4ca492f9c (diff)
downloadpandoc-27467189ab184c5d098e244e01f7d1bfdb0d4d45.tar.gz
Merge branch 'master' into groff_reader
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index dc64421f1..51e5c0a48 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,9 @@ library. It can convert *from*
e-book)
- `gfm` ([GitHub-Flavored
Markdown](https://help.github.com/articles/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](https://www.haskell.org/haddock/doc/html/ch03s08.html))
- `html` ([HTML](http://www.w3.org/html/))
@@ -92,9 +92,9 @@ It can convert *to*
e-book)
- `gfm` ([GitHub-Flavored
Markdown](https://help.github.com/articles/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](https://www.haskell.org/haddock/doc/html/ch03s08.html))
- `html` or `html5` ([HTML](http://www.w3.org/html/), i.e.