@@ -8,7 +8,7 @@ another, and a command-line tool that uses this library. It can read
88and [LaTeX]; and it can write plain text, [markdown], [reStructuredText],
99[HTML], [LaTeX], [ConTeXt], [RTF], [DocBook XML], [OpenDocument XML], [ODT],
1010[GNU Texinfo], [MediaWiki markup], [EPUB], [Textile], [groff man] pages,
11−and [Slidy] or [S5] HTML slide shows.
11+[Emacs Org-Mode], and [Slidy] or [S5] HTML slide shows.
1212
1313Pandoc's enhanced version of markdown includes syntax for footnotes,
1414tables, flexible ordered lists, definition lists, delimited code blocks,
@@ -76,8 +76,9 @@ Supported output formats include `markdown`, `latex`, `context`
7676(reStructuredText), `docbook` (DocBook XML), `opendocument`
7777(OpenDocument XML), `odt` (OpenOffice text document), `texinfo`, (GNU
7878Texinfo), `mediawiki` (MediaWiki markup), `textile` (Textile),
79−`epub` (EPUB ebook), `man` (groff man), `slidy` (slidy HTML and
80−javascript slide show), or `s5` (S5 HTML and javascript slide show).
79+`epub` (EPUB ebook), `man` (groff man), `org` (Emacs Org-Mode),
80+`slidy` (slidy HTML and javascript slide show), or `s5`
81+(S5 HTML and javascript slide show).
8182
8283Supported input formats include `markdown`, `textile`, `html`,
8384`latex`, and `rst`. Note that the `rst` reader only parses a subset of
@@ -170,15 +171,18 @@ For further documentation, see the `pandoc(1)` man page.
170171`-f`, `--from`, `-r`, or `--read` *format*
171172: specifies the input format (the format Pandoc will be converting
172173 *from*). *format* can be `native`, `markdown`, `textile`, `rst`, `html`,
173− or `latex`. (`+lhs` can be appended to indicate that the input should
174− be treated as literate Haskell source. See
175− [Literate Haskell support](#literate-haskell-support), below.)
174+ or `latex`. (`+lhs` can be appended to `html`, `markdown`, `latex`,
175+ or `rst` to indicate that the input should be treated as literate Haskell
176+ source. See [Literate Haskell support](#literate-haskell-support),
177+ below.)
176178
177179`-t`, `--to`, `-w`, or `--write` *format*
178180: specifies the output format -- the format Pandoc will
179181 be converting *to*. *format* can be `native`, `html`, `slidy`, `s5`,
180− `docbook`, `opendocument`, `latex`, `context`, `markdown`, `man`,
181− `plain`, `rst`, and `rtf`. (`+lhs` can be appended to indicate that
182+ `docbook`, `opendocument`, `odt`, `epub`, `latex`, `context`,
183+ `markdown`, `man`, `plain`, `mediawiki`, `texinfo`, `textile`, `org`,
184+ `plain`, `rst`, and `rtf`. (`+lhs` can be appended to `html`,
185+ `markdown`, `rst`, or `latex` to indicate that
182186 the output should be treated as literate Haskell source. See
183187 [Literate Haskell support](#literate-haskell-support), below.)
184188
@@ -1217,8 +1221,8 @@ you need to enclose text in literal $ characters, backslash-escape
12171221them and they won't be treated as math delimiters.
12181222
12191223TeX math will be printed in all output formats. In Markdown,
1220−reStructuredText, LaTeX, and ConTeXt output, it will appear verbatim
1221−between $ characters.
1224+reStructuredText, LaTeX, Org-Mode, and ConTeXt output, it will appear
1225+verbatim between $ characters.
12221226
12231227In reStructuredText output, it will be rendered using an interpreted
12241228text role `:math:`, as described
@@ -1474,6 +1478,7 @@ and pasted as literate Haskell source.
14741478[groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html
14751479[Haskell]: http://www.haskell.org/
14761480[GNU Texinfo]: http://www.gnu.org/software/texinfo/
1481+[Emacs Org-Mode]: http://org-mode.org
14771482[EPUB]: http://www.idpf.org/
14781483[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License"
14791484