aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-06-16 22:16:45 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-06-16 22:16:45 -0700
commitbec9f3c641e1376c0ef27d3df5a7b0a3fc7eee4f (patch)
tree53c00a7038058f04f82aab2d149f0851a538156d /README
parent78ee2416d105bd25337819a49835623a8a296224 (diff)
parentc709cec0bdf7a3029a43f0c46d071a7ca1ab6a13 (diff)
downloadpandoc-bec9f3c641e1376c0ef27d3df5a7b0a3fc7eee4f.tar.gz
Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docx
Diffstat (limited to 'README')
-rw-r--r--README18
1 files changed, 9 insertions, 9 deletions
diff --git a/README b/README
index 6030fa2bb..1883ecd57 100644
--- a/README
+++ b/README
@@ -13,15 +13,15 @@ Description
Pandoc is a [Haskell] library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
-[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], [Emacs Org-mode]
-and [DocBook]; and it can write plain text, [markdown],
-[reStructuredText], [XHTML], [HTML 5], [LaTeX] (including [beamer] slide
-shows), [ConTeXt], [RTF], [OPML], [DocBook], [OpenDocument], [ODT],
-[Word docx], [GNU Texinfo], [MediaWiki markup], [EPUB] (v2 or v3),
-[FictionBook2], [Textile], [groff man] pages, [Emacs Org-Mode],
-[AsciiDoc], [InDesign ICML], and [Slidy], [Slideous], [DZSlides],
-[reveal.js] or [S5] HTML slide shows. It can also produce [PDF] output
-on systems where LaTeX is installed.
+[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], [Emacs
+Org-mode], [DocBook], and [Word docx]; and it can write plain text,
+[markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX] (including
+[beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
+[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
+[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages,
+[Emacs Org-Mode], [AsciiDoc], [InDesign ICML], and [Slidy],
+[Slideous], [DZSlides], [reveal.js] or [S5] HTML slide shows. It can
+also produce [PDF] output on systems where LaTeX is installed.
Pandoc's enhanced version of markdown includes syntax for footnotes,
tables, flexible ordered lists, definition lists, fenced code blocks,