@@ -13,9 +13,9 @@ Description
1313Pandoc is a [Haskell] library for converting from one markup format to
1414another, and a command-line tool that uses this library. It can read
1515[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
16−[LaTeX], [MediaWiki markup], [OPML], and [DocBook]; and it can write
17−plain text, [markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX]
18−(including [beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
16+[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], and [DocBook]; and
17+it can write plain text, [markdown], [reStructuredText], [XHTML], [HTML 5],
18+[LaTeX] (including [beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
1919[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
2020[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, [Emacs
2121Org-Mode], [AsciiDoc], and [Slidy], [Slideous], [DZSlides], [reveal.js]
@@ -144,8 +144,9 @@ General options
144144 `markdown_github` (github extended markdown),
145145 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
146146 `docbook` (DocBook), `opml` (OPML), `mediawiki` (MediaWiki markup),
147− or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
148− `latex`, the input will be treated as literate Haskell source:
147+ `haddock` (Haddock markup), or `latex` (LaTeX).
148+ If `+lhs` is appended to `markdown`, `rst`, `latex`, or `html`,
149+ the input will be treated as literate Haskell source:
149150 see [Literate Haskell support](#literate-haskell-support), below.
150151 Markdown syntax extensions can be individually enabled or disabled
151152 by appending `+EXTENSION` or `-EXTENSION` to the format name.
@@ -2653,6 +2654,7 @@ Sergey Astanin, Arlo O'Keeffe, Denis Laxalde, Brent Yorgey.
26532654[ODT]: http://en.wikipedia.org/wiki/OpenDocument
26542655[Textile]: http://redcloth.org/textile
26552656[MediaWiki markup]: http://www.mediawiki.org/wiki/Help:Formatting
2657+[Haddock markup]: http://www.haskell.org/haddock/doc/html/ch03s08.html
26562658[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
26572659[Haskell]: http://www.haskell.org/
26582660[GNU Texinfo]: http://www.gnu.org/software/texinfo/