summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-12-05 09:45:45 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-12-05 09:45:55 -0800
commit05b801767952a91f1f14f040487b96cd8662f172 (patch)
treec452977d6af4173a74316124b6b6dafc3280b4f3 /man
parente8e491bdbf86b95e2ce2beac2a7062c57bfd9e5d (diff)
Documented org-mode writer in README, cabal, man pages.
Diffstat (limited to 'man')
-rw-r--r--man/man1/pandoc.1.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
index 68c75920a..81a697823 100644
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -16,8 +16,8 @@ Pandoc converts files from one markup format to another. It can
read markdown and (subsets of) Textile, reStructuredText, HTML, and LaTeX,
and it can write plain text, markdown, reStructuredText, HTML, LaTeX,
ConTeXt, Texinfo, groff man, MediaWiki markup, Textile, RTF,
-OpenDocument XML, ODT, DocBook XML, EPUB, and Slidy or S5 HTML slide
-shows.
+OpenDocument XML, ODT, DocBook XML, EPUB, Emacs Org-Mode, and
+Slidy or S5 HTML slide shows.
If no *input-file* is specified, input is read from *stdin*.
Otherwise, the *input-files* are concatenated (with a blank
@@ -73,8 +73,8 @@ should pipe input and output through `iconv`:
: Specify output format. *FORMAT* can be `native` (native Haskell),
`plain` (plain text), `markdown` (markdown), `rst` (reStructuredText),
`html` (HTML), `latex` (LaTeX), `context` (ConTeXt), `man` (groff man),
- `mediawiki` (MediaWiki markup), `textile` (Textile),
- `texinfo` (GNU Texinfo), `docbook` (DocBook XML),
+ `mediawiki` (MediaWiki markup), `textile` (Textile), `org` (Emacs
+ Org-Mode), `texinfo` (GNU Texinfo), `docbook` (DocBook XML),
`opendocument` (OpenDocument XML), `odt` (OpenOffice text document),
`epub` (EPUB book), `slidy` (Slidy HTML and javascript slide show),
`s5` (S5 HTML and javascript slide show), or `rtf` (rich text