path: root/
diff options
authorJohn MacFarlane <>2017-10-26 16:30:37 -0700
committerJohn MacFarlane <>2017-10-26 16:30:37 -0700
commit7d60e9e0ebaaaeb5d8c3fd2312c4714011728462 (patch)
tree051976a9633c8c5063e1148bf5c8d8be5235b435 /
parenta9c9f39e1203726019c92cd35e657c55d7291a84 (diff)
Bring MANUAL, README, and pandoc.cabal description in sync.
Diffstat (limited to '')
1 files changed, 6 insertions, 5 deletions
diff --git a/ b/
index e116d2e45..eaaf79059 100644
--- a/
+++ b/
@@ -19,9 +19,9 @@ another, and a command-line tool that uses this library. It can read
[Markdown], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored
Markdown], [MultiMarkdown], and (subsets of) [Textile],
[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup],
-[TikiWiki markup], [Haddock markup], [OPML], [Emacs Org mode], [DocBook],
-[Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx]; and it can
-write plain text, [Markdown], [CommonMark], [PHP Markdown
+[TikiWiki markup], [Creole 1.0], [Haddock markup], [OPML], [Emacs Org mode],
+[DocBook], [Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and [Word docx];
+and it can write plain text, [Markdown], [CommonMark], [PHP Markdown
Extra], [GitHub-Flavored Markdown], [MultiMarkdown],
[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including
[`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook],
@@ -31,8 +31,8 @@ markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup],
[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI
Simple], [Muse] and [Slidy], [Slideous], [DZSlides], [reveal.js]
or [S5] HTML slide shows. It can also produce [PDF] output on
-systems where LaTeX, ConTeXt, `pdfroff`, or `wkhtmltopdf` is
+systems where LaTeX, ConTeXt, `pdfroff`, `wkhtmltopdf`,
+`prince`, or `weasyprint` is installed.
Pandoc's enhanced version of Markdown includes syntax for [footnotes],
[tables], flexible [ordered lists], [definition lists], [fenced code
@@ -77,6 +77,7 @@ Markdown can be expected to be lossy.
[Beamer User's Guide]:
+[Creole 1.0]: