aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-03-19 20:23:48 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-03-19 20:23:48 -0700
commit8aa617238042ce8605863e4526e8f5002647fd97 (patch)
tree60559c84302f2c93e160c458899fbcd80384babd /README
parentd596b0db8321cdb9c018ac8037d301291d0cc63c (diff)
parent74d53f4347623631c17be557d3682dd807214263 (diff)
downloadpandoc-8aa617238042ce8605863e4526e8f5002647fd97.tar.gz
Merge branch 'opml'
Diffstat (limited to 'README')
-rw-r--r--README7
1 files changed, 4 insertions, 3 deletions
diff --git a/README b/README
index 39c69d08f..a6602718a 100644
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ 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], and [DocBook XML]; and it can write plain
-text, [markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX]
+[LaTeX], [MediaWiki markup], [OPML], and [DocBook XML]; and it can write
+plain text, [markdown], [reStructuredText], [XHTML], [HTML 5], [LaTeX]
(including [beamer] slide shows), [ConTeXt], [RTF], [DocBook XML],
[OpenDocument XML], [ODT], [Word docx], [GNU Texinfo], [MediaWiki
markup], [EPUB] (v2 or v3), [FictionBook2], [Textile], [groff man] pages, [Emacs
@@ -143,7 +143,7 @@ General options
`markdown_phpextra` (PHP Markdown Extra extended markdown),
`markdown_github` (github extended markdown),
`textile` (Textile), `rst` (reStructuredText), `html` (HTML),
- `docbook` (DocBook XML), `mediawiki` (MediaWiki markup),
+ `docbook` (DocBook XML), `opml` (OPML), `mediawiki` (MediaWiki markup),
or `latex` (LaTeX). If `+lhs` is appended to `markdown`, `rst`,
`latex`, the input will be treated as literate Haskell source:
see [Literate Haskell support](#literate-haskell-support), below.
@@ -2624,6 +2624,7 @@ Sergey Astanin, Arlo O'Keeffe, Denis Laxalde, Brent Yorgey.
[ConTeXt]: http://www.pragma-ade.nl/
[RTF]: http://en.wikipedia.org/wiki/Rich_Text_Format
[DocBook XML]: http://www.docbook.org/
+[OPML]: http://dev.opml.org/spec2.html
[OpenDocument XML]: http://opendocument.xml.org/
[ODT]: http://en.wikipedia.org/wiki/OpenDocument
[Textile]: http://redcloth.org/textile