@@ -13,14 +13,15 @@ Description
13Pandoc is a [Haskell] library for converting from one markup format to
13Pandoc is a [Haskell] library for converting from one markup format to
14another, and a command-line tool that uses this library. It can read
14another, and a command-line tool that uses this library. It can read
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
15[markdown] and (subsets of) [Textile], [reStructuredText], [HTML],
16−[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], and [DocBook]; and
16+[LaTeX], [MediaWiki markup], [Haddock markup], [OPML], [Emacs Org-mode]
17−it can write plain text, [markdown], [reStructuredText], [XHTML], [HTML 5],
17+and [DocBook]; and it can write plain text, [markdown],
18+[reStructuredText], [XHTML], [HTML 5], [LaTeX] (including [beamer] slide
18−[LaTeX] (including [beamer] slide shows), [ConTeXt], [RTF], [OPML], [DocBook],
19+shows), [ConTeXt], [RTF], [OPML], [DocBook], [OpenDocument], [ODT],
19−[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki markup],
20+[Word docx], [GNU Texinfo], [MediaWiki markup], [EPUB] (v2 or v3),
20−[EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, [Emacs
21+[FictionBook2], [Textile], [groff man] pages, [Emacs Org-Mode],
21−Org-Mode], [AsciiDoc], and [Slidy], [Slideous], [DZSlides], [reveal.js]
22+[AsciiDoc], and [Slidy], [Slideous], [DZSlides], [reveal.js] or [S5]
22−or [S5] HTML slide shows. It can also produce [PDF] output on systems
23+HTML slide shows. It can also produce [PDF] output on systems where
23−where LaTeX is installed.
24+LaTeX is installed.
25Pandoc's enhanced version of markdown includes syntax for footnotes,
26Pandoc's enhanced version of markdown includes syntax for footnotes,
26tables, flexible ordered lists, definition lists, fenced code blocks,
27tables, flexible ordered lists, definition lists, fenced code blocks,
@@ -143,14 +144,14 @@ General options
143 `markdown_phpextra` (PHP Markdown Extra extended markdown),
144 `markdown_phpextra` (PHP Markdown Extra extended markdown),
144 `markdown_github` (github extended markdown),
145 `markdown_github` (github extended markdown),
145 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
146 `textile` (Textile), `rst` (reStructuredText), `html` (HTML),
146− `docbook` (DocBook), `opml` (OPML), `mediawiki` (MediaWiki markup),
147+ `docbook` (DocBook), `opml` (OPML), `org` (Emacs Org-mode),
147− `haddock` (Haddock markup), or `latex` (LaTeX).
148+ `mediawiki` (MediaWiki markup), `haddock` (Haddock markup), or
148− If `+lhs` is appended to `markdown`, `rst`, `latex`, or `html`,
149+ latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
149− the input will be treated as literate Haskell source:
150+ `latex`, or `html`, the input will be treated as literate Haskell
150− see [Literate Haskell support](#literate-haskell-support), below.
151+ source: see [Literate Haskell support](#literate-haskell-support),
151− Markdown syntax extensions can be individually enabled or disabled
152+ below. Markdown syntax extensions can be individually enabled or
152− by appending `+EXTENSION` or `-EXTENSION` to the format name.
153+ disabled by appending `+EXTENSION` or `-EXTENSION` to the format
153− So, for example, `markdown_strict+footnotes+definition_lists`
154+ name. So, for example, `markdown_strict+footnotes+definition_lists`
154 is strict markdown with footnotes and definition lists enabled,
155 is strict markdown with footnotes and definition lists enabled,
155 and `markdown-pipe_tables+hard_line_breaks` is pandoc's markdown
156 and `markdown-pipe_tables+hard_line_breaks` is pandoc's markdown
156 without pipe tables and with hard line breaks. See [Pandoc's
157 without pipe tables and with hard line breaks. See [Pandoc's