summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-10-31 12:07:19 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-10-31 12:07:19 -0700
commit0169e1034403273a3aa16a5c5d74a71f98705a85 (patch)
tree2a3107c7e17bbce7e64d43ad396fccf0e04f33c4 /README
parent1d268876f8e8f7c1298e3b87cf59f5fd1b0793b8 (diff)
Fixed README and pandoc.cabal for TWiki reader.
Diffstat (limited to 'README')
-rw-r--r--README14
1 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index 89964bd4a..ccd01bba3 100644
--- a/README
+++ b/README
@@ -13,12 +13,12 @@ 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], [DocBook], [txt2tags], [EPUB] 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],
-[DokuWiki markup], [TWiki markup], [Haddock markup], [EPUB] (v2 or v3),
+[LaTeX], [MediaWiki markup], [TWiki markup], [Haddock markup], [OPML],
+[Emacs Org-mode], [DocBook], [txt2tags], [EPUB] 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], [DokuWiki markup], [Haddock 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
@@ -162,7 +162,7 @@ General options
`textile` (Textile), `rst` (reStructuredText), `html` (HTML),
`docbook` (DocBook), `t2t` (txt2tags), `docx` (docx), `epub` (EPUB),
`opml` (OPML), `org` (Emacs Org-mode), `mediawiki` (MediaWiki markup),
- `twiki` (TWiki markpu), `haddock` (Haddock markup), or `latex` (LaTeX).
+ `twiki` (TWiki markup), `haddock` (Haddock markup), or `latex` (LaTeX).
If `+lhs` is appended to `markdown`, `rst`,
`latex`, or `html`, the input will be treated as literate Haskell
source: see [Literate Haskell support](#literate-haskell-support),