diff options
| author | ickc <ickc@users.noreply.github.com> | 2016-10-22 13:33:45 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-10-22 22:33:45 +0200 |
| commit | 8b9cce97920d62a4b85a88eac8433512226329a9 (patch) | |
| tree | 88383354e723880b14ae9f7680d5108609e6d33b /MANUAL.txt | |
| parent | 48519861877327743d6accbde9b65a095265b0b0 (diff) | |
"Merge" MANUAL.txt into README.md (#3167)
* "Merge" MANUAL.txt into README.md
Pull request #3157 without the automatic building from MANUAL.txt to
README.md
* remove contributors in README.md
Diffstat (limited to 'MANUAL.txt')
| -rw-r--r-- | MANUAL.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MANUAL.txt b/MANUAL.txt index 3c66ba658..6cabf1941 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -18,10 +18,10 @@ another, and a command-line tool that uses this library. It can read Org mode], [DocBook], [txt2tags], [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], +[HTML5], [LaTeX] \(including [`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup], -[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, +[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man] pages, [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI Simple], and [Slidy], [Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output on systems where LaTeX, ConTeXt, or `wkhtmltopdf` is @@ -31,8 +31,8 @@ Pandoc's enhanced version of Markdown includes syntax for [footnotes], [tables], flexible [ordered lists], [definition lists], [fenced code blocks], [superscripts and subscripts], [strikeout], [metadata blocks], automatic tables of contents, embedded LaTeX [math], [citations], and [Markdown inside HTML block -elements][Extension: `markdown_in_html_blocks`]. (These enhancements, described below under -[Pandoc's Markdown], can be disabled using the +elements][Extension: `markdown_in_html_blocks`]. (These enhancements, described +further under [Pandoc's Markdown], can be disabled using the `markdown_strict` input or output format.) In contrast to most existing tools for converting Markdown to HTML, which @@ -3946,7 +3946,7 @@ which you can modify according to your needs, do Authors ======= -© 2006-2015 John MacFarlane (jgm@berkeley.edu). Released under the +© 2006-2016 John MacFarlane (jgm@berkeley.edu). Released under the [GPL], version 2 or greater. This software carries no warranty of any kind. (See COPYRIGHT for full copyright and warranty notices.) |