Fixed README and pandoc.cabal for TWiki reader.

This commit is contained in:
John MacFarlane 2014-10-31 12:07:19 -07:00
parent 1d268876f8
commit 0169e10344
2 changed files with 16 additions and 15 deletions

14
README
View file

@ -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),

View file

@ -16,14 +16,15 @@ Synopsis: Conversion between markup formats
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) HTML,
reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock
markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can write
markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki,
TWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2,
InDesign ICML, and several kinds of HTML/javascript
slide shows (S5, Slidy, Slideous, DZSlides, reveal.js).
reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki
markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and
Textile, and it can write markdown, reStructuredText, XHTML,
HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT,
Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man
pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
EPUB (v2 and v3), FictionBook2, InDesign ICML, and several
kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
DZSlides, reveal.js).
.
Pandoc extends standard markdown syntax with footnotes,
embedded LaTeX, definition lists, tables, and other